Replaced 10302 with 10301 for FLTK_ABI_VERSION

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9706 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

10 files changed, 35 insertions, 35 deletions

diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 713430e88..424d3a570 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -87,7 +87,7 @@ void Fl_Double_Window::show() {
  \param pixmap  offscreen buffer containing the rectangle to copy
  \param srcx,srcy origin in offscreen buffer of rectangle to copy
  */
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
 void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) {
   fl_graphics_driver->copy_offscreen(x, y, w, h, pixmap, srcx, srcy);
 }
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
index 31b90e5e3..1bd3e5439 100644
--- a/src/Fl_Pixmap.cxx
+++ b/src/Fl_Pixmap.cxx
@@ -153,7 +153,7 @@ void Fl_GDI_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP
   }
 }
 
-#if FLTK_ABI_VERSION < 10302
+#if FLTK_ABI_VERSION < 10301
 UINT Fl_Pixmap::pixmap_bg_color = 0;
 #endif
 
diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx
index 6c5f70e25..d608aa189 100644
--- a/src/Fl_Table.cxx
+++ b/src/Fl_Table.cxx
@@ -128,7 +128,7 @@ Fl_Table::Fl_Table(int X, int Y, int W, int H, const char *l) : Fl_Group(X,Y,W,H
   current_row       = -1;
   select_row        = -1;
   select_col        = -1;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _scrollbar_size   = 0;
 #endif  
   box(FL_THIN_DOWN_FRAME);
@@ -480,7 +480,7 @@ void Fl_Table::recalc_dimensions() {
     // First pass: can hide via window size?
     int hidev = (table_h <= tih);
     int hideh = (table_w <= tiw); 
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
     // NEW
     int scrollsize = _scrollbar_size ? _scrollbar_size : Fl::scrollbar_size();
 #else
@@ -561,7 +561,7 @@ void Fl_Table::table_resized() {
     // Vertical scrollbar
     float vscrolltab = ( table_h == 0 || tih > table_h ) ? 1 : (float)tih / table_h;
     float hscrolltab = ( table_w == 0 || tiw > table_w ) ? 1 : (float)tiw / table_w;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
     // NEW
     int scrollsize = _scrollbar_size ? _scrollbar_size : Fl::scrollbar_size();
 #else
@@ -1147,7 +1147,7 @@ void Fl_Table::set_selection(int row_top, int col_left, int row_bot, int col_rig
 //    Then tell the group to draw over us.
 //
 void Fl_Table::draw() {   
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
     // NEW
     int scrollsize = _scrollbar_size ? _scrollbar_size : Fl::scrollbar_size();
 #else
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx
index 670c7b8e7..a3deaaa6a 100644
--- a/src/Fl_Tooltip.cxx
+++ b/src/Fl_Tooltip.cxx
@@ -31,7 +31,7 @@ Fl_Color	Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1,
 Fl_Color	Fl_Tooltip::textcolor_ = FL_BLACK;
 Fl_Font         Fl_Tooltip::font_ = FL_HELVETICA;
 Fl_Fontsize     Fl_Tooltip::size_ = -1;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
 int		Fl_Tooltip::margin_width_  = 3;
 int		Fl_Tooltip::margin_height_ = 3;
 int		Fl_Tooltip::wrap_width_    = 400;
diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx
index 1f91a00e9..2623ba57b 100644
--- a/src/Fl_Tree.cxx
+++ b/src/Fl_Tree.cxx
@@ -99,7 +99,7 @@ Fl_Tree::Fl_Tree(int X, int Y, int W, int H, const char *L) : Fl_Group(X,Y,W,H,L
   _callback_reason = FL_TREE_REASON_NONE;
   _scrollbar_size  = 0;				// 0: uses Fl::scrollbar_size()
 	
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   _lastselect       = 0;
 #else /*FLTK_ABI_VERSION*/
@@ -148,7 +148,7 @@ int Fl_Tree::handle(int e) {
   char is_shift   = Fl::event_state() & FL_SHIFT   ? 1 : 0;
   char is_ctrl    = Fl::event_state() & FL_CTRL    ? 1 : 0;
   char is_command = Fl::event_state() & FL_COMMAND ? 1 : 0;	// ctrl on win/lin, 'Command' on mac
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW: data inside Fl_Tree
 #else /*FLTK_ABI_VERSION*/
   // OLD:
@@ -477,7 +477,7 @@ int Fl_Tree::draw_tree() {
     
     // Show vertical scrollbar?
     {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
       // NEW
       int SY = Y + _prefs.marginbottom();
 #else /*FLTK_ABI_VERSION*/
@@ -1150,7 +1150,7 @@ int Fl_Tree::select(Fl_Tree_Item *item, int docallback) {
     redraw();
     return(1);
   }
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   if ( alreadySelected ) {
     if ( (item_reselect_mode() == FL_TREE_SELECTABLE_ALWAYS) && docallback ) {
@@ -1319,7 +1319,7 @@ int Fl_Tree::select_only(Fl_Tree_Item *selitem, int docallback) {
   int changed = 0;
   for ( Fl_Tree_Item *item = first(); item; item = item->next() ) {
     if ( item == selitem ) {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
       // NEW
       if ( item->is_selected() ) {		// already selected?
         if ( item_reselect_mode() == FL_TREE_SELECTABLE_ALWAYS ) {
@@ -1510,7 +1510,7 @@ void Fl_Tree::margintop(int val) {
   redraw();
 }
 
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
 /// Get the amount of white space (in pixels) that should appear
 /// below the last visible item when the vertical scroller is scrolled to the bottom.
 ///
@@ -1578,7 +1578,7 @@ void Fl_Tree::labelmarginleft(int val) {
   _prefs.labelmarginleft(val);
   redraw();
 }
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
 /// Get the amount of white space (in pixels) that should appear
 /// to the left of the child fltk widget (if any).
 int Fl_Tree::widgetmarginleft() const {
@@ -1748,7 +1748,7 @@ void Fl_Tree::selectmode(Fl_Tree_Select val) {
   _prefs.selectmode(val);
 }
 
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
 /// Returns the current item re/selection mode
 Fl_Tree_Item_Reselect_Mode Fl_Tree::item_reselect_mode() const {
   return(_prefs.item_reselect_mode());
diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx
index 31080b40c..20070c12b 100644
--- a/src/Fl_Tree_Item.cxx
+++ b/src/Fl_Tree_Item.cxx
@@ -44,7 +44,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Prefs &prefs) {
   _labelfgcolor = prefs.labelfgcolor();
   _labelbgcolor = prefs.labelbgcolor();
   _widget       = 0;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _flags        = OPEN|VISIBLE|ACTIVE;
 #else /*FLTK_ABI_VERSION*/
   _open         = 1;
@@ -67,7 +67,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Prefs &prefs) {
   _usericon         = 0;
   _userdata         = 0;
   _parent           = 0;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _prev_sibling     = 0;
   _next_sibling     = 0;
 #endif /*FLTK_ABI_VERSION*/
@@ -92,7 +92,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Item *o) {
   _labelfgcolor = o->labelfgcolor();
   _labelbgcolor = o->labelbgcolor();
   _widget       = o->widget();
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _flags        = o->_flags;
 #else /*FLTK_ABI_VERSION*/
   _open         = o->_open;
@@ -115,7 +115,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Item *o) {
   _usericon         = o->usericon();
   _userdata         = o->user_data();
   _parent           = o->_parent;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _prev_sibling     = 0;		// do not copy ptrs! use update_prev_next()
   _next_sibling     = 0;		// do not copy ptrs! use update_prev_next()
 #endif /*FLTK_ABI_VERSION*/
@@ -126,7 +126,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Item *o) {
 ///
 void Fl_Tree_Item::show_self(const char *indent) const {
   if ( label() ) {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
     printf("%s-%s (%d children, this=%p, parent=%p, prev=%p, next=%p, depth=%d)\n",
            indent,label(),children(),(void*)this, (void*)_parent,
 	   _prev_sibling, _next_sibling, depth());
@@ -576,7 +576,7 @@ int Fl_Tree_Item::calc_item_height(const Fl_Tree_Prefs &prefs) const {
     fl_font(_labelfont, _labelsize);	// fl_descent() needs this :/
     H = _labelsize + fl_descent() + 1;	// at least one pixel space below descender
   }
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   if ( widget() && 
        (prefs.item_draw_mode() & FL_TREE_ITEM_HEIGHT_FROM_WIDGET) &&
        H < widget()->h()) {
@@ -648,7 +648,7 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
     int wx = label_x;
     int wy = bg_y;
     int ww = widget()->w();		// use widget's width
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
     int wh = (prefs.item_draw_mode() & FL_TREE_ITEM_HEIGHT_FROM_WIDGET)
              ? widget()->h() : H;
     if ( _label && 
@@ -660,7 +660,7 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
       fl_font(_labelfont, _labelsize);	// fldescent() needs this
       int lw=0, lh=0;
       fl_measure(_label,lw,lh);		// get box around text (including white space)
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
       // NEW
       wx += (lw + prefs.widgetmarginleft());
 #else /*FLTK_ABI_VERSION*/
@@ -735,7 +735,7 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
 	  prefs.usericon()->draw(uicon_x,uicon_y);
 	}
 	// Draw label
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
         if ( _label && 
 	     ( !widget() || 
 	       (prefs.item_draw_mode() & FL_TREE_ITEM_DRAW_LABEL_AND_WIDGET) ) )
@@ -874,7 +874,7 @@ Fl_Tree_Item *Fl_Tree_Item::next() {
   if ( c->has_children() ) {
     return(c->child(0));
   }
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   while ( ( p = c->parent() ) != NULL ) {	// loop upwards through parents
     if ( c->_next_sibling )			// not last child?
@@ -901,7 +901,7 @@ Fl_Tree_Item *Fl_Tree_Item::next() {
 /// \returns the previous item in the tree, or 0 if there's no item above this one (hit the root).
 ///
 Fl_Tree_Item *Fl_Tree_Item::prev() {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   if ( !parent() ) return(0);	// hit root? done
   if ( !_prev_sibling ) {	// are we first child?
@@ -955,7 +955,7 @@ Fl_Tree_Item *Fl_Tree_Item::prev() {
 /// \returns item's next sibling, or 0 if none.
 ///
 Fl_Tree_Item *Fl_Tree_Item::next_sibling() {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   return(_next_sibling);
 #else /*FLTK_ABI_VERSION*/
@@ -977,7 +977,7 @@ Fl_Tree_Item *Fl_Tree_Item::next_sibling() {
 /// \returns This item's previous sibling, or 0 if none.
 ///
 Fl_Tree_Item *Fl_Tree_Item::prev_sibling() {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   return(_prev_sibling);
 #else /*FLTK_ABI_VERSION*/
@@ -995,7 +995,7 @@ Fl_Tree_Item *Fl_Tree_Item::prev_sibling() {
 /// Call this whenever items in the array are added/removed/moved/swapped.
 /// 
 void Fl_Tree_Item::update_prev_next(int index) {
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   // NEW
   int pchildren = parent() ? parent()->children() : 0;
   int index_prev = index-1;
diff --git a/src/Fl_Tree_Item_Array.cxx b/src/Fl_Tree_Item_Array.cxx
index 5518be46f..b6eddd09d 100644
--- a/src/Fl_Tree_Item_Array.cxx
+++ b/src/Fl_Tree_Item_Array.cxx
@@ -158,7 +158,7 @@ int Fl_Tree_Item_Array::remove(Fl_Tree_Item *item) {
   return(-1);
 }
 
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
 /// Swap the two items at index positions \p ax and \p bx.
 void Fl_Tree_Item_Array::swap(int ax, int bx) {
   Fl_Tree_Item *asave = _items[ax];
diff --git a/src/Fl_Tree_Prefs.cxx b/src/Fl_Tree_Prefs.cxx
index 45018a1ae..b52724aef 100644
--- a/src/Fl_Tree_Prefs.cxx
+++ b/src/Fl_Tree_Prefs.cxx
@@ -125,13 +125,13 @@ Fl_Tree_Prefs::Fl_Tree_Prefs() {
   _labelsize              = FL_NORMAL_SIZE;
   _marginleft             = 6;
   _margintop              = 3;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _marginbottom           = 20;
 #endif /*FLTK_ABI_VERSION*/
   _openchild_marginbottom = 0;
   _usericonmarginleft     = 3;
   _labelmarginleft        = 3;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _widgetmarginleft       = 3;
 #endif /*FLTK_ABI_VERSION*/
   _linespacing            = 0;
@@ -152,7 +152,7 @@ Fl_Tree_Prefs::Fl_Tree_Prefs() {
   _sortorder              = FL_TREE_SORT_NONE;
   _selectbox              = FL_FLAT_BOX;
   _selectmode             = FL_TREE_SELECT_SINGLE;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   _itemreselectmode       = FL_TREE_SELECTABLE_ONCE;
   _itemdrawmode           = FL_TREE_ITEM_DRAW_DEFAULT;
 #endif
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index f5c295d77..20bb520fd 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -50,7 +50,7 @@ void Fl_Window::_Fl_Window() {
   resizable(0);
   size_range_set = 0;
   minw = maxw = minh = maxh = 0;
-#if FLTK_ABI_VERSION >= 10302
+#if FLTK_ABI_VERSION >= 10301
   no_fullscreen_x = 0;
   no_fullscreen_y = 0;
   no_fullscreen_w = w();
diff --git a/src/Fl_Window_fullscreen.cxx b/src/Fl_Window_fullscreen.cxx
index 2cbf59788..7a8ce4631 100644
--- a/src/Fl_Window_fullscreen.cxx
+++ b/src/Fl_Window_fullscreen.cxx
@@ -31,7 +31,7 @@
 
 #include <config.h>
 
-#if FLTK_ABI_VERSION < 10302
+#if FLTK_ABI_VERSION < 10301
 int Fl_Window::no_fullscreen_x = 0;
 int Fl_Window::no_fullscreen_y = 0;
 int Fl_Window::no_fullscreen_w = 0;