diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2012-11-06 20:46:14 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2012-11-06 20:46:14 +0000 |
| commit | 78039ecb55130d4b6e30a1aa005b4498d1a6decf (patch) | |
| tree | d4a51605695bd70bdc1b9923860de63149a2b9eb /FL | |
| parent | 00ed897277139be1b03ac90afcf45af3105f2d47 (diff) | |
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
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Device.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Paged_Device.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Pixmap.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Spinner.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Table.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Tooltip.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Tree.H | 10 | ||||
| -rw-r--r-- | FL/Fl_Tree_Item.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Tree_Item_Array.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Tree_Prefs.H | 16 | ||||
| -rw-r--r-- | FL/Fl_Window.H | 8 |
12 files changed, 30 insertions, 30 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 29a183891..383fa6b0a 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -27,7 +27,7 @@ * in the current patch release of FLTK. ** Use for static builds only! ** * For more info on this macro, see: http://fltk.org/cmp.php#FLTK_ABI_VERSION */ -//#define FLTK_ABI_VERSION 10302 +//#define FLTK_ABI_VERSION 10301 # include "Fl_Export.H" # include "fl_types.h" diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index e0218386c..217fd468e 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -367,7 +367,7 @@ protected: the image offset by the cx and cy arguments. */ virtual void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {} -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 virtual #endif void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); diff --git a/FL/Fl_Paged_Device.H b/FL/Fl_Paged_Device.H index 6e15bb99c..48367fab1 100644 --- a/FL/Fl_Paged_Device.H +++ b/FL/Fl_Paged_Device.H @@ -107,7 +107,7 @@ protected: int y_offset; /** \brief The constructor */ Fl_Paged_Device() : Fl_Surface_Device(NULL), x_offset(0), y_offset(0) {}; -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 public: /** \brief The destructor */ virtual ~Fl_Paged_Device() {}; diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index a33846ad6..6f93da7e8 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -60,7 +60,7 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { private: #if defined(WIN32) -#if FLTK_ABI_VERSION < 10302 +#if FLTK_ABI_VERSION < 10301 static // a static member is needed for ABI compatibility #endif UINT pixmap_bg_color; // RGB color used for pixmap background diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H index 2262c924a..02830e2e4 100644 --- a/FL/Fl_Spinner.H +++ b/FL/Fl_Spinner.H @@ -50,7 +50,7 @@ class FL_EXPORT Fl_Spinner : public Fl_Group { double step_; // Amount to add/subtract for up/down const char *format_; // Format string -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 // NEW protected: #endif diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H index e93def345..c71d918aa 100644 --- a/FL/Fl_Table.H +++ b/FL/Fl_Table.H @@ -207,7 +207,7 @@ private: int _auto_drag; int _selecting; -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 int _scrollbar_size; #endif @@ -1070,7 +1070,7 @@ public: void callback(Fl_Widget*, void*); #endif -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 // NEW /** Gets the current size of the scrollbars' troughs, in pixels. diff --git a/FL/Fl_Tooltip.H b/FL/Fl_Tooltip.H index 0378aa80b..300c921dd 100644 --- a/FL/Fl_Tooltip.H +++ b/FL/Fl_Tooltip.H @@ -78,7 +78,7 @@ public: static Fl_Color textcolor() { return textcolor_; } /** Sets the color of the text in the tooltip. The default is black. */ static void textcolor(Fl_Color c) { textcolor_ = c; } -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /** Gets the amount of extra space left/right of the tooltip's text. Default is 3. */ static int margin_width() { return margin_width_; } /** Sets the amount of extra space left/right of the tooltip's text. Default is 3. */ @@ -119,7 +119,7 @@ private: static Fl_Font font_; static Fl_Fontsize size_; static Fl_Widget* widget_; //!< Keeps track of the current target widget -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 static int margin_width_; //!< distance around tooltip text left+right static int margin_height_; //!< distance around tooltip text top+bottom static int wrap_width_; //!< maximum width of tooltip text before it word wraps diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H index 3ce4eeb77..849222aaf 100644 --- a/FL/Fl_Tree.H +++ b/FL/Fl_Tree.H @@ -300,7 +300,7 @@ enum Fl_Tree_Reason { FL_TREE_REASON_NONE=0, ///< unknown reason FL_TREE_REASON_SELECTED, ///< an item was selected FL_TREE_REASON_DESELECTED, ///< an item was de-selected -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 FL_TREE_REASON_RESELECTED, ///< an item was re-selected (e.g. double-clicked) #endif /*FLTK_ABI_VERSION*/ FL_TREE_REASON_OPENED, ///< an item was opened @@ -316,7 +316,7 @@ class FL_EXPORT Fl_Tree : public Fl_Group { Fl_Tree_Prefs _prefs; // all the tree's settings int _scrollbar_size; // size of scrollbar trough -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 // NEW: Fl_Tree_Item *_lastselect; #else /*FLTK_ABI_VERSION*/ @@ -420,7 +420,7 @@ public: void marginleft(int val); int margintop() const; void margintop(int val); -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 int marginbottom() const; void marginbottom(int val); #endif /*FLTK_ABI_VERSION*/ @@ -432,7 +432,7 @@ public: void usericonmarginleft(int val); int labelmarginleft() const; void labelmarginleft(int val); -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 int widgetmarginleft() const; void widgetmarginleft(int val); #endif /*FLTK_ABI_VERSION*/ @@ -456,7 +456,7 @@ public: void selectbox(Fl_Boxtype val); Fl_Tree_Select selectmode() const; void selectmode(Fl_Tree_Select val); -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 Fl_Tree_Item_Reselect_Mode item_reselect_mode() const; void item_reselect_mode(Fl_Tree_Item_Reselect_Mode mode); Fl_Tree_Item_Draw_Mode item_draw_mode() const; diff --git a/FL/Fl_Tree_Item.H b/FL/Fl_Tree_Item.H index b5dd7b985..13a77502a 100644 --- a/FL/Fl_Tree_Item.H +++ b/FL/Fl_Tree_Item.H @@ -63,7 +63,7 @@ class FL_EXPORT Fl_Tree_Item { ACTIVE = 1<<2, ///> item is active SELECTED = 1<<3, ///> item is selected }; -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 // NEW unsigned short _flags; // misc flags #else /*FLTK_ABI_VERSION*/ @@ -81,7 +81,7 @@ class FL_EXPORT Fl_Tree_Item { Fl_Tree_Item_Array _children; // array of child items Fl_Tree_Item *_parent; // parent item (=0 if root) void *_userdata; // user data that can be associated with an item -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 Fl_Tree_Item *_prev_sibling; // previous sibling (same level) Fl_Tree_Item *_next_sibling; // next sibling (same level) #endif /*FLTK_ABI_VERSION*/ @@ -350,7 +350,7 @@ public: // Protected methods protected: -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /// Set a flag to an on or off value. val is 0 or 1. inline void set_flag(unsigned short flag,int val) { if ( val ) _flags |= flag; else _flags &= ~flag; diff --git a/FL/Fl_Tree_Item_Array.H b/FL/Fl_Tree_Item_Array.H index 18527a8ef..a8de00dcc 100644 --- a/FL/Fl_Tree_Item_Array.H +++ b/FL/Fl_Tree_Item_Array.H @@ -67,7 +67,7 @@ public: return(_total); } /// Swap the two items at index positions \p ax and \p bx. -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 // NEW -- code moved to .cxx void swap(int ax, int bx); #else /*FLTK_ABI_VERSION*/ diff --git a/FL/Fl_Tree_Prefs.H b/FL/Fl_Tree_Prefs.H index b87cc8521..b01033e78 100644 --- a/FL/Fl_Tree_Prefs.H +++ b/FL/Fl_Tree_Prefs.H @@ -71,7 +71,7 @@ enum Fl_Tree_Select { ///< with SHIFT, CTRL or mouse drags. }; -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /// \enum Fl_Tree_Item_Reselect_Mode /// Defines the ways an item can be (re) selected /// via item_reselect_mode(). @@ -106,13 +106,13 @@ class FL_EXPORT Fl_Tree_Prefs { Fl_Fontsize _labelsize; // label's font size int _margintop; // -- int _marginleft; // |- tree's controllable margins -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 int _marginbottom; // -- #endif int _openchild_marginbottom; // extra space below an open child tree int _usericonmarginleft; // space to left of user icon (if any) int _labelmarginleft; // space to left of label -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 int _widgetmarginleft; // space to left of widget #endif int _connectorwidth; // connector width (right of open/close icon) @@ -130,7 +130,7 @@ class FL_EXPORT Fl_Tree_Prefs { Fl_Tree_Sort _sortorder; // none, ascening, descending, etc. Fl_Boxtype _selectbox; // selection box type Fl_Tree_Select _selectmode; // selection mode -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 Fl_Tree_Item_Reselect_Mode _itemreselectmode; // controls item selection callback() behavior Fl_Tree_Item_Draw_Mode _itemdrawmode; // controls how items draw label + widget() #endif /*FLTK_ABI_VERSION*/ @@ -152,7 +152,7 @@ public: inline Fl_Color item_labelfgcolor() const { return(_labelfgcolor); } /// Set the default label foreground color inline void item_labelfgcolor(Fl_Color val) { _labelfgcolor = val; } -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /// Get the default label background color. /// This returns the Fl_Tree::color() unless item_labelbgcolor() /// has been set explicitly. @@ -216,7 +216,7 @@ public: inline void margintop(int val) { _margintop = val; } -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /// Get the bottom margin's value in pixels. /// This is the extra distance the vertical scroller lets you travel. inline int marginbottom() const { @@ -252,7 +252,7 @@ public: inline void labelmarginleft(int val) { _labelmarginleft = val; } -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /// Get the widget()'s left margin value in pixels inline int widgetmarginleft() const { return(_widgetmarginleft); @@ -391,7 +391,7 @@ public: inline void selectmode(Fl_Tree_Select val) { _selectmode = val; } -#if FLTK_ABI_VERSION >= 10302 +#if FLTK_ABI_VERSION >= 10301 /// Returns the current item re/selection mode Fl_Tree_Item_Reselect_Mode item_reselect_mode() const { return _itemreselectmode; diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 84f706823..d6997e601 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -52,19 +52,19 @@ class FL_EXPORT Fl_Window : public Fl_Group { // Note: we must use separate statements for each of the following 4 variables, // with the static attribute, otherwise MS VC++ 2008/2010 complains :-( // AlbrechtS 04/2012 -#if FLTK_ABI_VERSION < 10302 +#if FLTK_ABI_VERSION < 10301 static // when these members are static, ABI compatibility with 1.3.0 is respected #endif int no_fullscreen_x; -#if FLTK_ABI_VERSION < 10302 +#if FLTK_ABI_VERSION < 10301 static // when these members are static, ABI compatibility with 1.3.0 is respected #endif int no_fullscreen_y; -#if FLTK_ABI_VERSION < 10302 +#if FLTK_ABI_VERSION < 10301 static // when these members are static, ABI compatibility with 1.3.0 is respected #endif int no_fullscreen_w; -#if FLTK_ABI_VERSION < 10302 +#if FLTK_ABI_VERSION < 10301 static // when these members are static, ABI compatibility with 1.3.0 is respected #endif int no_fullscreen_h; |
