| |
Author: matt
Date: 2011-01-09 14:48:30 -0800 (Sun, 09 Jan 2011)
New Revision: 8233
Log:
Moved more stuff into namespace
Modified:
branches/branch-3.0-2011/fltk3/Enumerations.H
branches/branch-3.0-2011/fltk3/Fl_Browser_.H
branches/branch-3.0-2011/fltk3/Fl_Button.H
branches/branch-3.0-2011/fltk3/Fl_Chart.H
branches/branch-3.0-2011/fltk3/Fl_Clock.H
branches/branch-3.0-2011/fltk3/Fl_Counter.H
branches/branch-3.0-2011/fltk3/Fl_Device.H
branches/branch-3.0-2011/fltk3/Fl_File_Chooser.H
branches/branch-3.0-2011/fltk3/Fl_File_Icon.H
branches/branch-3.0-2011/fltk3/Fl_File_Input.H
branches/branch-3.0-2011/fltk3/Fl_Gl_Window.H
branches/branch-3.0-2011/fltk3/Fl_Help_View.H
branches/branch-3.0-2011/fltk3/Fl_Image.H
branches/branch-3.0-2011/fltk3/Fl_Input_.H
branches/branch-3.0-2011/fltk3/Fl_Input_Choice.H
branches/branch-3.0-2011/fltk3/Fl_Menu_.H
branches/branch-3.0-2011/fltk3/Fl_Menu_Item.H
branches/branch-3.0-2011/fltk3/Fl_Pixmap.H
branches/branch-3.0-2011/fltk3/Fl_PostScript.H
branches/branch-3.0-2011/fltk3/Fl_Scroll.H
branches/branch-3.0-2011/fltk3/Fl_Shared_Image.H
branches/branch-3.0-2011/fltk3/Fl_Spinner.H
branches/branch-3.0-2011/fltk3/Fl_Table.H
branches/branch-3.0-2011/fltk3/Fl_Text_Display.H
branches/branch-3.0-2011/fltk3/Fl_Tiled_Image.H
branches/branch-3.0-2011/fltk3/Fl_Tooltip.H
branches/branch-3.0-2011/fltk3/Fl_Tree.H
branches/branch-3.0-2011/fltk3/Fl_Tree_Item.H
branches/branch-3.0-2011/fltk3/Fl_Tree_Prefs.H
branches/branch-3.0-2011/fltk3/Fl_Value_Input.H
branches/branch-3.0-2011/fltk3/Fl_Value_Output.H
branches/branch-3.0-2011/fltk3/Fl_Value_Slider.H
branches/branch-3.0-2011/fltk3/Widget.h
branches/branch-3.0-2011/fltk3/Window.h
branches/branch-3.0-2011/fltk3/fl_draw.H
branches/branch-3.0-2011/fltk3/fl_show_colormap.H
branches/branch-3.0-2011/fltk3/forms.H
branches/branch-3.0-2011/fltk3/gl.h
branches/branch-3.0-2011/fltk3/glut.H
branches/branch-3.0-2011/fltk3/mac.H
branches/branch-3.0-2011/fltk3/run.h
branches/branch-3.0-2011/fltk3/x.H
branches/branch-3.0-2011/src/Fl.cxx
branches/branch-3.0-2011/src/Fl_Bitmap.cxx
branches/branch-3.0-2011/src/Fl_Browser.cxx
branches/branch-3.0-2011/src/Fl_Browser_.cxx
branches/branch-3.0-2011/src/Fl_Button.cxx
branches/branch-3.0-2011/src/Fl_Chart.cxx
branches/branch-3.0-2011/src/Fl_Check_Browser.cxx
branches/branch-3.0-2011/src/Fl_Choice.cxx
branches/branch-3.0-2011/src/Fl_Clock.cxx
branches/branch-3.0-2011/src/Fl_Color_Chooser.cxx
branches/branch-3.0-2011/src/Fl_Counter.cxx
branches/branch-3.0-2011/src/Fl_Dial.cxx
branches/branch-3.0-2011/src/Fl_Double_Window.cxx
branches/branch-3.0-2011/src/Fl_File_Browser.cxx
branches/branch-3.0-2011/src/Fl_File_Chooser.cxx
branches/branch-3.0-2011/src/Fl_File_Chooser2.cxx
branches/branch-3.0-2011/src/Fl_File_Icon.cxx
branches/branch-3.0-2011/src/Fl_File_Icon2.cxx
branches/branch-3.0-2011/src/Fl_File_Input.cxx
branches/branch-3.0-2011/src/Fl_Gl_Choice.cxx
branches/branch-3.0-2011/src/Fl_Gl_Overlay.cxx
branches/branch-3.0-2011/src/Fl_Gl_Window.cxx
branches/branch-3.0-2011/src/Fl_Group.cxx
branches/branch-3.0-2011/src/Fl_Help_Dialog.cxx
branches/branch-3.0-2011/src/Fl_Help_View.cxx
branches/branch-3.0-2011/src/Fl_Image.cxx
branches/branch-3.0-2011/src/Fl_Input.cxx
branches/branch-3.0-2011/src/Fl_Input_.cxx
branches/branch-3.0-2011/src/Fl_Light_Button.cxx
branches/branch-3.0-2011/src/Fl_Menu.cxx
branches/branch-3.0-2011/src/Fl_Menu_.cxx
branches/branch-3.0-2011/src/Fl_Menu_Button.cxx
branches/branch-3.0-2011/src/Fl_Menu_add.cxx
branches/branch-3.0-2011/src/Fl_Multi_Label.cxx
branches/branch-3.0-2011/src/Fl_Overlay_Window.cxx
branches/branch-3.0-2011/src/Fl_Pack.cxx
branches/branch-3.0-2011/src/Fl_Paged_Device.cxx
branches/branch-3.0-2011/src/Fl_Pixmap.cxx
branches/branch-3.0-2011/src/Fl_Positioner.cxx
branches/branch-3.0-2011/src/Fl_PostScript.cxx
branches/branch-3.0-2011/src/Fl_Progress.cxx
branches/branch-3.0-2011/src/Fl_Roller.cxx
branches/branch-3.0-2011/src/Fl_Scroll.cxx
branches/branch-3.0-2011/src/Fl_Scrollbar.cxx
branches/branch-3.0-2011/src/Fl_Shared_Image.cxx
branches/branch-3.0-2011/src/Fl_Slider.cxx
branches/branch-3.0-2011/src/Fl_Table.cxx
branches/branch-3.0-2011/src/Fl_Table_Row.cxx
branches/branch-3.0-2011/src/Fl_Tabs.cxx
branches/branch-3.0-2011/src/Fl_Text_Display.cxx
branches/branch-3.0-2011/src/Fl_Text_Editor.cxx
branches/branch-3.0-2011/src/Fl_Tile.cxx
branches/branch-3.0-2011/src/Fl_Tiled_Image.cxx
branches/branch-3.0-2011/src/Fl_Tooltip.cxx
branches/branch-3.0-2011/src/Fl_Tree.cxx
branches/branch-3.0-2011/src/Fl_Tree_Item.cxx
branches/branch-3.0-2011/src/Fl_Tree_Prefs.cxx
branches/branch-3.0-2011/src/Fl_Valuator.cxx
branches/branch-3.0-2011/src/Fl_Value_Input.cxx
branches/branch-3.0-2011/src/Fl_Value_Output.cxx
branches/branch-3.0-2011/src/Fl_Value_Slider.cxx
branches/branch-3.0-2011/src/Fl_Widget.cxx
branches/branch-3.0-2011/src/Fl_Window.cxx
branches/branch-3.0-2011/src/Fl_Wizard.cxx
branches/branch-3.0-2011/src/Fl_cocoa.mm
branches/branch-3.0-2011/src/Fl_compose.cxx
branches/branch-3.0-2011/src/Fl_get_system_colors.cxx
branches/branch-3.0-2011/src/Fl_lock.cxx
branches/branch-3.0-2011/src/Fl_mac.cxx
branches/branch-3.0-2011/src/Fl_win32.cxx
branches/branch-3.0-2011/src/Fl_x.cxx
branches/branch-3.0-2011/src/fl_ask.cxx
branches/branch-3.0-2011/src/fl_boxtype.cxx
branches/branch-3.0-2011/src/fl_color.cxx
branches/branch-3.0-2011/src/fl_color_mac.cxx
branches/branch-3.0-2011/src/fl_color_win32.cxx
branches/branch-3.0-2011/src/fl_cursor.cxx
branches/branch-3.0-2011/src/fl_diamond_box.cxx
branches/branch-3.0-2011/src/fl_dnd_x.cxx
branches/branch-3.0-2011/src/fl_draw.cxx
branches/branch-3.0-2011/src/fl_draw_image.cxx
branches/branch-3.0-2011/src/fl_draw_pixmap.cxx
branches/branch-3.0-2011/src/fl_engraved_label.cxx
branches/branch-3.0-2011/src/fl_font_mac.cxx
branches/branch-3.0-2011/src/fl_gtk.cxx
branches/branch-3.0-2011/src/fl_labeltype.cxx
branches/branch-3.0-2011/src/fl_oval_box.cxx
branches/branch-3.0-2011/src/fl_plastic.cxx
branches/branch-3.0-2011/src/fl_round_box.cxx
branches/branch-3.0-2011/src/fl_rounded_box.cxx
branches/branch-3.0-2011/src/fl_shadow_box.cxx
branches/branch-3.0-2011/src/fl_shortcut.cxx
branches/branch-3.0-2011/src/fl_show_colormap.cxx
branches/branch-3.0-2011/src/fl_symbols.cxx
branches/branch-3.0-2011/src/forms_bitmap.cxx
branches/branch-3.0-2011/src/forms_compatability.cxx
branches/branch-3.0-2011/src/forms_pixmap.cxx
branches/branch-3.0-2011/src/forms_timer.cxx
branches/branch-3.0-2011/src/gl_draw.cxx
branches/branch-3.0-2011/src/print_panel.cxx
Modified: branches/branch-3.0-2011/fltk3/Enumerations.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Enumerations.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Enumerations.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -37,17 +37,17 @@
/** \name Version Numbers
-
- FLTK defines some constants to help the programmer to
- find out, for which FLTK version a program is compiled.
-
- The following constants are defined:
+
+ FLTK defines some constants to help the programmer to
+ find out, for which FLTK version a program is compiled.
+
+ The following constants are defined:
*/
/*@{*/
/**
* The major release version of this FLTK library.
- \sa FL_VERSION
+ \sa FL_VERSION
*/
#define FL_MAJOR_VERSION 1
@@ -81,8 +81,8 @@
* respectively.
*/
#define FL_VERSION ((double)FL_MAJOR_VERSION + \
- (double)FL_MINOR_VERSION * 0.01 + \
- (double)FL_PATCH_VERSION * 0.0001)
+(double)FL_MINOR_VERSION * 0.01 + \
+(double)FL_PATCH_VERSION * 0.0001)
/*@}*/ // group: Version Numbers
@@ -104,7 +104,7 @@
enum Fl_Event { // events
/** No event. */
FL_NO_EVENT = 0,
-
+
/** A mouse button has gone down with the mouse pointing at this
* widget. You can find out what button by calling fltk3::event_button().
* You find out the mouse position by calling fltk3::event_x() and
@@ -117,7 +117,7 @@
* to another widget.
*/
FL_PUSH = 1,
-
+
/** A mouse button has been released. You can find out what button by
* calling fltk3::event_button().
*
@@ -125,7 +125,7 @@
* non-zero when handling FL_PUSH.
*/
FL_RELEASE = 2,
-
+
/** The mouse has been moved to point at this widget. This can
* be used for highlighting feedback. If a widget wants to
* highlight or otherwise track the mouse, it indicates this by
@@ -134,13 +134,13 @@
* FL_MOVE and FL_LEAVE events.
*/
FL_ENTER = 3,
-
+
/** The mouse has moved out of the widget.
* In order to receive the FL_LEAVE event, the widget must
* return non-zero when handling FL_ENTER.
*/
FL_LEAVE = 4,
-
+
/** The mouse has moved with a button held down. The current button state
* is in fltk3::event_state(). The mouse position is in fltk3::event_x() and
* fltk3::event_y().
@@ -149,7 +149,7 @@
* when handling FL_PUSH.
*/
FL_DRAG = 5,
-
+
/** This indicates an <I>attempt</I> to give a widget the keyboard focus.
*
* If a widget wants the focus, it should change itself to display the
@@ -169,7 +169,7 @@
* widget gets the focus or the window loses focus.
*/
FL_UNFOCUS = 7,
-
+
/** A key was pressed or released. The key can be found in fltk3::event_key().
* The text that the key should insert can be found with fltk3::event_text()
* and its length is in fltk3::event_length(). If you use the key handle()
@@ -189,24 +189,24 @@
* FL_KEYDOWN event because focus may have changed between events.
*/
FL_KEYDOWN = 8,
-
+
/** Equvalent to FL_KEYDOWN.
* \see FL_KEYDOWN
*/
FL_KEYBOARD = 8,
-
+
/** Key release event.
* \see FL_KEYDOWN
*/
FL_KEYUP = 9,
-
+
/** The user clicked the close button of a window.
* This event is used internally only to trigger the callback of
* fltk3::Window derived classed. The default callback closes the
* window calling fltk3::Window::hide().
*/
FL_CLOSE = 10,
-
+
/** The mouse has moved without any mouse buttons held down.
* This event is sent to the fltk3::belowmouse() widget.
*
@@ -214,7 +214,7 @@
* non-zero when handling FL_ENTER.
*/
FL_MOVE = 11,
-
+
/** If the fltk3::focus() widget is zero or ignores an FL_KEYBOARD
* event then FLTK tries sending this event to every widget it
* can, until one of them returns non-zero. FL_SHORTCUT is first
@@ -228,19 +228,19 @@
* which one has the focus.
*/
FL_SHORTCUT = 12,
-
+
/** This widget is no longer active, due to fltk3::Widget::deactivate()
* being called on it or one of its parents. fltk3::Widget::active() may
* still be true after this, the widget is only active if fltk3::Widget::active()
* is true on it and all its parents (use fltk3::Widget::active_r() to check this).
*/
FL_DEACTIVATE = 13,
-
+
/** This widget is now active, due to fltk3::Widget::activate() being
* called on it or one of its parents.
*/
FL_ACTIVATE = 14,
-
+
/** This widget is no longer visible, due to fltk3::Widget::hide() being
* called on it or one of its parents, or due to a parent window being
* minimized. fltk3::Widget::visible() may still be true after this, but the
@@ -248,7 +248,7 @@
* parents (use fltk3::Widget::visible_r() to check this).
*/
FL_HIDE = 15,
-
+
/** This widget is visible again, due to fltk3::Widget::show() being called on
* it or one of its parents, or due to a parent window being restored.
* Child fltk3::Windows respond to this by actually creating the window if not
@@ -256,41 +256,41 @@
* to the base class fltk3::Widget::handle() method!
*/
FL_SHOW = 16,
-
+
/** You should get this event some time after you call fltk3::paste().
* The contents of fltk3::event_text() is the text to insert and the number
* of characters is in fltk3::event_length().
*/
FL_PASTE = 17,
-
+
/** The fltk3::selection_owner() will get this event before the selection is
* moved to another widget. This indicates that some other widget or program
* has claimed the selection. Motif programs used this to clear the selection
* indication. Most modern programs ignore this.
*/
FL_SELECTIONCLEAR = 18,
-
+
/** The user has moved the mouse wheel. The fltk3::event_dx() and fltk3::event_dy()
* methods can be used to find the amount to scroll horizontally and vertically.
*/
FL_MOUSEWHEEL = 19,
-
+
/** The mouse has been moved to point at this widget. A widget that is
* interested in receiving drag'n'drop data must return 1 to receive
* FL_DND_DRAG, FL_DND_LEAVE and FL_DND_RELEASE events.
*/
FL_DND_ENTER = 20,
-
+
/** The mouse has been moved inside a widget while dragging data. A
* widget that is interested in receiving drag'n'drop data should
* indicate the possible drop position.
*/
FL_DND_DRAG = 21,
-
+
/** The mouse has moved out of the widget.
*/
FL_DND_LEAVE = 22,
-
+
/** The user has released the mouse button dropping data into the widget.
* If the widget returns 1, it will receive the data in the immediately
* following FL_PASTE event.
@@ -298,35 +298,39 @@
FL_DND_RELEASE = 23
};
-/** \name When Conditions */
-/*@{*/
-/** These constants determine when a callback is performed.
- *
- * \sa fltk3::Widget::when();
- * \todo doxygen comments for values are incomplete and maybe wrong or unclear
- */
-enum Fl_When { // fltk3::Widget::when():
- FL_WHEN_NEVER = 0, ///< Never call the callback
- FL_WHEN_CHANGED = 1, ///< Do the callback only when the widget value changes
- FL_WHEN_NOT_CHANGED = 2, ///< Do the callback whenever the user interacts with the widget
- FL_WHEN_RELEASE = 4, ///< Do the callback when the button or key is released and the value changes
- FL_WHEN_RELEASE_ALWAYS= 6, ///< Do the callback when the button or key is released, even if the value doesn't change
- FL_WHEN_ENTER_KEY = 8, ///< Do the callback when the user presses the ENTER key and the value changes
- FL_WHEN_ENTER_KEY_ALWAYS=10, ///< Do the callback when the user presses the ENTER key, even if the value doesn't change
- FL_WHEN_ENTER_KEY_CHANGED=11 ///< ?
-};
+namespace fltk3 {
+
+ /** \name When Conditions */
+ /*@{*/
+ /** These constants determine when a callback is performed.
+ *
+ * \sa fltk3::Widget::when();
+ * \todo doxygen comments for values are incomplete and maybe wrong or unclear
+ */
+ enum When { // fltk3::Widget::when():
+ WHEN_NEVER = 0, ///< Never call the callback
+ WHEN_CHANGED = 1, ///< Do the callback only when the widget value changes
+ WHEN_NOT_CHANGED = 2, ///< Do the callback whenever the user interacts with the widget
+ WHEN_RELEASE = 4, ///< Do the callback when the button or key is released and the value changes
+ WHEN_RELEASE_ALWAYS= 6, ///< Do the callback when the button or key is released, even if the value doesn't change
+ WHEN_ENTER_KEY = 8, ///< Do the callback when the user presses the ENTER key and the value changes
+ WHEN_ENTER_KEY_ALWAYS=10, ///< Do the callback when the user presses the ENTER key, even if the value doesn't change
+ WHEN_ENTER_KEY_CHANGED=11 ///< ?
+ };
+
+}
/*@}*/ // group: When Conditions
/** \name Mouse and Keyboard Events
-
- This and the following constants define the non-ASCII keys on the
- keyboard for FL_KEYBOARD and FL_SHORTCUT events.
-
- \todo FL_Button and FL_key... constants could be structured better
- (use an enum or some doxygen grouping ?)
-
- \sa fltk3::event_key() and fltk3::get_key(int) (use ascii letters for all other keys):
+
+ This and the following constants define the non-ASCII keys on the
+ keyboard for FL_KEYBOARD and FL_SHORTCUT events.
+
+ \todo FL_Button and FL_key... constants could be structured better
+ (use an enum or some doxygen grouping ?)
+
+ \sa fltk3::event_key() and fltk3::get_key(int) (use ascii letters for all other keys):
*/
/*@{*/
@@ -372,12 +376,12 @@
/*@}*/ // group: Mouse and Keyboard Events
/** \name Mouse Buttons
+
+ These constants define the button numbers for FL_PUSH and FL_RELEASE events.
+
+ \sa fltk3::event_button()
+ */
- These constants define the button numbers for FL_PUSH and FL_RELEASE events.
-
- \sa fltk3::event_button()
-*/
-
/*@{*/
#define FL_LEFT_MOUSE 1 ///< The left mouse button
@@ -388,140 +392,144 @@
/** \name Event States
+
+ The following constants define bits in the fltk3::event_state() value.
+ */
- The following constants define bits in the fltk3::event_state() value.
-*/
-
-/*@{*/ // group: Event States
-
-// FIXME: it would be nice to have the modifiers in the upper 8 bit so that
-// a unicode ke (24bit) can be sent as an unsigned with the modifiers.
-
-#define FL_SHIFT 0x00010000 ///< One of the shift keys is down
-#define FL_CAPS_LOCK 0x00020000 ///< The caps lock is on
-#define FL_CTRL 0x00040000 ///< One of the ctrl keys is down
-#define FL_ALT 0x00080000 ///< One of the alt keys is down
-#define FL_NUM_LOCK 0x00100000 ///< The num lock is on
- // most X servers do this?
-#define FL_META 0x00400000 ///< One of the meta/Windows keys is down
- // correct for XFree86
-#define FL_SCROLL_LOCK 0x00800000 ///< The scroll lock is on
- // correct for XFree86
-#define FL_BUTTON1 0x01000000 ///< Mouse button 1 is pushed
-#define FL_BUTTON2 0x02000000 ///< Mouse button 2 is pushed
-#define FL_BUTTON3 0x04000000 ///< Mouse button 3 is pushed
-#define FL_BUTTONS 0x7f000000 ///< Any mouse button is pushed
-#define FL_BUTTON(n) (0x00800000<<(n)) ///< Mouse button n (n > 0) is pushed
-
-#define FL_KEY_MASK 0x0000ffff ///< All keys are 16 bit for now
- // FIXME: Unicode needs 24 bits!
-
+namespace fltk3 {
+
+ /*@{*/ // group: Event States
+
+ // FIXME: it would be nice to have the modifiers in the upper 8 bit so that
+ // a unicode ke (24bit) can be sent as an unsigned with the modifiers.
+
+ const unsigned int SHIFT = 0x00010000; ///< One of the shift keys is down
+ const unsigned int CAPS_LOCK = 0x00020000; ///< The caps lock is on
+ const unsigned int CTRL = 0x00040000; ///< One of the ctrl keys is down
+ const unsigned int ALT = 0x00080000; ///< One of the alt keys is down
+ const unsigned int NUM_LOCK = 0x00100000; ///< The num lock is on
+ // most X servers do this?
+ const unsigned int META = 0x00400000; ///< One of the meta/Windows keys is down
+ // correct for XFree86
+ const unsigned int SCROLL_LOCK = 0x00800000; ///< The scroll lock is on
+ // correct for XFree86
+ const unsigned int BUTTON1 = 0x01000000; ///< Mouse button 1 is pushed
+ const unsigned int BUTTON2 = 0x02000000; ///< Mouse button 2 is pushed
+ const unsigned int BUTTON3 = 0x04000000; ///< Mouse button 3 is pushed
+ const unsigned int BUTTONS = 0x7f000000; ///< Any mouse button is pushed
+ inline unsigned int BUTTON(unsigned int n) { return (0x00800000<<(n)); } ///< Mouse button n (n > 0) is pushed
+
+ const unsigned int KEY_MASK = 0x0000ffff; ///< All keys are 16 bit for now
+ // FIXME: Unicode needs 24 bits!
+
#ifdef __APPLE__
-# define FL_COMMAND FL_META ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X
-# define FL_CONTROL FL_CTRL ///< An alias for FL_META on WIN32 and X11, or FL_META on MacOS X
+ const unsigned int COMMAND = META; ///< An alias for fltk3::CTRL on WIN32 and X11, or fltk3::META on MacOS X
+ const unsigned int CONTROL = CTRL; ///< An alias for fltk3::META on WIN32 and X11, or fltk3::META on MacOS X
#else
-# define FL_COMMAND FL_CTRL ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X
-# define FL_CONTROL FL_META ///< An alias for FL_META on WIN32 and X11, or FL_META on MacOS X
+ const unsigned int COMMAND = CTRL; ///< An alias for fltk3::CTRL on WIN32 and X11, or fltk3::META on MacOS X
+ const unsigned int CONTROL = META; ///< An alias for fltk3::META on WIN32 and X11, or fltk3::META on MacOS X
#endif // __APPLE__
+
+ /*@}*/ // group: Event States
+
+}
-/*@}*/ // group: Event States
-
/** \name Box Types
- \brief FLTK standard box types
-
- This enum defines the standard box types included with FLTK.
-
- fltk3::NO_BOX means nothing is drawn at all, so whatever is already
- on the screen remains. The FL_..._FRAME types only draw their edges,
- leaving the interior unchanged. The blue color in Figure 1
- is the area that is not drawn by the frame types.
-
- \image html boxtypes.png "Figure 1: FLTK standard box types"
- \image latex boxtypes.png "FLTK standard box types" width=10cm
- \todo Description of boxtypes is incomplete.
- See below for the defined enum fltk3::Boxtype.
- \see src/Fl_get_system_colors.cxx
-*/
+ \brief FLTK standard box types
+
+ This enum defines the standard box types included with FLTK.
+
+ fltk3::NO_BOX means nothing is drawn at all, so whatever is already
+ on the screen remains. The FL_..._FRAME types only draw their edges,
+ leaving the interior unchanged. The blue color in Figure 1
+ is the area that is not drawn by the frame types.
+
+ \image html boxtypes.png "Figure 1: FLTK standard box types"
+ \image latex boxtypes.png "FLTK standard box types" width=10cm
+ \todo Description of boxtypes is incomplete.
+ See below for the defined enum fltk3::Boxtype.
+ \see src/Fl_get_system_colors.cxx
+ */
/*@{*/
namespace fltk3 {
+
+ enum Boxtype { // boxtypes (if you change these you must fix fl_boxtype.C):
+
+ NO_BOX = 0, ///< nothing is drawn at all, this box is invisible
+ FLAT_BOX, ///< a flat box
+ UP_BOX, ///< see figure 1
+ DOWN_BOX, ///< see figure 1
+ UP_FRAME, ///< see figure 1
+ DOWN_FRAME, ///< see figure 1
+ THIN_UP_BOX, ///< see figure 1
+ THIN_DOWN_BOX, ///< see figure 1
+ THIN_UP_FRAME, ///< see figure 1
+ THIN_DOWN_FRAME, ///< see figure 1
+ ENGRAVED_BOX, ///< see figure 1
+ EMBOSSED_BOX, ///< see figure 1
+ ENGRAVED_FRAME, ///< see figure 1
+ EMBOSSED_FRAME, ///< see figure 1
+ BORDER_BOX, ///< see figure 1
+ SHADOW_BOX, ///< see figure 1
+ BORDER_FRAME, ///< see figure 1
+ SHADOW_FRAME, ///< see figure 1
+ ROUNDED_BOX, ///< see figure 1
+ RSHADOW_BOX, ///< see figure 1
+ ROUNDED_FRAME, ///< see figure 1
+ RFLAT_BOX, ///< see figure 1
+ ROUND_UP_BOX, ///< see figure 1
+ ROUND_DOWN_BOX, ///< see figure 1
+ DIAMOND_UP_BOX, ///< see figure 1
+ DIAMOND_DOWN_BOX, ///< see figure 1
+ OVAL_BOX, ///< see figure 1
+ OSHADOW_BOX, ///< see figure 1
+ OVAL_FRAME, ///< see figure 1
+ OFLAT_BOX, ///< see figure 1
+ PLASTIC_UP_BOX, ///< plastic version of fltk3::UP_BOX
+ PLASTIC_DOWN_BOX, ///< plastic version of fltk3::DOWN_BOX
+ PLASTIC_UP_FRAME, ///< plastic version of fltk3::UP_FRAME
+ PLASTIC_DOWN_FRAME, ///< plastic version of fltk3::DOWN_FRAME
+ PLASTIC_THIN_UP_BOX, ///< plastic version of FL_THIN_UP_BOX
+ PLASTIC_THIN_DOWN_BOX, ///< plastic version of FL_THIN_DOWN_BOX
+ PLASTIC_ROUND_UP_BOX, ///< plastic version of FL_ROUND_UP_BOX
+ PLASTIC_ROUND_DOWN_BOX, ///< plastic version of FL_ROUND_DOWN_BOX
+ GTK_UP_BOX, ///< gtk+ version of fltk3::UP_BOX
+ GTK_DOWN_BOX, ///< gtk+ version of fltk3::DOWN_BOX
+ GTK_UP_FRAME, ///< gtk+ version of fltk3::UP_FRAME
+ GTK_DOWN_FRAME, ///< gtk+ version of FL_DOWN_RAME
+ GTK_THIN_UP_BOX, ///< gtk+ version of FL_THIN_UP_BOX
+ GTK_THIN_DOWN_BOX, ///< gtk+ version of FL_THIN_DOWN_BOX
+ GTK_THIN_UP_FRAME, ///< gtk+ version of fltk3::UP_FRAME
+ GTK_THIN_DOWN_FRAME, ///< gtk+ version of fltk3::THIN_DOWN_FRAME
+ GTK_ROUND_UP_BOX, ///< gtk+ version of FL_ROUND_UP_BOX
+ GTK_ROUND_DOWN_BOX, ///< gtk+ version of FL_ROUND_DOWN_BOX
+ FL_FREE_BOXTYPE ///< the first free box type for creation of new box types
+ };
+
+}
-enum Boxtype { // boxtypes (if you change these you must fix fl_boxtype.C):
-
- NO_BOX = 0, ///< nothing is drawn at all, this box is invisible
- FLAT_BOX, ///< a flat box
- UP_BOX, ///< see figure 1
- DOWN_BOX, ///< see figure 1
- UP_FRAME, ///< see figure 1
- DOWN_FRAME, ///< see figure 1
- THIN_UP_BOX, ///< see figure 1
- THIN_DOWN_BOX, ///< see figure 1
- THIN_UP_FRAME, ///< see figure 1
- THIN_DOWN_FRAME, ///< see figure 1
- ENGRAVED_BOX, ///< see figure 1
- EMBOSSED_BOX, ///< see figure 1
- ENGRAVED_FRAME, ///< see figure 1
- EMBOSSED_FRAME, ///< see figure 1
- BORDER_BOX, ///< see figure 1
- SHADOW_BOX, ///< see figure 1
- BORDER_FRAME, ///< see figure 1
- SHADOW_FRAME, ///< see figure 1
- ROUNDED_BOX, ///< see figure 1
- RSHADOW_BOX, ///< see figure 1
- ROUNDED_FRAME, ///< see figure 1
- RFLAT_BOX, ///< see figure 1
- ROUND_UP_BOX, ///< see figure 1
- ROUND_DOWN_BOX, ///< see figure 1
- DIAMOND_UP_BOX, ///< see figure 1
- DIAMOND_DOWN_BOX, ///< see figure 1
- OVAL_BOX, ///< see figure 1
- OSHADOW_BOX, ///< see figure 1
- OVAL_FRAME, ///< see figure 1
- OFLAT_BOX, ///< see figure 1
- PLASTIC_UP_BOX, ///< plastic version of fltk3::UP_BOX
- PLASTIC_DOWN_BOX, ///< plastic version of fltk3::DOWN_BOX
- PLASTIC_UP_FRAME, ///< plastic version of fltk3::UP_FRAME
- PLASTIC_DOWN_FRAME, ///< plastic version of fltk3::DOWN_FRAME
- PLASTIC_THIN_UP_BOX, ///< plastic version of FL_THIN_UP_BOX
- PLASTIC_THIN_DOWN_BOX, ///< plastic version of FL_THIN_DOWN_BOX
- PLASTIC_ROUND_UP_BOX, ///< plastic version of FL_ROUND_UP_BOX
- PLASTIC_ROUND_DOWN_BOX, ///< plastic version of FL_ROUND_DOWN_BOX
- GTK_UP_BOX, ///< gtk+ version of fltk3::UP_BOX
- GTK_DOWN_BOX, ///< gtk+ version of fltk3::DOWN_BOX
- GTK_UP_FRAME, ///< gtk+ version of fltk3::UP_FRAME
- GTK_DOWN_FRAME, ///< gtk+ version of FL_DOWN_RAME
- GTK_THIN_UP_BOX, ///< gtk+ version of FL_THIN_UP_BOX
- GTK_THIN_DOWN_BOX, ///< gtk+ version of FL_THIN_DOWN_BOX
- GTK_THIN_UP_FRAME, ///< gtk+ version of fltk3::UP_FRAME
- GTK_THIN_DOWN_FRAME, ///< gtk+ version of fltk3::THIN_DOWN_FRAME
- GTK_ROUND_UP_BOX, ///< gtk+ version of FL_ROUND_UP_BOX
- GTK_ROUND_DOWN_BOX, ///< gtk+ version of FL_ROUND_DOWN_BOX
- FL_FREE_BOXTYPE ///< the first free box type for creation of new box types
-};
-
-}
-
// conversions of box types to other boxtypes:
/**
- Get the filled version of a frame.
- If no filled version of a given frame exists, the behavior of this function
- is undefined and some random box or frame is returned,
- */
+ Get the filled version of a frame.
+ If no filled version of a given frame exists, the behavior of this function
+ is undefined and some random box or frame is returned,
+ */
inline fltk3::Boxtype fl_box(fltk3::Boxtype b) {
return (fltk3::Boxtype)((b<fltk3::UP_BOX||b%4>1)?b:(b-2));
}
/**
- Get the "pressed" or "down" version of a box.
- If no "down" version of a given box exists, the behavior of this function
- is undefined and some random box or frame is returned,
- */
+ Get the "pressed" or "down" version of a box.
+ If no "down" version of a given box exists, the behavior of this function
+ is undefined and some random box or frame is returned,
+ */
inline fltk3::Boxtype fl_down(fltk3::Boxtype b) {
return (fltk3::Boxtype)((b<fltk3::UP_BOX)?b:(b|1));
}
/**
- Get the unfilled, frame only version of a box.
- If no frame version of a given box exists, the behavior of this function
- is undefined and some random box or frame is returned,
- */
+ Get the unfilled, frame only version of a box.
+ If no frame version of a given box exists, the behavior of this function
+ is undefined and some random box or frame is returned,
+ */
inline fltk3::Boxtype fl_frame(fltk3::Boxtype b) {
return (fltk3::Boxtype)((b%4<2)?b:(b+2));
}
@@ -556,84 +564,80 @@
};
-} // namespace
-
-/** \name Alignment Flags */
-/*@{*/
-/** Flags to control the label alignment.
- * This controls how the label is displayed next to or inside the widget.
- * The default value is FL_ALIGN_CENTER for most widgets, which centers the label
- * inside the widget.
- *
- * Flags can be or'd to achieve a combination of alignments.
- *
- * Outside alignments:
- * \code
- * TOP_LEFT TOP TOP_RIGHT
- * LEFT_TOP+---------------------------------+RIGHT_TOP
- * | |
- * LEFT| |RIGHT
- * | |
- * LEFT_BOTTOM+---------------------------------+RIGHT_BOTTOM
- * BOTTOM_RIGHT BOTTOM BOTTOM_LEFT
- *
- * Inside alignments:
- * +---------------------------------+
- * |TOP_LEFT TOP TOP_RIGHT|
- * | |
- * |LEFT RIGHT|
- * | |
- * |BOTTOM_RIGHT BOTTOM BOTTOM_LEFT|
- * +---------------------------------+
- * \endcode
- * \see #FL_ALIGN_CENTER, etc.
- */
-typedef unsigned Fl_Align;
+ /** \name Alignment Flags */
+ /*@{*/
+ /** Flags to control the label alignment.
+ * This controls how the label is displayed next to or inside the widget.
+ * The default value is ALIGN_CENTER for most widgets, which centers the label
+ * inside the widget.
+ *
+ * Flags can be or'd to achieve a combination of alignments.
+ *
+ * Outside alignments:
+ * \code
+ * TOP_LEFT TOP TOP_RIGHT
+ * LEFT_TOP+---------------------------------+RIGHT_TOP
+ * | |
+ * LEFT| |RIGHT
+ * | |
+ * LEFT_BOTTOM+---------------------------------+RIGHT_BOTTOM
+ * BOTTOM_RIGHT BOTTOM BOTTOM_LEFT
+ *
+ * Inside alignments:
+ * +---------------------------------+
+ * |TOP_LEFT TOP TOP_RIGHT|
+ * | |
+ * |LEFT RIGHT|
+ * | |
+ * |BOTTOM_RIGHT BOTTOM BOTTOM_LEFT|
+ * +---------------------------------+
+ * \endcode
+ * \see #ALIGN_CENTER, etc.
+ */
+ typedef unsigned Align;
/** Align the label horizontally in the middle. */
-const Fl_Align FL_ALIGN_CENTER = (Fl_Align)0;
+ const Align ALIGN_CENTER = (Align)0;
/** Align the label at the top of the widget. Inside labels appear below the top,
* outside labels are drawn on top of the widget. */
-const Fl_Align FL_ALIGN_TOP = (Fl_Align)1;
+ const Align ALIGN_TOP = (Align)1;
/** Align the label at the bottom of the widget. */
-const Fl_Align FL_ALIGN_BOTTOM = (Fl_Align)2;
+ const Align ALIGN_BOTTOM = (Align)2;
/** Align the label at the left of the widget. Inside labels appear left-justified
* starting at the left side of the widget, outside labels are right-justified and
* drawn to the left of the widget. */
-const Fl_Align FL_ALIGN_LEFT = (Fl_Align)4;
+ const Align ALIGN_LEFT = (Align)4;
/** Align the label to the right of the widget. */
-const Fl_Align FL_ALIGN_RIGHT = (Fl_Align)8;
+ const Align ALIGN_RIGHT = (Align)8;
/** Draw the label inside of the widget. */
-const Fl_Align FL_ALIGN_INSIDE = (Fl_Align)16;
+ const Align ALIGN_INSIDE = (Align)16;
/** If the label contains an image, draw the text on top of the image. */
-const Fl_Align FL_ALIGN_TEXT_OVER_IMAGE = (Fl_Align)0x0020;
+ const Align ALIGN_TEXT_OVER_IMAGE = (Align)0x0020;
/** If the label contains an image, draw the text below the image. */
-const Fl_Align FL_ALIGN_IMAGE_OVER_TEXT = (Fl_Align)0x0000;
+ const Align ALIGN_IMAGE_OVER_TEXT = (Align)0x0000;
/** All parts of the label that are lager than the widget will not be drawn . */
-const Fl_Align FL_ALIGN_CLIP = (Fl_Align)64;
+ const Align ALIGN_CLIP = (Align)64;
/** Wrap text that does not fit the width of the widget. */
-const Fl_Align FL_ALIGN_WRAP = (Fl_Align)128;
+ const Align ALIGN_WRAP = (Align)128;
/** If the label contains an image, draw the text to the right of the image. */
-const Fl_Align FL_ALIGN_IMAGE_NEXT_TO_TEXT = (Fl_Align)0x0100;
+ const Align ALIGN_IMAGE_NEXT_TO_TEXT = (Align)0x0100;
/** If the label contains an image, draw the text to the left of the image. */
-const Fl_Align FL_ALIGN_TEXT_NEXT_TO_IMAGE = (Fl_Align)0x0120;
-/** If the label contains an image, draw the image or deimage in the backgroup. */
-const Fl_Align FL_ALIGN_IMAGE_BACKDROP = (Fl_Align)0x0200;
-const Fl_Align FL_ALIGN_TOP_LEFT = FL_ALIGN_TOP | FL_ALIGN_LEFT;
-const Fl_Align FL_ALIGN_TOP_RIGHT = FL_ALIGN_TOP | FL_ALIGN_RIGHT;
-const Fl_Align FL_ALIGN_BOTTOM_LEFT = FL_ALIGN_BOTTOM | FL_ALIGN_LEFT;
-const Fl_Align FL_ALIGN_BOTTOM_RIGHT = FL_ALIGN_BOTTOM | FL_ALIGN_RIGHT;
-const Fl_Align FL_ALIGN_LEFT_TOP = 0x0007; // magic value
-const Fl_Align FL_ALIGN_RIGHT_TOP = 0x000b; // magic value
-const Fl_Align FL_ALIGN_LEFT_BOTTOM = 0x000d; // magic value
-const Fl_Align FL_ALIGN_RIGHT_BOTTOM = 0x000e; // magic value
-const Fl_Align FL_ALIGN_NOWRAP = (Fl_Align)0; // for back compatability
-const Fl_Align FL_ALIGN_POSITION_MASK = 0x000f; // left, right, top, bottom
-const Fl_Align FL_ALIGN_IMAGE_MASK = 0x0320; // l/r, t/b, backdrop
-/*@}*/
-
-
-namespace fltk3 {
+ const Align ALIGN_TEXT_NEXT_TO_IMAGE = (Align)0x0120;
+ /** If the label contains an image, draw the image or deimage in the backgroup. */
+ const Align ALIGN_IMAGE_BACKDROP = (Align)0x0200;
+ const Align ALIGN_TOP_LEFT = ALIGN_TOP | ALIGN_LEFT;
+ const Align ALIGN_TOP_RIGHT = ALIGN_TOP | ALIGN_RIGHT;
+ const Align ALIGN_BOTTOM_LEFT = ALIGN_BOTTOM | ALIGN_LEFT;
+ const Align ALIGN_BOTTOM_RIGHT = ALIGN_BOTTOM | ALIGN_RIGHT;
+ const Align ALIGN_LEFT_TOP = 0x0007; // magic value
+ const Align ALIGN_RIGHT_TOP = 0x000b; // magic value
+ const Align ALIGN_LEFT_BOTTOM = 0x000d; // magic value
+ const Align ALIGN_RIGHT_BOTTOM = 0x000e; // magic value
+ const Align ALIGN_NOWRAP = (Align)0; // for back compatability
+ const Align ALIGN_POSITION_MASK = 0x000f; // left, right, top, bottom
+ const Align ALIGN_IMAGE_MASK = 0x0320; // l/r, t/b, backdrop
+ /*@}*/
+
/** \name Font Numbers */
/*@{*/
/** A font number is an index into the internal font table.
@@ -667,196 +671,203 @@
const Font BOLD = 1; ///< add this to helvetica, courier, or times
const Font ITALIC = 2; ///< add this to helvetica, courier, or times
const Font BOLD_ITALIC = 3; ///< add this to helvetica, courier, or times
-
-/*@}*/
-
+
+ /*@}*/
+
/** Size of a font in pixels.
* This is the approximate height of a font in pixels.
*/
typedef int Fontsize;
-
+
+ extern FL_EXPORT Fontsize NORMAL_SIZE; ///< normal font size
+
+ /** \name Colors */
+ /*@{*/
+ /** The fltk3::Color type holds an FLTK color value.
+
+ Colors are either 8-bit indexes into a virtual colormap
+ or 24-bit RGB color values.
+
+ Color indices occupy the lower 8 bits of the value, while
+ RGB colors occupy the upper 24 bits, for a byte organization of RGBI.
+
+ <pre>
+ fltk3::Color => 0xrrggbbii
+ | | | |
+ | | | +--- index between 0 and 255
+ | | +----- blue color component (8 bit)
+ | +------- green component (8 bit)
+ +--------- red component (8 bit)
+ </pre>
+
+ A color can have either an index or an rgb value. Colors with rgb set
+ and an index >0 are reserved for special use.
+
+ */
+
+ typedef unsigned int Color;
+
}
-
-extern FL_EXPORT fltk3::Fontsize FL_NORMAL_SIZE; ///< normal font size
-/** \name Colors */
-/*@{*/
-/** The Fl_Color type holds an FLTK color value.
-
- Colors are either 8-bit indexes into a virtual colormap
- or 24-bit RGB color values.
-
- Color indices occupy the lower 8 bits of the value, while
- RGB colors occupy the upper 24 bits, for a byte organization of RGBI.
-
-<pre>
- Fl_Color => 0xrrggbbii
- | | | |
- | | | +--- index between 0 and 255
- | | +----- blue color component (8 bit)
- | +------- green component (8 bit)
- +--------- red component (8 bit)
- </pre>
-
- A color can have either an index or an rgb value. Colors with rgb set
- and an index >0 are reserved for special use.
-
- */
-
-typedef unsigned int Fl_Color;
-
// Standard colors. These are used as default colors in widgets and altered as necessary
-const Fl_Color FL_FOREGROUND_COLOR = 0; ///< the default foreground color (0) used for labels and text
-const Fl_Color FL_BACKGROUND2_COLOR = 7; ///< the default background color for text, list, and valuator widgets
-const Fl_Color FL_INACTIVE_COLOR = 8; ///< the inactive foreground color
-const Fl_Color FL_SELECTION_COLOR = 15; ///< the default selection/highlight color
+const fltk3::Color FL_FOREGROUND_COLOR = 0; ///< the default foreground color (0) used for labels and text
+const fltk3::Color FL_BACKGROUND2_COLOR = 7; ///< the default background color for text, list, and valuator widgets
+const fltk3::Color FL_INACTIVE_COLOR = 8; ///< the inactive foreground color
+const fltk3::Color FL_SELECTION_COLOR = 15; ///< the default selection/highlight color
- // boxtypes generally limit themselves to these colors so
- // the whole ramp is not allocated:
+// boxtypes generally limit themselves to these colors so
+// the whole ramp is not allocated:
-const Fl_Color FL_GRAY0 = 32; // 'A'
-const Fl_Color FL_DARK3 = 39; // 'H'
-const Fl_Color FL_DARK2 = 45; // 'N'
-const Fl_Color FL_DARK1 = 47; // 'P'
-const Fl_Color FL_BACKGROUND_COLOR = 49; // 'R' default background color
-const Fl_Color FL_LIGHT1 = 50; // 'S'
-const Fl_Color FL_LIGHT2 = 52; // 'U'
-const Fl_Color FL_LIGHT3 = 54; // 'W'
+const fltk3::Color FL_GRAY0 = 32; // 'A'
+const fltk3::Color FL_DARK3 = 39; // 'H'
+const fltk3::Color FL_DARK2 = 45; // 'N'
+const fltk3::Color FL_DARK1 = 47; // 'P'
+const fltk3::Color FL_BACKGROUND_COLOR = 49; // 'R' default background color
+const fltk3::Color FL_LIGHT1 = 50; // 'S'
+const fltk3::Color FL_LIGHT2 = 52; // 'U'
+const fltk3::Color FL_LIGHT3 = 54; // 'W'
- // FLTK provides a 5x8x5 color cube that is used with colormap visuals
+// FLTK provides a 5x8x5 color cube that is used with colormap visuals
-const Fl_Color FL_BLACK = 56;
-const Fl_Color FL_RED = 88;
-const Fl_Color FL_GREEN = 63;
-const Fl_Color FL_YELLOW = 95;
-const Fl_Color FL_BLUE = 216;
-const Fl_Color FL_MAGENTA = 248;
-const Fl_Color FL_CYAN = 223;
-const Fl_Color FL_DARK_RED = 72;
+const fltk3::Color FL_BLACK = 56;
+const fltk3::Color FL_RED = 88;
+const fltk3::Color FL_GREEN = 63;
+const fltk3::Color FL_YELLOW = 95;
+const fltk3::Color FL_BLUE = 216;
+const fltk3::Color FL_MAGENTA = 248;
+const fltk3::Color FL_CYAN = 223;
+const fltk3::Color FL_DARK_RED = 72;
-const Fl_Color FL_DARK_GREEN = 60;
-const Fl_Color FL_DARK_YELLOW = 76;
-const Fl_Color FL_DARK_BLUE = 136;
-const Fl_Color FL_DARK_MAGENTA = 152;
-const Fl_Color FL_DARK_CYAN = 140;
+const fltk3::Color FL_DARK_GREEN = 60;
+const fltk3::Color FL_DARK_YELLOW = 76;
+const fltk3::Color FL_DARK_BLUE = 136;
+const fltk3::Color FL_DARK_MAGENTA = 152;
+const fltk3::Color FL_DARK_CYAN = 140;
-const Fl_Color FL_WHITE = 255;
+const fltk3::Color FL_WHITE = 255;
-#define FL_FREE_COLOR (Fl_Color)16
+#define FL_FREE_COLOR (fltk3::Color)16
#define FL_NUM_FREE_COLOR 16
-#define FL_GRAY_RAMP (Fl_Color)32
+#define FL_GRAY_RAMP (fltk3::Color)32
#define FL_NUM_GRAY 24
#define FL_GRAY FL_BACKGROUND_COLOR
-#define FL_COLOR_CUBE (Fl_Color)56
+#define FL_COLOR_CUBE (fltk3::Color)56
#define FL_NUM_RED 5
#define FL_NUM_GREEN 8
#define FL_NUM_BLUE 5
-FL_EXPORT Fl_Color fl_inactive(Fl_Color c);
+FL_EXPORT fltk3::Color fl_inactive(fltk3::Color c);
-FL_EXPORT Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg);
+FL_EXPORT fltk3::Color fl_contrast(fltk3::Color fg, fltk3::Color bg);
-FL_EXPORT Fl_Color fl_color_average(Fl_Color c1, Fl_Color c2, float weight);
+FL_EXPORT fltk3::Color fl_color_average(fltk3::Color c1, fltk3::Color c2, float weight);
-inline Fl_Color fl_lighter(Fl_Color c) { return fl_color_average(c, FL_WHITE, .67f); }
+inline fltk3::Color fl_lighter(fltk3::Color c) { return fl_color_average(c, FL_WHITE, .67f); }
-inline Fl_Color fl_darker(Fl_Color c) { return fl_color_average(c, FL_BLACK, .67f); }
+inline fltk3::Color fl_darker(fltk3::Color c) { return fl_color_average(c, FL_BLACK, .67f); }
/** return 24-bit color value closest to \p r, \p g, \p b. */
-inline Fl_Color fl_rgb_color(uchar r, uchar g, uchar b) {
+inline fltk3::Color fl_rgb_color(uchar r, uchar g, uchar b) {
if (!r && !g && !b) return FL_BLACK;
- else return (Fl_Color)(((((r << 8) | g) << 8) | b) << 8);
+ else return (fltk3::Color)(((((r << 8) | g) << 8) | b) << 8);
}
/** return 24-bit color value closest to \p grayscale */
-inline Fl_Color fl_rgb_color(uchar g) {
+inline fltk3::Color fl_rgb_color(uchar g) {
if (!g) return FL_BLACK;
- else return (Fl_Color)(((((g << 8) | g) << 8) | g) << 8);
+ else return (fltk3::Color)(((((g << 8) | g) << 8) | g) << 8);
}
-inline Fl_Color fl_gray_ramp(int i) {return (Fl_Color)(i+FL_GRAY_RAMP);}
+inline fltk3::Color fl_gray_ramp(int i) {return (fltk3::Color)(i+FL_GRAY_RAMP);}
-inline Fl_Color fl_color_cube(int r, int g, int b) {
- return (Fl_Color)((b*FL_NUM_RED + r) * FL_NUM_GREEN + g + FL_COLOR_CUBE);}
+inline fltk3::Color fl_color_cube(int r, int g, int b) {
+ return (fltk3::Color)((b*FL_NUM_RED + r) * FL_NUM_GREEN + g + FL_COLOR_CUBE);}
//*@}*/ // group: Colors
-/** \name Cursors
+namespace fltk3 {
+
+ /** \name Cursors
+
+ The following constants define the mouse cursors that are available in FLTK.
+
+ The double-headed arrows are bitmaps provided by FLTK on X, the others
+ are provided by system-defined cursors.
+
+ \todo enum fltk3::Cursor needs some more comments for values
+ (and maybe an image), see Fl/Enumerations.H
+ */
+ enum Cursor { // standard cursors
+ CURSOR_DEFAULT = 0,
+ CURSOR_ARROW = 35,
+ CURSOR_CROSS = 66,
+ CURSOR_WAIT = 76,
+ CURSOR_INSERT = 77,
+ CURSOR_HAND = 31,
+ CURSOR_HELP = 47,
+ CURSOR_MOVE = 27,
+ // fltk provides bitmaps for these:
+ CURSOR_NS = 78,
+ CURSOR_WE = 79,
+ CURSOR_NWSE = 80,
+ CURSOR_NESW = 81,
+ CURSOR_NONE = 255,
+ // for back compatability (non MSWindows ones):
+ CURSOR_N = 70,
+ CURSOR_NE = 69,
+ CURSOR_E = 49,
+ CURSOR_SE = 8,
+ CURSOR_S = 9,
+ CURSOR_SW = 7,
+ CURSOR_W = 36,
+ CURSOR_NW = 68
+ //CURSOR_NS = 22,
+ //CURSOR_WE = 55,
+ };
+
+
+ enum { // values for "when" passed to fltk3::add_fd()
+ READ = 1,
+ WRITE = 4,
+ EXCEPT = 8
+ };
+
+
+ enum Mode { // visual types and Fl_Gl_Window::mode() (values match Glut)
+ RGB = 0,
+ INDEX = 1,
+ SINGLE = 0,
+ DOUBLE = 2,
+ ACCUM = 4,
+ ALPHA = 8,
+ DEPTH = 16,
+ STENCIL = 32,
+ RGB8 = 64,
+ MULTISAMPLE= 128,
+ STEREO = 256,
+ FAKE_SINGLE = 512 // Fake single buffered windows using double-buffer
+ };
+
+
+ // image alpha blending
+
+ const unsigned int IMAGE_WITH_ALPHA = 0x40000000;
+
+ // damage masks
+
+ enum Damage {
+ DAMAGE_CHILD = 0x01,
+ DAMAGE_EXPOSE = 0x02,
+ DAMAGE_SCROLL = 0x04,
+ DAMAGE_OVERLAY = 0x08,
+ DAMAGE_USER1 = 0x10,
+ DAMAGE_USER2 = 0x20,
+ DAMAGE_ALL = 0x80
+ };
+
+}
- The following constants define the mouse cursors that are available in FLTK.
-
- The double-headed arrows are bitmaps provided by FLTK on X, the others
- are provided by system-defined cursors.
-
- \todo enum Fl_Cursor needs some more comments for values
- (and maybe an image), see Fl/Enumerations.H
-*/
-enum Fl_Cursor { // standard cursors
- FL_CURSOR_DEFAULT = 0,
- FL_CURSOR_ARROW = 35,
- FL_CURSOR_CROSS = 66,
- FL_CURSOR_WAIT = 76,
- FL_CURSOR_INSERT = 77,
- FL_CURSOR_HAND = 31,
- FL_CURSOR_HELP = 47,
- FL_CURSOR_MOVE = 27,
- // fltk provides bitmaps for these:
- FL_CURSOR_NS = 78,
- FL_CURSOR_WE = 79,
- FL_CURSOR_NWSE = 80,
- FL_CURSOR_NESW = 81,
- FL_CURSOR_NONE = 255,
- // for back compatability (non MSWindows ones):
- FL_CURSOR_N = 70,
- FL_CURSOR_NE = 69,
- FL_CURSOR_E = 49,
- FL_CURSOR_SE = 8,
- FL_CURSOR_S = 9,
- FL_CURSOR_SW = 7,
- FL_CURSOR_W = 36,
- FL_CURSOR_NW = 68
- //FL_CURSOR_NS = 22,
- //FL_CURSOR_WE = 55,
-};
-
-enum { // values for "when" passed to fltk3::add_fd()
- FL_READ = 1,
- FL_WRITE = 4,
- FL_EXCEPT = 8
-};
-
-enum Fl_Mode { // visual types and Fl_Gl_Window::mode() (values match Glut)
- FL_RGB = 0,
- FL_INDEX = 1,
- FL_SINGLE = 0,
- FL_DOUBLE = 2,
- FL_ACCUM = 4,
- FL_ALPHA = 8,
- FL_DEPTH = 16,
- FL_STENCIL = 32,
- FL_RGB8 = 64,
- FL_MULTISAMPLE= 128,
- FL_STEREO = 256,
- FL_FAKE_SINGLE = 512 // Fake single buffered windows using double-buffer
-};
-
-// image alpha blending
-
-#define FL_IMAGE_WITH_ALPHA 0x40000000
-
-// damage masks
-
-enum Fl_Damage {
- FL_DAMAGE_CHILD = 0x01,
- FL_DAMAGE_EXPOSE = 0x02,
- FL_DAMAGE_SCROLL = 0x04,
- FL_DAMAGE_OVERLAY = 0x08,
- FL_DAMAGE_USER1 = 0x10,
- FL_DAMAGE_USER2 = 0x20,
- FL_DAMAGE_ALL = 0x80
-};
-
// FLTK 1.0.x compatibility definitions...
# ifdef FLTK_1_0_COMPAT
# define contrast fl_contrast
@@ -865,7 +876,7 @@
# define inactive fl_inactive
# endif // FLTK_1_0_COMPAT
-
+
#endif
//
Modified: branches/branch-3.0-2011/fltk3/Fl_Browser_.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Browser_.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Browser_.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -74,7 +74,7 @@
uchar has_scrollbar_; // which scrollbars are enabled
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
void* top_; // which item scrolling position is in
void* selection_; // which is selected (except for FL_MULTI_BROWSER)
void *redraw1,*redraw2; // minimal update pointers
@@ -184,7 +184,7 @@
This method will cause the entire list to be redrawn.
\see redraw_lines(), redraw_line()
*/
- void redraw_lines() { damage(FL_DAMAGE_SCROLL); } // redraw all of them
+ void redraw_lines() { damage(fltk3::DAMAGE_SCROLL); } // redraw all of them
void bbox(int &X,int &Y,int &W,int &H) const;
int leftedge() const; // x position after scrollbar & border
void *find_item(int ypos); // item under mouse
@@ -297,11 +297,11 @@
/**
Gets the default text color for the lines in the browser.
*/
- Fl_Color textcolor() const { return textcolor_; }
+ fltk3::Color textcolor() const { return textcolor_; }
/**
Sets the default text color for the lines in the browser to color \p col.
*/
- void textcolor(Fl_Color col) { textcolor_ = col; }
+ void textcolor(fltk3::Color col) { textcolor_ = col; }
/**
Gets the current size of the scrollbars' troughs, in pixels.
@@ -362,12 +362,12 @@
Moves the vertical scrollbar to the righthand side of the list.
For back compatibility.
*/
- void scrollbar_right() { scrollbar.align(FL_ALIGN_RIGHT); }
+ void scrollbar_right() { scrollbar.align(fltk3::ALIGN_RIGHT); }
/**
Moves the vertical scrollbar to the lefthand side of the list.
For back compatibility.
*/
- void scrollbar_left() { scrollbar.align(FL_ALIGN_LEFT); }
+ void scrollbar_left() { scrollbar.align(fltk3::ALIGN_LEFT); }
void sort(int flags=0);
};
Modified: branches/branch-3.0-2011/fltk3/Fl_Button.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Button.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Button.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -73,11 +73,11 @@
\todo Refactor the doxygen comments for Fl_Button when() documentation.
For an Fl_Button object, the following when() values are useful, the default
- being \c FL_WHEN_RELEASE:
+ being \c fltk3::WHEN_RELEASE:
\li \c 0: The callback is not done, instead changed() is turned on.
- \li \c FL_WHEN_RELEASE: The callback is done after the user successfully
+ \li \c fltk3::WHEN_RELEASE: The callback is done after the user successfully
clicks the button, or when a shortcut is typed.
- \li \c FL_WHEN_CHANGED: The callback is done each time the value() changes
+ \li \c fltk3::WHEN_CHANGED: The callback is done each time the value() changes
(when the user pushes and releases the button, and as the mouse is
dragged around in and out of the button).
*/
@@ -133,8 +133,8 @@
Sets the shortcut key to \c s.
Setting this overrides the use of '\&' in the label().
The value is a bitwise OR of a key and a set of shift flags, for example:
- <tt>FL_ALT | 'a'</tt>, or
- <tt>FL_ALT | (FL_F + 10)</tt>, or just
+ <tt>fltk3::ALT | 'a'</tt>, or
+ <tt>fltk3::ALT | (FL_F + 10)</tt>, or just
<tt>'a'</tt>.
A value of 0 disables the shortcut.
@@ -167,7 +167,7 @@
void shortcut(const char *s) {shortcut(fl_old_shortcut(s));}
/// (for backwards compatibility)
- Fl_Color down_color() const {return selection_color();}
+ fltk3::Color down_color() const {return selection_color();}
/// (for backwards compatibility)
void down_color(unsigned c) {selection_color(c);}
Modified: branches/branch-3.0-2011/fltk3/Fl_Chart.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Chart.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Chart.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -87,7 +87,7 @@
uchar autosize_;
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
protected:
void draw();
public:
@@ -136,9 +136,9 @@
void textsize(fltk3::Fontsize s) {textsize_ = s;}
/** Gets the chart's text color */
- Fl_Color textcolor() const {return textcolor_;}
+ fltk3::Color textcolor() const {return textcolor_;}
/** gets the chart's text color to \p n. */
- void textcolor(Fl_Color n) {textcolor_ = n;}
+ void textcolor(fltk3::Color n) {textcolor_ = n;}
/**
Get whether the chart will automatically adjust the bounds of the chart.
Modified: branches/branch-3.0-2011/fltk3/Fl_Clock.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Clock.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Clock.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -63,7 +63,7 @@
class FL_EXPORT Fl_Clock_Output : public fltk3::Widget {
int hour_, minute_, second_;
ulong value_;
- void drawhands(Fl_Color,Fl_Color); // part of draw
+ void drawhands(fltk3::Color,fltk3::Color); // part of draw
protected:
void draw();
void draw(int X, int Y, int W, int H);
Modified: branches/branch-3.0-2011/fltk3/Fl_Counter.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Counter.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Counter.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -58,7 +58,7 @@
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
double lstep_;
uchar mouseobj;
static void repeat_callback(void *);
@@ -111,9 +111,9 @@
void textsize(fltk3::Fontsize s) {textsize_ = s;}
/** Gets the font color */
- Fl_Color textcolor() const {return textcolor_;}
+ fltk3::Color textcolor() const {return textcolor_;}
/** Sets the font color to \p s */
- void textcolor(Fl_Color s) {textcolor_ = s;}
+ void textcolor(fltk3::Color s) {textcolor_ = s;}
};
Modified: branches/branch-3.0-2011/fltk3/Fl_Device.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Device.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Device.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -120,7 +120,7 @@
friend void fl_draw(int angle, const char *str, int n, int x, int y);
friend void fl_rtl_draw(const char *str, int n, int x, int y);
friend void fl_font(fltk3::Font face, fltk3::Fontsize size);
- friend void fl_color(Fl_Color c);
+ friend void fl_color(fltk3::Color c);
friend void fl_color(uchar r, uchar g, uchar b);
friend void fl_point(int x, int y);
friend void fl_loop(int x0, int y0, int x1, int y1, int x2, int y2);
@@ -187,8 +187,8 @@
virtual void rtl_draw(const char *str, int n, int x, int y) {};
/** \brief see fl_font(fltk3::Font face, fltk3::Fontsize size). */
virtual void font(fltk3::Font face, fltk3::Fontsize size) {};
- /** \brief see fl_color(Fl_Color c). */
- virtual void color(Fl_Color c) {};
+ /** \brief see fl_color(fltk3::Color c). */
+ virtual void color(fltk3::Color c) {};
/** \brief see fl_color(uchar r, uchar g, uchar b). */
virtual void color(uchar r, uchar g, uchar b) {};
/** \brief see fl_point(int x, int y). */
@@ -293,7 +293,7 @@
/** \brief The constructor. */
Fl_Quartz_Graphics_Driver() { class_name( class_id); };
static const char *class_id;
- void color(Fl_Color c);
+ void color(fltk3::Color c);
void color(uchar r, uchar g, uchar b);
void draw(const char* str, int n, int x, int y);
void draw(int angle, const char *str, int n, int x, int y);
@@ -319,7 +319,7 @@
/** \brief The constructor. */
Fl_GDI_Graphics_Driver() { class_name ( class_id); };
static const char *class_id;
- void color(Fl_Color c);
+ void color(fltk3::Color c);
void color(uchar r, uchar g, uchar b);
void draw(const char* str, int n, int x, int y);
void draw(int angle, const char *str, int n, int x, int y);
@@ -345,7 +345,7 @@
/** \brief The constructor. */
Fl_Xlib_Graphics_Driver() { class_name ( class_id); };
static const char *class_id;
- void color(Fl_Color c);
+ void color(fltk3::Color c);
void color(uchar r, uchar g, uchar b);
void draw(const char* str, int n, int x, int y);
void draw(int angle, const char *str, int n, int x, int y);
Modified: branches/branch-3.0-2011/fltk3/Fl_File_Chooser.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_File_Chooser.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_File_Chooser.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -126,8 +126,8 @@
public:
~Fl_File_Chooser();
void callback(void (*cb)(Fl_File_Chooser *, void *), void *d = 0);
- void color(Fl_Color c);
- Fl_Color color();
+ void color(fltk3::Color c);
+ fltk3::Color color();
int count();
void directory(const char *d);
char * directory();
@@ -148,8 +148,8 @@
void rescan_keep_filename();
void show();
int shown();
- void textcolor(Fl_Color c);
- Fl_Color textcolor();
+ void textcolor(fltk3::Color c);
+ fltk3::Color textcolor();
void textfont(fltk3::Font f);
fltk3::Font textfont();
void textsize(fltk3::Fontsize s);
Modified: branches/branch-3.0-2011/fltk3/Fl_File_Icon.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_File_Icon.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_File_Icon.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -42,7 +42,7 @@
// Special color value for the icon color.
//
-# define FL_ICON_COLOR (Fl_Color)0xffffffff /**< icon color [background?]*/
+# define FL_ICON_COLOR (fltk3::Color)0xffffffff /**< icon color [background?]*/
//
@@ -95,7 +95,7 @@
Adds a color value to the icon array, returning a pointer to it.
\param[in] c color value
*/
- short *add_color(Fl_Color c)
+ short *add_color(fltk3::Color c)
{ short *d = add((short)COLOR); add((short)(c >> 16)); add((short)c); return (d); }
/**
@@ -120,11 +120,11 @@
/** Clears all icon data from the icon.*/
void clear() { num_data_ = 0; }
- void draw(int x, int y, int w, int h, Fl_Color ic, int active = 1);
+ void draw(int x, int y, int w, int h, fltk3::Color ic, int active = 1);
void label(fltk3::Widget *w);
- static void labeltype(const Fl_Label *o, int x, int y, int w, int h, Fl_Align a);
+ static void labeltype(const Fl_Label *o, int x, int y, int w, int h, fltk3::Align a);
void load(const char *f);
int load_fti(const char *fti);
int load_image(const char *i);
Modified: branches/branch-3.0-2011/fltk3/Fl_File_Input.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_File_Input.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_File_Input.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -40,9 +40,9 @@
A navigation bar located above the input field allows the user to
navigate upward in the directory tree.
- You may want to handle FL_WHEN_CHANGED events for tracking text changes
- and also FL_WHEN_RELEASE for button release when changing to parent dir.
- FL_WHEN_RELEASE callback won't be called if the directory clicked
+ You may want to handle fltk3::WHEN_CHANGED events for tracking text changes
+ and also fltk3::WHEN_RELEASE for button release when changing to parent dir.
+ fltk3::WHEN_RELEASE callback won't be called if the directory clicked
is the same that the current one.
<P align=CENTER> \image html Fl_File_Input.png </P>
\image latex Fl_File_Input.png "Fl_File_Input" width=6cm
@@ -53,7 +53,7 @@
*/
class FL_EXPORT Fl_File_Input : public Fl_Input
{
- Fl_Color errorcolor_;
+ fltk3::Color errorcolor_;
char ok_entry_;
uchar down_box_;
short buttons_[200];
@@ -82,9 +82,9 @@
Gets the current error color.
\todo Better docs for Fl_File_Input::errorcolor() - is it even used?
*/
- Fl_Color errorcolor() const { return errorcolor_; }
+ fltk3::Color errorcolor() const { return errorcolor_; }
/** Sets the current error color to \p c */
- void errorcolor(Fl_Color c) { errorcolor_ = c; }
+ void errorcolor(fltk3::Color c) { errorcolor_ = c; }
int value(const char *str);
int value(const char *str, int len);
Modified: branches/branch-3.0-2011/fltk3/Fl_Gl_Window.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Gl_Window.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Gl_Window.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -142,22 +142,22 @@
Set or change the OpenGL capabilites of the window. The value can be
any of the following OR'd together:
- - \c FL_RGB - RGB color (not indexed)
- - \c FL_RGB8 - RGB color with at least 8 bits of each color
- - \c FL_INDEX - Indexed mode
- - \c FL_SINGLE - not double buffered
- - \c FL_DOUBLE - double buffered
- - \c FL_ACCUM - accumulation buffer
- - \c FL_ALPHA - alpha channel in color
- - \c FL_DEPTH - depth buffer
- - \c FL_STENCIL - stencil buffer
- - \c FL_MULTISAMPLE - multisample antialiasing
+ - \c fltk3::RGB - RGB color (not indexed)
+ - \c fltk3::RGB8 - RGB color with at least 8 bits of each color
+ - \c fltk3::INDEX - Indexed mode
+ - \c fltk3::SINGLE - not double buffered
+ - \c fltk3::DOUBLE - double buffered
+ - \c fltk3::ACCUM - accumulation buffer
+ - \c fltk3::ALPHA - alpha channel in color
+ - \c fltk3::DEPTH - depth buffer
+ - \c fltk3::STENCIL - stencil buffer
+ - \c fltk3::MULTISAMPLE - multisample antialiasing
- FL_RGB and FL_SINGLE have a value of zero, so they
- are "on" unless you give FL_INDEX or FL_DOUBLE.
+ fltk3::RGB and fltk3::SINGLE have a value of zero, so they
+ are "on" unless you give fltk3::INDEX or fltk3::DOUBLE.
If the desired combination cannot be done, FLTK will try turning off
- FL_MULTISAMPLE. If this also fails the show() will call
+ fltk3::MULTISAMPLE. If this also fails the show() will call
fltk3::error() and not show the window.
You can change the mode while the window is displayed. This is most
@@ -171,10 +171,10 @@
mode() must not be called within draw() since it
changes the current context.
*/
- Fl_Mode mode() const {return (Fl_Mode)mode_;}
- /** See Fl_Mode mode() const */
+ fltk3::MODE mode() const {return (fltk3::MODE)mode_;}
+ /** See fltk3::MODE mode() const */
int mode(int a) {return mode(a,0);}
- /** See Fl_Mode mode() const */
+ /** See fltk3::MODE mode() const */
int mode(const int *a) {return mode(0, a);}
/** void See void context(void* v, int destroy_flag) */
void* context() const {return context_;}
@@ -212,13 +212,13 @@
~Fl_Gl_Window();
/**
Creates a new Fl_Gl_Window widget using the given size, and label string.
- The default boxtype is fltk3::NO_BOX. The default mode is FL_RGB|FL_DOUBLE|FL_DEPTH.
+ The default boxtype is fltk3::NO_BOX. The default mode is fltk3::RGB|fltk3::DOUBLE|fltk3::DEPTH.
*/
Fl_Gl_Window(int W, int H, const char *l=0) : fltk3::Window(W,H,l) {init();}
/**
Creates a new Fl_Gl_Window widget using the given position,
size, and label string. The default boxtype is fltk3::NO_BOX. The
- default mode is FL_RGB|FL_DOUBLE|FL_DEPTH.
+ default mode is fltk3::RGB|fltk3::DOUBLE|fltk3::DEPTH.
*/
Fl_Gl_Window(int X, int Y, int W, int H, const char *l=0)
Modified: branches/branch-3.0-2011/fltk3/Fl_Help_View.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Help_View.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Help_View.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -62,7 +62,7 @@
const char *start, // Start of text
*end; // End of text
uchar border; // Draw border?
- Fl_Color bgcolor; // Background color
+ fltk3::Color bgcolor; // Background color
int x, // Indentation/starting X coordinate
y, // Starting Y coordinate
w, // Width
@@ -92,10 +92,10 @@
struct Fl_Help_Font_Style {
fltk3::Font f; ///< Font
fltk3::Fontsize s; ///< Font Size
- Fl_Color c; ///< Font Color
- void get(fltk3::Font &afont, fltk3::Fontsize &asize, Fl_Color &acolor) {afont=f; asize=s; acolor=c;} ///< Gets current font attributes
- void set(fltk3::Font afont, fltk3::Fontsize asize, Fl_Color acolor) {f=afont; s=asize; c=acolor;} ///< Sets current font attributes
- Fl_Help_Font_Style(fltk3::Font afont, fltk3::Fontsize asize, Fl_Color acolor) {set(afont, asize, acolor);}
+ fltk3::Color c; ///< Font Color
+ void get(fltk3::Font &afont, fltk3::Fontsize &asize, fltk3::Color &acolor) {afont=f; asize=s; acolor=c;} ///< Gets current font attributes
+ void set(fltk3::Font afont, fltk3::Fontsize asize, fltk3::Color acolor) {f=afont; s=asize; c=acolor;} ///< Sets current font attributes
+ Fl_Help_Font_Style(fltk3::Font afont, fltk3::Fontsize asize, fltk3::Color acolor) {set(afont, asize, acolor);}
Fl_Help_Font_Style(){} // For in table use
};
@@ -108,22 +108,22 @@
nfonts_ = 0;
}
- void init(fltk3::Font f, fltk3::Fontsize s, Fl_Color c) {
+ void init(fltk3::Font f, fltk3::Fontsize s, fltk3::Color c) {
nfonts_ = 0;
elts_[nfonts_].set(f, s, c);
fl_font(f, s);
fl_color(c);
}
/** Gets the top (current) element on the stack. */
- void top(fltk3::Font &f, fltk3::Fontsize &s, Fl_Color &c) { elts_[nfonts_].get(f, s, c); }
+ void top(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) { elts_[nfonts_].get(f, s, c); }
/** Pushes the font style triplet on the stack, also calls fl_font() & fl_color() adequately */
- void push(fltk3::Font f, fltk3::Fontsize s, Fl_Color c) {
+ void push(fltk3::Font f, fltk3::Fontsize s, fltk3::Color c) {
if (nfonts_ < MAX_FL_HELP_FS_ELTS-1) nfonts_ ++;
elts_[nfonts_].set(f, s, c);
fl_font(f, s); fl_color(c);
}
/** Pops from the stack the font style triplet and calls fl_font() & fl_color() adequately */
- void pop(fltk3::Font &f, fltk3::Fontsize &s, Fl_Color &c) {
+ void pop(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) {
if (nfonts_ > 0) nfonts_ --;
top(f, s, c);
fl_font(f, s); fl_color(c);
@@ -214,7 +214,7 @@
enum { RIGHT = -1, CENTER, LEFT }; ///< Alignments
char title_[1024]; ///< Title string
- Fl_Color defcolor_, ///< Default text color
+ fltk3::Color defcolor_, ///< Default text color
bgcolor_, ///< Background color
textcolor_, ///< Text color
linkcolor_; ///< Link color
@@ -258,14 +258,14 @@
static int mouse_y;
static int current_pos;
static Fl_Help_View *current_view;
- static Fl_Color hv_selection_color;
- static Fl_Color hv_selection_text_color;
+ static fltk3::Color hv_selection_color;
+ static fltk3::Color hv_selection_text_color;
- void initfont(fltk3::Font &f, fltk3::Fontsize &s, Fl_Color &c) { f = textfont_; s = textsize_; c = textcolor_; fstack_.init(f, s, c); }
+ void initfont(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) { f = textfont_; s = textsize_; c = textcolor_; fstack_.init(f, s, c); }
void pushfont(fltk3::Font f, fltk3::Fontsize s) {fstack_.push(f, s, textcolor_);}
- void pushfont(fltk3::Font f, fltk3::Fontsize s, Fl_Color c) {fstack_.push(f, s, c);}
- void popfont(fltk3::Font &f, fltk3::Fontsize &s, Fl_Color &c) {fstack_.pop(f, s, c);}
+ void pushfont(fltk3::Font f, fltk3::Fontsize s, fltk3::Color c) {fstack_.push(f, s, c);}
+ void popfont(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) {fstack_.pop(f, s, c);}
Fl_Help_Block *add_block(const char *s, int xx, int yy, int ww, int hh, uchar border = 0);
void add_link(const char *n, int xx, int yy, int ww, int hh);
@@ -278,7 +278,7 @@
void free_data();
int get_align(const char *p, int a);
const char *get_attr(const char *p, const char *n, char *buf, int bufsize);
- Fl_Color get_color(const char *n, Fl_Color c);
+ fltk3::Color get_color(const char *n, fltk3::Color c);
Fl_Shared_Image *get_image(const char *name, int W, int H);
int get_length(const char *l);
int handle(int);
@@ -331,9 +331,9 @@
int size() const { return (size_); }
void size(int W, int H) { fltk3::Widget::size(W, H); }
/** Sets the default text color. */
- void textcolor(Fl_Color c) { if (textcolor_ == defcolor_) textcolor_ = c; defcolor_ = c; }
+ void textcolor(fltk3::Color c) { if (textcolor_ == defcolor_) textcolor_ = c; defcolor_ = c; }
/** Returns the current default text color. */
- Fl_Color textcolor() const { return (defcolor_); }
+ fltk3::Color textcolor() const { return (defcolor_); }
/** Sets the default text font. */
void textfont(fltk3::Font f) { textfont_ = f; format(); }
/** Returns the current default text font. */
Modified: branches/branch-3.0-2011/fltk3/Fl_Image.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Image.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Image.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -92,7 +92,7 @@
void data(const char * const *p, int c) {data_ = p; count_ = c;}
void draw_empty(int X, int Y);
- static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh, Fl_Align la);
+ static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh, fltk3::Align la);
static void measure(const Fl_Label *lo, int &lw, int &lh);
public:
@@ -153,7 +153,7 @@
with it.
*/
Fl_Image *copy() { return copy(w(), h()); }
- virtual void color_average(Fl_Color c, float i);
+ virtual void color_average(fltk3::Color c, float i);
/**
The inactive() method calls
color_average(FL_BACKGROUND_COLOR, 0.33f) to produce
@@ -217,7 +217,7 @@
virtual ~Fl_RGB_Image();
virtual Fl_Image *copy(int W, int H);
Fl_Image *copy() { return copy(w(), h()); }
- virtual void color_average(Fl_Color c, float i);
+ virtual void color_average(fltk3::Color c, float i);
virtual void desaturate();
virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
Modified: branches/branch-3.0-2011/fltk3/Fl_Input_.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Input_.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Input_.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -148,10 +148,10 @@
fltk3::Fontsize textsize_;
/** \internal color of the entire text */
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
/** \internal color of the text cursor */
- Fl_Color cursor_color_;
+ fltk3::Color cursor_color_;
/** \internal Horizontal cursor position in pixels while moving up or down. */
static double up_down_pos;
@@ -211,7 +211,7 @@
/** \internal Vertical offset of text to top edge of widget. */
int yscroll() const {return yscroll_;}
- void yscroll(int y) { yscroll_ = y; damage(FL_DAMAGE_EXPOSE);}
+ void yscroll(int y) { yscroll_ = y; damage(fltk3::DAMAGE_EXPOSE);}
/* Return the number of lines displayed on a single page. */
int linesPerPage();
@@ -402,23 +402,23 @@
/** Gets the color of the text in the input field.
\return the text color
- \see textcolor(Fl_Color) */
- Fl_Color textcolor() const {return textcolor_;}
+ \see textcolor(fltk3::Color) */
+ fltk3::Color textcolor() const {return textcolor_;}
/** Sets the color of the text in the input field.
The text color defaults to \c FL_FOREGROUND_COLOR.
\param [in] n new text color
\see textcolor() */
- void textcolor(Fl_Color n) {textcolor_ = n;}
+ void textcolor(fltk3::Color n) {textcolor_ = n;}
/** Gets the color of the cursor.
\return the current cursor color */
- Fl_Color cursor_color() const {return cursor_color_;}
+ fltk3::Color cursor_color() const {return cursor_color_;}
/** Sets the color of the cursor.
The default color for the cursor is \c FL_BLACK.
\param [in] n the new cursor color */
- void cursor_color(Fl_Color n) {cursor_color_ = n;}
+ void cursor_color(fltk3::Color n) {cursor_color_ = n;}
/** Gets the input field type.
\return the current input type */
Modified: branches/branch-3.0-2011/fltk3/Fl_Input_Choice.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Input_Choice.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Input_Choice.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -82,7 +82,7 @@
if (!strcmp(o->inp_->value(), o->menu_->text()))
{
o->fltk3::Widget::clear_changed();
- if (o->when() & FL_WHEN_NOT_CHANGED)
+ if (o->when() & fltk3::WHEN_NOT_CHANGED)
o->do_callback();
}
else
@@ -90,7 +90,7 @@
o->inp_->value(o->menu_->text());
o->inp_->set_changed();
o->fltk3::Widget::set_changed();
- if (o->when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE))
+ if (o->when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE))
o->do_callback();
}
@@ -108,11 +108,11 @@
Fl_Widget_Tracker wp(o);
if (o->inp_->changed()) {
o->fltk3::Widget::set_changed();
- if (o->when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE))
+ if (o->when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE))
o->do_callback();
} else {
o->fltk3::Widget::clear_changed();
- if (o->when() & FL_WHEN_NOT_CHANGED)
+ if (o->when() & fltk3::WHEN_NOT_CHANGED)
o->do_callback();
}
@@ -141,12 +141,12 @@
*/
Fl_Input_Choice (int x,int y,int w,int h,const char*l=0) : fltk3::Group(x,y,w,h,l) {
fltk3::Group::box(fltk3::DOWN_BOX);
- align(FL_ALIGN_LEFT); // default like Fl_Input
+ align(fltk3::ALIGN_LEFT); // default like Fl_Input
inp_ = new Fl_Input(inp_x(), inp_y(),
inp_w(), inp_h());
inp_->callback(inp_cb, (void*)this);
inp_->box(fltk3::FLAT_BOX); // cosmetic
- inp_->when(FL_WHEN_CHANGED|FL_WHEN_NOT_CHANGED);
+ inp_->when(fltk3::WHEN_CHANGED|fltk3::WHEN_NOT_CHANGED);
menu_ = new InputMenuButton(menu_x(), menu_y(),
menu_w(), menu_h());
menu_->callback(menu_cb, (void*)this);
@@ -181,9 +181,9 @@
menu_->resize(menu_x(), menu_y(), menu_w(), menu_h());
}
/** Gets the encapsulated input text color attributes */
- Fl_Color textcolor() const { return (inp_->textcolor());}
+ fltk3::Color textcolor() const { return (inp_->textcolor());}
/** Sets the encapsulated input text color attributes */
- void textcolor(Fl_Color c) { inp_->textcolor(c);}
+ void textcolor(fltk3::Color c) { inp_->textcolor(c);}
/** Gets the encapsulated input text font attributes */
fltk3::Font textfont() const { return (inp_->textfont());}
/** Sets the encapsulated input text font attributes */
Modified: branches/branch-3.0-2011/fltk3/Fl_Menu_.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Menu_.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Menu_.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -56,7 +56,7 @@
uchar down_box_;
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
public:
Fl_Menu_(int,int,int,int,const char * =0);
@@ -141,9 +141,9 @@
/** Sets the font size of menu item labels. */
void textsize(fltk3::Fontsize c) {textsize_=c;}
/** Get the current color of menu item labels. */
- Fl_Color textcolor() const {return textcolor_;}
+ fltk3::Color textcolor() const {return textcolor_;}
/** Sets the current color of menu item labels. */
- void textcolor(Fl_Color c) {textcolor_=c;}
+ void textcolor(fltk3::Color c) {textcolor_=c;}
/**
This box type is used to surround the currently-selected items in the
@@ -156,7 +156,7 @@
void down_box(fltk3::Boxtype b) {down_box_ = b;}
/** For back compatibility, same as selection_color() */
- Fl_Color down_color() const {return selection_color();}
+ fltk3::Color down_color() const {return selection_color();}
/** For back compatibility, same as selection_color() */
void down_color(unsigned c) {selection_color(c);}
};
Modified: branches/branch-3.0-2011/fltk3/Fl_Menu_Item.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Menu_Item.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Menu_Item.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -82,9 +82,9 @@
Typically menu items are statically defined; for example:
\code
Fl_Menu_Item popup[] = {
- {"&alpha", FL_ALT+'a', the_cb, (void*)1},
- {"&beta", FL_ALT+'b', the_cb, (void*)2},
- {"gamma", FL_ALT+'c', the_cb, (void*)3, FL_MENU_DIVIDER},
+ {"&alpha", fltk3::ALT+'a', the_cb, (void*)1},
+ {"&beta", fltk3::ALT+'b', the_cb, (void*)2},
+ {"gamma", fltk3::ALT+'c', the_cb, (void*)3, FL_MENU_DIVIDER},
{"&strange", 0, strange_cb},
{"&charm", 0, charm_cb},
{"&truth", 0, truth_cb},
@@ -94,10 +94,10 @@
{"two"},
{"three"},
{0},
- {"inactive", FL_ALT+'i', 0, 0, FL_MENU_INACTIVE|FL_MENU_DIVIDER},
- {"invisible",FL_ALT+'i', 0, 0, FL_MENU_INVISIBLE},
- {"check", FL_ALT+'i', 0, 0, FL_MENU_TOGGLE|FL_MENU_VALUE},
- {"box", FL_ALT+'i', 0, 0, FL_MENU_TOGGLE},
+ {"inactive", fltk3::ALT+'i', 0, 0, FL_MENU_INACTIVE|FL_MENU_DIVIDER},
+ {"invisible",fltk3::ALT+'i', 0, 0, FL_MENU_INVISIBLE},
+ {"check", fltk3::ALT+'i', 0, 0, FL_MENU_TOGGLE|FL_MENU_VALUE},
+ {"box", fltk3::ALT+'i', 0, 0, FL_MENU_TOGGLE},
{0}};
\endcode
produces:
@@ -124,7 +124,7 @@
uchar labeltype_; ///< how the menu item text looks like
fltk3::Font labelfont_; ///< which font for this menu item text
fltk3::Fontsize labelsize_; ///< size of menu item text
- Fl_Color labelcolor_; ///< menu item text color
+ fltk3::Color labelcolor_; ///< menu item text color
// advance N items, skipping submenus:
const Fl_Menu_Item *next(int=1) const;
@@ -184,13 +184,13 @@
color is not black fltk will \b not use overlay bitplanes to draw
the menu - this is so that images put in the menu draw correctly.
*/
- Fl_Color labelcolor() const {return labelcolor_;}
+ fltk3::Color labelcolor() const {return labelcolor_;}
/**
Sets the menu item's label color.
- \see Fl_Color Fl_Menu_Item::labelcolor() const
+ \see fltk3::Color Fl_Menu_Item::labelcolor() const
*/
- void labelcolor(Fl_Color a) {labelcolor_ = a;}
+ void labelcolor(fltk3::Color a) {labelcolor_ = a;}
/**
Gets the menu item's label font.
Fonts are identified by small 8-bit indexes into a table. See the
@@ -281,7 +281,7 @@
/**
Sets exactly what key combination will trigger the menu item. The
value is a logical 'or' of a key and a set of shift flags, for instance
- FL_ALT+'a' or FL_ALT+FL_F+10 or just 'a'. A value of
+ fltk3::ALT+'a' or fltk3::ALT+FL_F+10 or just 'a'. A value of
zero disables the shortcut.
The key can be any value returned by fltk3::event_key(), but will usually
Modified: branches/branch-3.0-2011/fltk3/Fl_Pixmap.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Pixmap.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Pixmap.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -83,7 +83,7 @@
virtual ~Fl_Pixmap();
virtual Fl_Image *copy(int W, int H);
Fl_Image *copy() { return copy(w(), h()); }
- virtual void color_average(Fl_Color c, float i);
+ virtual void color_average(fltk3::Color c, float i);
virtual void desaturate();
virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
Modified: branches/branch-3.0-2011/fltk3/Fl_PostScript.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_PostScript.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_PostScript.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -98,7 +98,7 @@
uchar * mask;
int mx; // width of mask;
int my; // mask lines
- //Fl_Color bg_;
+ //fltk3::Color bg_;
int (*close_cmd_)(FILE *);
int page_policy_;
int nPages;
@@ -131,7 +131,7 @@
enum Fl_Paged_Device::Page_Format page_format_;
char *ps_filename_;
// implementation of drawing methods
- void color(Fl_Color c);
+ void color(fltk3::Color c);
void color(uchar r, uchar g, uchar b);
void push_clip(int x, int y, int w, int h);
Modified: branches/branch-3.0-2011/fltk3/Fl_Scroll.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Scroll.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Scroll.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -64,11 +64,11 @@
<LI>Fl_Scroll::BOTH_ALWAYS - Both always on. </LI>
</UL>
- Use <B> scrollbar.align(int) ( see void fltk3::Widget::align(Fl_Align) ) :</B>
+ Use <B> scrollbar.align(int) ( see void fltk3::Widget::align(fltk3::Align) ) :</B>
to change what side the scrollbars are drawn on.
- If the FL_ALIGN_LEFT bit is on, the vertical scrollbar is on the left.
- If the FL_ALIGN_TOP bit is on, the horizontal scrollbar is on
+ If the fltk3::ALIGN_LEFT bit is on, the vertical scrollbar is on the left.
+ If the fltk3::ALIGN_TOP bit is on, the horizontal scrollbar is on
the top. Note that only the alignment flags in scrollbar are
considered. The flags in hscrollbar however are ignored.
Modified: branches/branch-3.0-2011/fltk3/Fl_Shared_Image.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Shared_Image.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Shared_Image.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -81,7 +81,7 @@
virtual Fl_Image *copy(int W, int H);
Fl_Image *copy() { return copy(w(), h()); }
- virtual void color_average(Fl_Color c, float i);
+ virtual void color_average(fltk3::Color c, float i);
virtual void desaturate();
virtual void draw(int X, int Y, int W, int H, int cx, int cy);
void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
Modified: branches/branch-3.0-2011/fltk3/Fl_Spinner.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Spinner.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Spinner.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -137,11 +137,11 @@
step_ = 1.0;
format_ = "%g";
- align(FL_ALIGN_LEFT);
+ align(fltk3::ALIGN_LEFT);
input_.value("1");
input_.type(FL_INT_INPUT);
- input_.when(FL_WHEN_ENTER_KEY | FL_WHEN_RELEASE);
+ input_.when(fltk3::WHEN_ENTER_KEY | fltk3::WHEN_RELEASE);
input_.callback((Fl_Callback *)sb_cb, this);
up_button_.callback((Fl_Callback *)sb_cb, this);
@@ -210,11 +210,11 @@
update();
}
/** Gets the color of the text in the input field. */
- Fl_Color textcolor() const {
+ fltk3::Color textcolor() const {
return (input_.textcolor());
}
/** Sets the color of the text in the input field. */
- void textcolor(Fl_Color c) {
+ void textcolor(fltk3::Color c) {
input_.textcolor(c);
}
/** Gets the font of the text in the input field. */
Modified: branches/branch-3.0-2011/fltk3/Fl_Table.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Table.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Table.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -213,8 +213,8 @@
int _redraw_botrow;
int _redraw_leftcol;
int _redraw_rightcol;
- Fl_Color _row_header_color;
- Fl_Color _col_header_color;
+ fltk3::Color _row_header_color;
+ fltk3::Color _col_header_color;
int _auto_drag;
int _selecting;
@@ -257,7 +257,7 @@
IntVector _colwidths; // column widths in pixels
IntVector _rowheights; // row heights in pixels
- Fl_Cursor _last_cursor; // last mouse cursor before changed to 'resize' cursor
+ fltk3::Cursor _last_cursor; // last mouse cursor before changed to 'resize' cursor
// EVENT CALLBACK DATA
TableContext _callback_context; // event context
@@ -319,7 +319,7 @@
void table_scrolled(); // table scrolled; recalc
void get_bounds(TableContext context, // return x/y/w/h bounds for context
int &X, int &Y, int &W, int &H);
- void change_cursor(Fl_Cursor newcursor); // change mouse cursor to some other shape
+ void change_cursor(fltk3::Cursor newcursor); // change mouse cursor to some other shape
TableContext cursor2rowcol(int &R, int &C, ResizeFlag &resizeflag);
// find r/c given current x/y event
int find_cell(TableContext context, // find cell's x/y/w/h given r/c
@@ -407,7 +407,7 @@
{
fl_draw_box(FL_THIN_UP_BOX, X, Y, W, H, color());
fl_color(FL_BLACK);
- fl_draw(s, X, Y, W, H, FL_ALIGN_CENTER);
+ fl_draw(s, X, Y, W, H, fltk3::ALIGN_CENTER);
}
fl_pop_clip();
return;
@@ -421,7 +421,7 @@
// TEXT
fl_color(FL_BLACK);
- fl_draw(s, X, Y, W, H, FL_ALIGN_CENTER);
+ fl_draw(s, X, Y, W, H, fltk3::ALIGN_CENTER);
// BORDER
fl_color(FL_LIGHT2);
@@ -468,7 +468,7 @@
}
// Indicate partial redraw needed of some cells
- damage(FL_DAMAGE_CHILD);
+ damage(fltk3::DAMAGE_CHILD);
}
public:
@@ -712,7 +712,7 @@
/**
Sets the row header color and causes the screen to redraw.
*/
- inline void row_header_color(Fl_Color val) { // set/get row header color
+ inline void row_header_color(fltk3::Color val) { // set/get row header color
_row_header_color = val;
redraw();
}
@@ -720,14 +720,14 @@
/**
Returns the current row header color.
*/
- inline Fl_Color row_header_color() {
+ inline fltk3::Color row_header_color() {
return(_row_header_color);
}
/**
Sets the color for column headers and redraws the table.
*/
- inline void col_header_color(Fl_Color val) { // set/get col header color
+ inline void col_header_color(fltk3::Color val) { // set/get col header color
_col_header_color = val;
redraw();
}
@@ -735,7 +735,7 @@
/**
Gets the color for column headers.
*/
- inline Fl_Color col_header_color() {
+ inline fltk3::Color col_header_color() {
return(_col_header_color);
}
@@ -743,7 +743,7 @@
Sets the height of the specified row in pixels,
and the table is redrawn.
callback() will be invoked with CONTEXT_RC_RESIZE
- if the row's height was actually changed, and when() is FL_WHEN_CHANGED.
+ if the row's height was actually changed, and when() is fltk3::WHEN_CHANGED.
*/
void row_height(int row, int height); // set/get row height
@@ -757,7 +757,7 @@
/**
Sets the width of the specified column in pixels, and the table is redrawn.
callback() will be invoked with CONTEXT_RC_RESIZE
- if the column's width was actually changed, and when() is FL_WHEN_CHANGED.
+ if the column's width was actually changed, and when() is fltk3::WHEN_CHANGED.
*/
void col_width(int col, int width); // set/get a column's width
@@ -967,14 +967,14 @@
<table border=1>
<tr>
- <td>\p FL_WHEN_CHANGED</td>
+ <td>\p fltk3::WHEN_CHANGED</td>
<td>
callback() will be called when rows or columns are resized (interactively or
via col_width() or row_height()), passing CONTEXT_RC_RESIZE via
callback_context().
</td>
</tr><tr>
- <td>\p FL_WHEN_RELEASE</td>
+ <td>\p fltk3::WHEN_RELEASE</td>
<td>
callback() will be called during FL_RELEASE events, such as when someone
releases a mouse button somewhere on the table.
@@ -989,7 +989,7 @@
also look at the regular fltk event values (ie. fltk3::event() and fltk3::button())
to determine what kind of event is occurring.
*/
- void when(Fl_When flags);
+ void when(fltk3::When flags);
#endif
#if FL_DOXYGEN
@@ -1021,7 +1021,7 @@
Someone clicked on a cell.
To receive callbacks for FL_RELEASE events, you must set
- when(FL_WHEN_RELEASE).
+ when(fltk3::WHEN_RELEASE).
</td>
</tr><tr>
<td><tt>Fl_Table::CONTEXT_RC_RESIZE</tt></td>
@@ -1036,7 +1036,7 @@
If resizing a row, C=0 and R=row being resized.
- NOTE: To receive resize events, you must set when(FL_WHEN_CHANGED).
+ NOTE: To receive resize events, you must set when(fltk3::WHEN_CHANGED).
</td>
</tr>
</table>
@@ -1065,7 +1065,7 @@
MyTable() {
[..]
table.callback(&event_callback, (void*)this); // setup callback
- table.when(FL_WHEN_CHANGED|FL_WHEN_RELEASE); // when to call it
+ table.when(fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE); // when to call it
}
};
\endcode
Modified: branches/branch-3.0-2011/fltk3/Fl_Text_Display.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Text_Display.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Text_Display.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -104,7 +104,7 @@
with an attribute mask matching attr
*/
struct Style_Table_Entry {
- Fl_Color color;
+ fltk3::Color color;
fltk3::Font font;
fltk3::Fontsize size;
unsigned attr;
@@ -171,13 +171,13 @@
Gets the text cursor color.
\return cursor color
*/
- Fl_Color cursor_color() const {return mCursor_color;}
+ fltk3::Color cursor_color() const {return mCursor_color;}
/**
Sets the text cursor color.
\param n new cursor color
*/
- void cursor_color(Fl_Color n) {mCursor_color = n;}
+ void cursor_color(fltk3::Color n) {mCursor_color = n;}
/**
Gets the width/height of the scrollbars.
@@ -195,13 +195,13 @@
Gets the scrollbar alignment type.
\return scrollbar alignment
*/
- Fl_Align scrollbar_align() const { return scrollbar_align_; }
+ fltk3::Align scrollbar_align() const { return scrollbar_align_; }
/**
Sets the scrollbar alignment type.
\param a new scrollbar alignment
*/
- void scrollbar_align(Fl_Align a) { scrollbar_align_ = a; }
+ void scrollbar_align(fltk3::Align a) { scrollbar_align_ = a; }
/**
Moves the insert position to the beginning of the current word.
@@ -268,13 +268,13 @@
Gets the default color of text in the widget.
\return text color unless overridden by a style
*/
- Fl_Color textcolor() const {return textcolor_;}
+ fltk3::Color textcolor() const {return textcolor_;}
/**
Sets the default color of text in the widget.
\param n new text color
*/
- void textcolor(Fl_Color n) {textcolor_ = n;}
+ void textcolor(fltk3::Color n) {textcolor_ = n;}
int wrapped_column(int row, int column) const;
int wrapped_row(int row) const;
@@ -450,12 +450,12 @@
needs to be mutable so that it can be calculated
within a method marked as "const" */
- Fl_Color mCursor_color;
+ fltk3::Color mCursor_color;
Fl_Scrollbar* mHScrollBar;
Fl_Scrollbar* mVScrollBar;
int scrollbar_width_;
- Fl_Align scrollbar_align_;
+ fltk3::Align scrollbar_align_;
int dragPos, dragType, dragging;
int display_insert_position_hint;
struct { int x, y, w, h; } text_area;
@@ -464,7 +464,7 @@
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
// The following are not presently used from the original NEdit code,
// but are being put here so that future versions of Fl_Text_Display
Modified: branches/branch-3.0-2011/fltk3/Fl_Tiled_Image.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Tiled_Image.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Tiled_Image.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -55,7 +55,7 @@
virtual Fl_Image *copy(int W, int H);
Fl_Image *copy() { return copy(w(), h()); }
- virtual void color_average(Fl_Color c, float i);
+ virtual void color_average(fltk3::Color c, float i);
virtual void desaturate();
virtual void draw(int X, int Y, int W, int H, int cx, int cy);
void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
Modified: branches/branch-3.0-2011/fltk3/Fl_Tooltip.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Tooltip.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Tooltip.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -76,13 +76,13 @@
/** Sets the size of the tooltip text. */
static void size(fltk3::Fontsize s) { size_ = s; }
/** Gets the background color for tooltips. The default background color is a pale yellow. */
- static Fl_Color color() { return color_; }
+ static fltk3::Color color() { return color_; }
/** Sets the background color for tooltips. The default background color is a pale yellow. */
- static void color(Fl_Color c) { color_ = c; }
+ static void color(fltk3::Color c) { color_ = c; }
/** Gets the color of the text in the tooltip. The default is black. */
- static Fl_Color textcolor() { return textcolor_; }
+ static fltk3::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; }
+ static void textcolor(fltk3::Color c) { textcolor_ = c; }
#ifdef __APPLE__
// the unique tooltip window
static fltk3::Window* current_window(void);
@@ -100,8 +100,8 @@
private:
static float delay_; //!< delay before a tooltip is shown
static float hoverdelay_; //!< delay between tooltips
- static Fl_Color color_;
- static Fl_Color textcolor_;
+ static fltk3::Color color_;
+ static fltk3::Color textcolor_;
static fltk3::Font font_;
static fltk3::Fontsize size_;
static fltk3::Widget* widget_; //!< Keeps track of the current target widget
Modified: branches/branch-3.0-2011/fltk3/Fl_Tree.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Tree.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Tree.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -65,8 +65,8 @@
///
/// The callback() is invoked depending on the value of when():
///
-/// - FL_WHEN_RELEASE -- callback invoked when left mouse button is released on an item
-/// - FL_WHEN_CHANGED -- callback invoked when left mouse changes selection state
+/// - fltk3::WHEN_RELEASE -- callback invoked when left mouse button is released on an item
+/// - fltk3::WHEN_CHANGED -- callback invoked when left mouse changes selection state
///
/// The simple way to define a tree:
/// \code
Modified: branches/branch-3.0-2011/fltk3/Fl_Tree_Item.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Tree_Item.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Tree_Item.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -60,8 +60,8 @@
const char *_label; // label (memory managed)
int _labelfont; // label's font face
int _labelsize; // label's font size
- Fl_Color _labelfgcolor; // label's fg color
- Fl_Color _labelbgcolor; // label's bg color
+ fltk3::Color _labelfgcolor; // label's fg color
+ fltk3::Color _labelbgcolor; // label's bg color
char _open; // item is open?
char _visible; // item is visible?
char _active; // item activated?
@@ -115,27 +115,27 @@
return(_labelsize);
}
/// Set item's label foreground text color.
- void labelfgcolor(Fl_Color val) {
+ void labelfgcolor(fltk3::Color val) {
_labelfgcolor = val;
}
/// Set item's label text color.
- void labelcolor(Fl_Color val) {
+ void labelcolor(fltk3::Color val) {
_labelfgcolor = val;
}
/// Return item's label text color.
- Fl_Color labelcolor() const {
+ fltk3::Color labelcolor() const {
return(_labelfgcolor);
}
/// Return item's label foreground text color.
- Fl_Color labelfgcolor() const {
+ fltk3::Color labelfgcolor() const {
return(_labelfgcolor);
}
/// Set item's label background color.
- void labelbgcolor(Fl_Color val) {
+ void labelbgcolor(fltk3::Color val) {
_labelbgcolor = val;
}
/// Return item's background text color.
- Fl_Color labelbgcolor() const {
+ fltk3::Color labelbgcolor() const {
return(_labelbgcolor);
}
/// Assign an FLTK widget to this item.
Modified: branches/branch-3.0-2011/fltk3/Fl_Tree_Prefs.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Tree_Prefs.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Tree_Prefs.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -95,11 +95,11 @@
int _connectorwidth; // connector width (right of open/close icon)
int _linespacing; // vertical space between lines
// Colors
- Fl_Color _fgcolor; // label's foreground color
- Fl_Color _bgcolor; // background color
- Fl_Color _selectcolor; // selection color
- Fl_Color _inactivecolor; // inactive color
- Fl_Color _connectorcolor; // connector dotted line color
+ fltk3::Color _fgcolor; // label's foreground color
+ fltk3::Color _bgcolor; // background color
+ fltk3::Color _selectcolor; // selection color
+ fltk3::Color _inactivecolor; // inactive color
+ fltk3::Color _connectorcolor; // connector dotted line color
Fl_Tree_Connector _connectorstyle; // connector line style
Fl_Image *_openimage; // the 'open' icon [+]
Fl_Image *_closeimage; // the 'close' icon [-]
@@ -204,43 +204,43 @@
// Colors and Styles
////////////////////////////
/// Get the default label foreground color
- inline Fl_Color fgcolor() const {
+ inline fltk3::Color fgcolor() const {
return(_fgcolor);
}
/// Set the default label foreground color
- inline void fgcolor(Fl_Color val) {
+ inline void fgcolor(fltk3::Color val) {
_fgcolor = val;
}
/// Get the default label background color
- inline Fl_Color bgcolor() const {
+ inline fltk3::Color bgcolor() const {
return(_bgcolor);
}
/// Set the default label background color
- inline void bgcolor(Fl_Color val) {
+ inline void bgcolor(fltk3::Color val) {
_bgcolor = val;
}
/// Get the default selection color
- inline Fl_Color selectcolor() const {
+ inline fltk3::Color selectcolor() const {
return(_selectcolor);
}
/// Set the default selection color
- inline void selectcolor(Fl_Color val) {
+ inline void selectcolor(fltk3::Color val) {
_selectcolor = val;
}
/// Get the default inactive color
- inline Fl_Color inactivecolor() const {
+ inline fltk3::Color inactivecolor() const {
return(_inactivecolor);
}
/// Set the default inactive color
- inline void inactivecolor(Fl_Color val) {
+ inline void inactivecolor(fltk3::Color val) {
_inactivecolor = val;
}
/// Get the connector color; the color used for tree connection lines
- inline Fl_Color connectorcolor() const {
+ inline fltk3::Color connectorcolor() const {
return(_connectorcolor);
}
/// Set the connector color; the color used for tree connection lines
- inline void connectorcolor(Fl_Color val) {
+ inline void connectorcolor(fltk3::Color val) {
_connectorcolor = val;
}
/// Get the connector style
Modified: branches/branch-3.0-2011/fltk3/Fl_Value_Input.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Value_Input.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Value_Input.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -93,8 +93,8 @@
The first form returns the current shortcut key for the Input.
<P>The second form sets the shortcut key to key. Setting this
overrides the use of '&' in the label(). The value is a bitwise
- OR of a key and a set of shift flags, for example FL_ALT | 'a'
- , FL_ALT | (FL_F + 10), or just 'a'. A value
+ OR of a key and a set of shift flags, for example fltk3::ALT | 'a'
+ , fltk3::ALT | (FL_F + 10), or just 'a'. A value
of 0 disables the shortcut. </P>
<P>The key can be any value returned by
fltk3::event_key(), but will usually be an ASCII letter. Use
@@ -118,13 +118,13 @@
/** Sets the size of the text in the value box. */
void textsize(fltk3::Fontsize s) {input.textsize(s);}
/** Gets the color of the text in the value box. */
- Fl_Color textcolor() const {return input.textcolor();}
+ fltk3::Color textcolor() const {return input.textcolor();}
/** Sets the color of the text in the value box.*/
- void textcolor(Fl_Color n) {input.textcolor(n);}
+ void textcolor(fltk3::Color n) {input.textcolor(n);}
/** Gets the color of the text cursor. The text cursor is black by default. */
- Fl_Color cursor_color() const {return input.cursor_color();}
+ fltk3::Color cursor_color() const {return input.cursor_color();}
/** Sets the color of the text cursor. The text cursor is black by default. */
- void cursor_color(Fl_Color n) {input.cursor_color(n);}
+ void cursor_color(fltk3::Color n) {input.cursor_color(n);}
};
Modified: branches/branch-3.0-2011/fltk3/Fl_Value_Output.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Value_Output.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Value_Output.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -51,7 +51,7 @@
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
uchar soft_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
protected:
void draw();
@@ -83,9 +83,9 @@
fltk3::Fontsize textsize() const {return textsize_;}
void textsize(fltk3::Fontsize s) {textsize_ = s;}
/** Sets the color of the text in the value box. */
- Fl_Color textcolor() const {return textcolor_;}
+ fltk3::Color textcolor() const {return textcolor_;}
/** Gets the color of the text in the value box. */
- void textcolor(Fl_Color s) {textcolor_ = s;}
+ void textcolor(fltk3::Color s) {textcolor_ = s;}
};
#endif
Modified: branches/branch-3.0-2011/fltk3/Fl_Value_Slider.H
===================================================================
--- branches/branch-3.0-2011/fltk3/Fl_Value_Slider.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Fl_Value_Slider.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -42,7 +42,7 @@
class FL_EXPORT Fl_Value_Slider : public Fl_Slider {
fltk3::Font textfont_;
fltk3::Fontsize textsize_;
- Fl_Color textcolor_;
+ fltk3::Color textcolor_;
protected:
void draw();
public:
@@ -57,9 +57,9 @@
/** Sets the size of the text in the value box. */
void textsize(fltk3::Fontsize s) {textsize_ = s;}
/** Gets the color of the text in the value box. */
- Fl_Color textcolor() const {return textcolor_;}
+ fltk3::Color textcolor() const {return textcolor_;}
/** Sets the color of the text in the value box. */
- void textcolor(Fl_Color s) {textcolor_ = s;}
+ void textcolor(fltk3::Color s) {textcolor_ = s;}
};
#endif
Modified: branches/branch-3.0-2011/fltk3/Widget.h
===================================================================
--- branches/branch-3.0-2011/fltk3/Widget.h 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Widget.h 2011-01-09 22:48:30 UTC (rev 8233)
@@ -86,14 +86,14 @@
/** size of label font */
fltk3::Fontsize size;
/** text color */
- Fl_Color color;
+ fltk3::Color color;
/** alignment of label */
- Fl_Align align_;
+ fltk3::Align align_;
/** type of label. \see fltk3::Labeltype */
uchar type;
/** Draws the label aligned to the given box */
- void draw(int,int,int,int, Fl_Align) const ;
+ void draw(int,int,int,int, fltk3::Align) const ;
void measure(int &w, int &h) const ;
};
@@ -111,7 +111,7 @@
user code to call redraw() after these.
*/
class FL_EXPORT fltk3::Widget : public fltk3::Object {
- friend class ::fltk3::Group;
+ friend class Group;
fltk3::Group* parent_;
Fl_Callback* callback_;
@@ -119,8 +119,8 @@
int x_,y_,w_,h_;
Fl_Label label_;
unsigned int flags_;
- Fl_Color color_;
- Fl_Color color2_;
+ fltk3::Color color_;
+ fltk3::Color color2_;
uchar type_;
uchar damage_;
uchar box_;
@@ -177,8 +177,8 @@
USERFLAG1 = 1<<31 ///< reserved for 3rd party extensions
};
void draw_box() const;
- void draw_box(fltk3::Boxtype t, Fl_Color c) const;
- void draw_box(fltk3::Boxtype t, int x,int y,int w,int h, Fl_Color c) const;
+ void draw_box(fltk3::Boxtype t, fltk3::Color c) const;
+ void draw_box(fltk3::Boxtype t, int x,int y,int w,int h, fltk3::Color c) const;
void draw_backdrop() const;
/** draws a focus rectangle around the widget */
void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
@@ -343,18 +343,18 @@
/** Gets the label alignment.
\return label alignment
- \see label(), align(Fl_Align), Fl_Align
+ \see label(), align(fltk3::Align), fltk3::Align
*/
- Fl_Align align() const {return label_.align_;}
+ fltk3::Align align() const {return label_.align_;}
/** Sets the label alignment.
This controls how the label is displayed next to or inside the widget.
- The default value is FL_ALIGN_CENTER, which centers the label inside
+ The default value is fltk3::ALIGN_CENTER, which centers the label inside
the widget.
\param[in] alignment new label alignment
- \see align(), Fl_Align
+ \see align(), fltk3::Align
*/
- void align(Fl_Align alignment) {label_.align_ = alignment;}
+ void align(fltk3::Align alignment) {label_.align_ = alignment;}
/** Gets the box type of the widget.
\return the current box type
@@ -373,9 +373,9 @@
/** Gets the background color of the widget.
\return current background color
- \see color(Fl_Color), color(Fl_Color, Fl_Color)
+ \see color(fltk3::Color), color(fltk3::Color, fltk3::Color)
*/
- Fl_Color color() const {return color_;}
+ fltk3::Color color() const {return color_;}
/** Sets the background color of the widget.
The color is passed to the box routine. The color is either an index into
@@ -385,25 +385,25 @@
The default for most widgets is FL_BACKGROUND_COLOR. Use fltk3::set_color()
to redefine colors in the color map.
\param[in] bg background color
- \see color(), color(Fl_Color, Fl_Color), selection_color(Fl_Color)
+ \see color(), color(fltk3::Color, fltk3::Color), selection_color(fltk3::Color)
*/
- void color(Fl_Color bg) {color_ = bg;}
+ void color(fltk3::Color bg) {color_ = bg;}
/** Gets the selection color.
\return the current selection color
- \see selection_color(Fl_Color), color(Fl_Color, Fl_Color)
+ \see selection_color(fltk3::Color), color(fltk3::Color, fltk3::Color)
*/
- Fl_Color selection_color() const {return color2_;}
+ fltk3::Color selection_color() const {return color2_;}
/** Sets the selection color.
The selection color is defined for Forms compatibility and is usually
used to color the widget when it is selected, although some widgets
use this color for other purposes. You can set both colors at once
- with color(Fl_Color bg, Fl_Color sel).
+ with color(fltk3::Color bg, fltk3::Color sel).
\param[in] a the new selection color
- \see selection_color(), color(Fl_Color, Fl_Color)
+ \see selection_color(), color(fltk3::Color, fltk3::Color)
*/
- void selection_color(Fl_Color a) {color2_ = a;}
+ void selection_color(fltk3::Color a) {color2_ = a;}
/** Sets the background and selection color of the widget.
@@ -412,7 +412,7 @@
\param[in] sel selection color
\see color(unsigned), selection_color(unsigned)
*/
- void color(Fl_Color bg, Fl_Color sel) {color_=bg; color2_=sel;}
+ void color(fltk3::Color bg, fltk3::Color sel) {color_=bg; color2_=sel;}
/** Gets the current label text.
\return a pointer to the current label text
@@ -469,13 +469,13 @@
The default color is FL_FOREGROUND_COLOR.
\return the current label color
*/
- Fl_Color labelcolor() const {return label_.color;}
+ fltk3::Color labelcolor() const {return label_.color;}
/** Sets the label color.
The default color is FL_FOREGROUND_COLOR.
\param[in] c the new label color
*/
- void labelcolor(Fl_Color c) {label_.color=c;}
+ void labelcolor(fltk3::Color c) {label_.color=c;}
/** Gets the font to use.
Fonts are identified by indexes into a table. The default value
@@ -611,22 +611,22 @@
/** Returns the conditions under which the callback is called.
You can set the flags with when(uchar), the default value is
- FL_WHEN_RELEASE.
+ fltk3::WHEN_RELEASE.
\return set of flags
\see when(uchar)
*/
- Fl_When when() const {return (Fl_When)when_;}
+ fltk3::When when() const {return (fltk3::When)when_;}
/** Sets the flags used to decide when a callback is called.
This controls when callbacks are done. The following values are useful,
- the default value is FL_WHEN_RELEASE:
+ the default value is fltk3::WHEN_RELEASE:
\li 0: The callback is not done, but changed() is turned on.
- \li FL_WHEN_CHANGED: The callback is done each time the text is
+ \li fltk3::WHEN_CHANGED: The callback is done each time the text is
changed by the user.
- \li FL_WHEN_RELEASE: The callback will be done when this widget loses
+ \li fltk3::WHEN_RELEASE: The callback will be done when this widget loses
the focus, including when the window is unmapped. This is a useful
value for text fields in a panel where doing the callback on every
change is wasteful. However the callback will also happen if the
@@ -634,11 +634,11 @@
anything visible (like pop up an error message).
You might do better setting this to zero, and scanning all the
items for changed() when the OK button on a panel is pressed.
- \li FL_WHEN_ENTER_KEY: If the user types the Enter key, the entire
+ \li fltk3::WHEN_ENTER_KEY: If the user types the Enter key, the entire
text is selected, and the callback is done if the text has changed.
Normally the Enter key will navigate to the next field (or insert
a newline for a Fl_Multiline_Input) - this changes the behavior.
- \li FL_WHEN_ENTER_KEY|FL_WHEN_NOT_CHANGED: The Enter key will do the
+ \li fltk3::WHEN_ENTER_KEY|fltk3::WHEN_NOT_CHANGED: The Enter key will do the
callback even if the text has not changed. Useful for command fields.
fltk3::Widget::when() is a set of bitflags used by subclasses of
fltk3::Widget to decide when to do the callback.
@@ -919,7 +919,7 @@
*/
void damage(uchar c, int x, int y, int w, int h);
- void draw_label(int, int, int, int, Fl_Align) const;
+ void draw_label(int, int, int, int, fltk3::Align) const;
/** Sets width ww and height hh accordingly with the label size.
Labels with images will return w() and h() of the image.
@@ -987,7 +987,7 @@
/** For back compatibility only.
\deprecated Use selection_color() instead.
*/
- Fl_Color color2() const {return (Fl_Color)color2_;}
+ fltk3::Color color2() const {return (fltk3::Color)color2_;}
/** For back compatibility only.
\deprecated Use selection_color(unsigned) instead.
Modified: branches/branch-3.0-2011/fltk3/Window.h
===================================================================
--- branches/branch-3.0-2011/fltk3/Window.h 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/Window.h 2011-01-09 22:48:30 UTC (rev 8233)
@@ -74,8 +74,8 @@
int dw, dh, aspect;
uchar size_range_set;
// cursor stuff
- Fl_Cursor cursor_default;
- Fl_Color cursor_fg, cursor_bg;
+ fltk3::Cursor cursor_default;
+ fltk3::Color cursor_fg, cursor_bg;
void size_range_();
void _Window(); // constructor innards
@@ -439,15 +439,15 @@
you set it in a static variable and call this only if the new cursor
is different.
- The type Fl_Cursor is an enumeration defined in <fltk3/Enumerations.H>.
+ The type fltk3::Cursor is an enumeration defined in <fltk3/Enumerations.H>.
(Under X you can get any XC_cursor value by passing
- Fl_Cursor((XC_foo/2)+1)). The colors only work on X, they are
+ fltk3::Cursor((XC_foo/2)+1)). The colors only work on X, they are
not implemented on WIN32.
For back compatibility only.
*/
- void cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); // platform dependent
- void default_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE);
+ void cursor(fltk3::Cursor, fltk3::Color=FL_BLACK, fltk3::Color=FL_WHITE); // platform dependent
+ void default_cursor(fltk3::Cursor, fltk3::Color=FL_BLACK, fltk3::Color=FL_WHITE);
static void default_callback(Window*, void* v);
};
Modified: branches/branch-3.0-2011/fltk3/fl_draw.H
===================================================================
--- branches/branch-3.0-2011/fltk3/fl_draw.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/fl_draw.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -58,9 +58,9 @@
the foreground is not set for the current window.
\param[in] c color
*/
-inline void fl_color(Fl_Color c) {fl_graphics_driver->color(c); } // select indexed color
-/** for back compatibility - use fl_color(Fl_Color c) instead */
-inline void fl_color(int c) {fl_color((Fl_Color)c);}
+inline void fl_color(fltk3::Color c) {fl_graphics_driver->color(c); } // select indexed color
+/** for back compatibility - use fl_color(fltk3::Color c) instead */
+inline void fl_color(int c) {fl_color((fltk3::Color)c);}
/**
Set the color for all subsequent drawing operations.
The closest possible match to the RGB color is used.
@@ -73,12 +73,12 @@
*/
inline void fl_color(uchar r, uchar g, uchar b) {fl_graphics_driver->color(r,g,b); } // select actual color
/** \brief The current color */
-extern FL_EXPORT Fl_Color fl_color_;
+extern FL_EXPORT fltk3::Color fl_color_;
/**
Returns the last fl_color() that was set.
This can be used for state save/restore.
*/
-inline Fl_Color fl_color() {return fl_color_;}
+inline fltk3::Color fl_color() {return fl_color_;}
/** @} */
/** \addtogroup fl_drawings
@@ -208,11 +208,11 @@
inline void fl_rect(int x, int y, int w, int h) { fl_graphics_driver->rect(x,y,w,h); }
/** Draws with passed color a 1-pixel border \e inside the given bounding box */
-inline void fl_rect(int x, int y, int w, int h, Fl_Color c) {fl_color(c); fl_rect(x,y,w,h);}
+inline void fl_rect(int x, int y, int w, int h, fltk3::Color c) {fl_color(c); fl_rect(x,y,w,h);}
/** Colors with current color a rectangle that exactly fills the given bounding box */
inline void fl_rectf(int x, int y, int w, int h) { fl_graphics_driver->rectf(x,y,w,h); }
/** Colors with passsed color a rectangle that exactly fills the given bounding box */
-inline void fl_rectf(int x, int y, int w, int h, Fl_Color c) {fl_color(c); fl_rectf(x,y,w,h);}
+inline void fl_rectf(int x, int y, int w, int h, fltk3::Color c) {fl_color(c); fl_rectf(x,y,w,h);}
/**
Color a rectangle with "exactly" the passed <tt>r,g,b</tt> color.
@@ -568,17 +568,17 @@
FL_EXPORT void fl_measure(const char* str, int& x, int& y,
int draw_symbols = 1);
FL_EXPORT void fl_draw(const char* str, int x, int y, int w, int h,
- Fl_Align align,
+ fltk3::Align align,
Fl_Image* img=0, int draw_symbols = 1);
FL_EXPORT void fl_draw(const char* str, int x, int y, int w, int h,
- Fl_Align align,
+ fltk3::Align align,
void (*callthis)(const char *,int,int,int),
Fl_Image* img=0, int draw_symbols = 1);
// boxtypes:
FL_EXPORT void fl_frame(const char* s, int x, int y, int w, int h);
FL_EXPORT void fl_frame2(const char* s, int x, int y, int w, int h);
-FL_EXPORT void fl_draw_box(fltk3::Boxtype, int x, int y, int w, int h, Fl_Color);
+FL_EXPORT void fl_draw_box(fltk3::Boxtype, int x, int y, int w, int h, fltk3::Color);
// images:
@@ -695,8 +695,8 @@
FL_EXPORT uchar *fl_read_image(uchar *p,int X,int Y,int W,int H,int alpha=0);
// pixmaps:
-FL_EXPORT int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,Fl_Color=FL_GRAY);
-FL_EXPORT int fl_draw_pixmap(const char* const* cdata, int x,int y,Fl_Color=FL_GRAY);
+FL_EXPORT int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,fltk3::Color=FL_GRAY);
+FL_EXPORT int fl_draw_pixmap(const char* const* cdata, int x,int y,fltk3::Color=FL_GRAY);
FL_EXPORT int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h);
FL_EXPORT int fl_measure_pixmap(const char* const* cdata, int &w, int &h);
@@ -708,7 +708,7 @@
FL_EXPORT unsigned int fl_old_shortcut(const char* s);
FL_EXPORT void fl_overlay_rect(int x,int y,int w,int h);
FL_EXPORT void fl_overlay_clear();
-FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color fg=FL_BLACK, Fl_Color bg=FL_WHITE);
+FL_EXPORT void fl_cursor(fltk3::Cursor, fltk3::Color fg=FL_BLACK, fltk3::Color bg=FL_WHITE);
FL_EXPORT const char* fl_expand_text(const char* from, char* buf, int maxbuf,
double maxw, int& n, double &width,
int wrap, int draw_symbols = 0);
@@ -724,8 +724,8 @@
// XForms symbols:
-FL_EXPORT int fl_draw_symbol(const char* label,int x,int y,int w,int h, Fl_Color);
-FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scalable);
+FL_EXPORT int fl_draw_symbol(const char* label,int x,int y,int w,int h, fltk3::Color);
+FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(fltk3::Color), int scalable);
/** @} */
#endif
Modified: branches/branch-3.0-2011/fltk3/fl_show_colormap.H
===================================================================
--- branches/branch-3.0-2011/fltk3/fl_show_colormap.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/fl_show_colormap.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -44,10 +44,10 @@
\image html fl_show_colormap.png
\image latex fl_show_colormap.png "fl_show_colormap" height=10cm
\param[in] oldcol color to be highlighted when grid is shown.
- \retval Fl_Color value of the chosen colormap entry.
+ \retval fltk3::Color value of the chosen colormap entry.
\sa Fl_Color_Chooser
*/
-FL_EXPORT Fl_Color fl_show_colormap(Fl_Color oldcol);
+FL_EXPORT fltk3::Color fl_show_colormap(fltk3::Color oldcol);
/** @} */
Modified: branches/branch-3.0-2011/fltk3/forms.H
===================================================================
--- branches/branch-3.0-2011/fltk3/forms.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/forms.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -52,7 +52,7 @@
#define FL_VALID 1
#define FL_PREEMPT 1
#define FL_AUTO 2
-#define FL_WHEN_NEEDED FL_AUTO
+#define fltk3::WHEN_NEEDED FL_AUTO
#define FL_OFF 0
#define FL_NONE 0
#define FL_CANCEL 0
@@ -70,32 +70,32 @@
#define FL_INACTIVE FL_INACTIVE_COLOR
#define FL_INACTIVE_COL FL_INACTIVE_COLOR
#define FL_FREE_COL1 FL_FREE_COLOR
-#define FL_FREE_COL2 ((Fl_Color)(FL_FREE_COLOR+1))
-#define FL_FREE_COL3 ((Fl_Color)(FL_FREE_COLOR+2))
-#define FL_FREE_COL4 ((Fl_Color)(FL_FREE_COLOR+3))
-#define FL_FREE_COL5 ((Fl_Color)(FL_FREE_COLOR+4))
-#define FL_FREE_COL6 ((Fl_Color)(FL_FREE_COLOR+5))
-#define FL_FREE_COL7 ((Fl_Color)(FL_FREE_COLOR+6))
-#define FL_FREE_COL8 ((Fl_Color)(FL_FREE_COLOR+7))
-#define FL_FREE_COL9 ((Fl_Color)(FL_FREE_COLOR+8))
-#define FL_FREE_COL10 ((Fl_Color)(FL_FREE_COLOR+9))
-#define FL_FREE_COL11 ((Fl_Color)(FL_FREE_COLOR+10))
-#define FL_FREE_COL12 ((Fl_Color)(FL_FREE_COLOR+11))
-#define FL_FREE_COL13 ((Fl_Color)(FL_FREE_COLOR+12))
-#define FL_FREE_COL14 ((Fl_Color)(FL_FREE_COLOR+13))
-#define FL_FREE_COL15 ((Fl_Color)(FL_FREE_COLOR+14))
-#define FL_FREE_COL16 ((Fl_Color)(FL_FREE_COLOR+15))
-#define FL_TOMATO ((Fl_Color)(131))
-#define FL_INDIANRED ((Fl_Color)(164))
-#define FL_SLATEBLUE ((Fl_Color)(195))
-#define FL_DARKGOLD ((Fl_Color)(84))
-#define FL_PALEGREEN ((Fl_Color)(157))
-#define FL_ORCHID ((Fl_Color)(203))
-#define FL_DARKCYAN ((Fl_Color)(189))
-#define FL_DARKTOMATO ((Fl_Color)(113))
-#define FL_WHEAT ((Fl_Color)(174))
+#define FL_FREE_COL2 ((fltk3::Color)(FL_FREE_COLOR+1))
+#define FL_FREE_COL3 ((fltk3::Color)(FL_FREE_COLOR+2))
+#define FL_FREE_COL4 ((fltk3::Color)(FL_FREE_COLOR+3))
+#define FL_FREE_COL5 ((fltk3::Color)(FL_FREE_COLOR+4))
+#define FL_FREE_COL6 ((fltk3::Color)(FL_FREE_COLOR+5))
+#define FL_FREE_COL7 ((fltk3::Color)(FL_FREE_COLOR+6))
+#define FL_FREE_COL8 ((fltk3::Color)(FL_FREE_COLOR+7))
+#define FL_FREE_COL9 ((fltk3::Color)(FL_FREE_COLOR+8))
+#define FL_FREE_COL10 ((fltk3::Color)(FL_FREE_COLOR+9))
+#define FL_FREE_COL11 ((fltk3::Color)(FL_FREE_COLOR+10))
+#define FL_FREE_COL12 ((fltk3::Color)(FL_FREE_COLOR+11))
+#define FL_FREE_COL13 ((fltk3::Color)(FL_FREE_COLOR+12))
+#define FL_FREE_COL14 ((fltk3::Color)(FL_FREE_COLOR+13))
+#define FL_FREE_COL15 ((fltk3::Color)(FL_FREE_COLOR+14))
+#define FL_FREE_COL16 ((fltk3::Color)(FL_FREE_COLOR+15))
+#define FL_TOMATO ((fltk3::Color)(131))
+#define FL_INDIANRED ((fltk3::Color)(164))
+#define FL_SLATEBLUE ((fltk3::Color)(195))
+#define FL_DARKGOLD ((fltk3::Color)(84))
+#define FL_PALEGREEN ((fltk3::Color)(157))
+#define FL_ORCHID ((fltk3::Color)(203))
+#define FL_DARKCYAN ((fltk3::Color)(189))
+#define FL_DARKTOMATO ((fltk3::Color)(113))
+#define FL_WHEAT ((fltk3::Color)(174))
-#define FL_ALIGN_BESIDE FL_ALIGN_INSIDE
+#define fltk3::ALIGN_BESIDE fltk3::ALIGN_INSIDE
#define FL_PUP_TOGGLE 2 // FL_MENU_TOGGLE
#define FL_PUP_INACTIVE 1 // FL_MENU_INACTIVE
@@ -151,10 +151,10 @@
#define FL_NORMAL_FONT2 FL_NORMAL_FONT
#define FL_DEFAULT_FONT FL_SMALL_FONT
-#define FL_RETURN_END_CHANGED FL_WHEN_RELEASE
-#define FL_RETURN_CHANGED FL_WHEN_CHANGED
-#define FL_RETURN_END FL_WHEN_RELEASE_ALWAYS
-#define FL_RETURN_ALWAYS (FL_WHEN_CHANGED|FL_WHEN_NOT_CHANGED)
+#define FL_RETURN_END_CHANGED fltk3::WHEN_RELEASE
+#define FL_RETURN_CHANGED fltk3::WHEN_CHANGED
+#define FL_RETURN_END fltk3::WHEN_RELEASE_ALWAYS
+#define FL_RETURN_ALWAYS (fltk3::WHEN_CHANGED|fltk3::WHEN_NOT_CHANGED)
#define FL_BOUND_WIDTH 3
@@ -212,11 +212,11 @@
/* forms lib font indexes must be byte sized - extract correct byte from style word */
inline void fl_set_object_lstyle(fltk3::Widget* o,int a) {
o->labelfont((fltk3::Font)(a&0xff)); o->labeltype((fltk3::Labeltype)(a>>8));}
-inline void fl_set_object_lcol(fltk3::Widget* o, Fl_Color a) {o->labelcolor(a);}
+inline void fl_set_object_lcol(fltk3::Widget* o, fltk3::Color a) {o->labelcolor(a);}
#define fl_set_object_lcolor fl_set_object_lcol
-inline void fl_set_object_lalign(fltk3::Widget* o, Fl_Align a) {o->align(a);}
+inline void fl_set_object_lalign(fltk3::Widget* o, fltk3::Align a) {o->align(a);}
#define fl_set_object_align fl_set_object_lalign
-inline void fl_set_object_color(fltk3::Widget* o,Fl_Color a,Fl_Color b) {o->color(a,b);}
+inline void fl_set_object_color(fltk3::Widget* o,fltk3::Color a,fltk3::Color b) {o->color(a,b);}
inline void fl_set_object_label(fltk3::Widget* o, const char* a) {o->label(a); o->redraw();}
inline void fl_set_object_position(fltk3::Widget*o,int x,int y) {o->position(x,y);}
inline void fl_set_object_size(fltk3::Widget* o, int w, int h) {o->size(w,h);}
@@ -233,7 +233,7 @@
inline void fl_call_object_callback(fltk3::Widget* o) {o->do_callback();}
inline void fl_trigger_object(fltk3::Widget* o) {o->do_callback();}
inline void fl_set_object_return(fltk3::Widget* o, int v) {
- o->when((Fl_When)(v|FL_WHEN_RELEASE));}
+ o->when((fltk3::When)(v|fltk3::WHEN_RELEASE));}
inline void fl_redraw_object(fltk3::Widget* o) {o->redraw();}
inline void fl_show_object(fltk3::Widget* o) {o->show();}
@@ -349,13 +349,13 @@
////////////////////////////////////////////////////////////////
// Drawing functions. Only usable inside an Fl_Free object?
-inline void fl_drw_box(fltk3::Boxtype b,int x,int y,int w,int h,Fl_Color bgc,int=3) {
+inline void fl_drw_box(fltk3::Boxtype b,int x,int y,int w,int h,fltk3::Color bgc,int=3) {
fl_draw_box(b,x,y,w,h,bgc);}
-inline void fl_drw_frame(fltk3::Boxtype b,int x,int y,int w,int h,Fl_Color bgc,int=3) {
+inline void fl_drw_frame(fltk3::Boxtype b,int x,int y,int w,int h,fltk3::Color bgc,int=3) {
fl_draw_box(b,x,y,w,h,bgc);}
-inline void fl_drw_text(Fl_Align align, int x, int y, int w, int h,
- Fl_Color fgcolor, int size, fltk3::Font style,
+inline void fl_drw_text(fltk3::Align align, int x, int y, int w, int h,
+ fltk3::Color fgcolor, int size, fltk3::Font style,
const char* s) {
fl_font(style,size);
fl_color(fgcolor);
@@ -363,8 +363,8 @@
}
// this does not work except for CENTER...
-inline void fl_drw_text_beside(Fl_Align align, int x, int y, int w, int h,
- Fl_Color fgcolor, int size, fltk3::Font style,
+inline void fl_drw_text_beside(fltk3::Align align, int x, int y, int w, int h,
+ fltk3::Color fgcolor, int size, fltk3::Font style,
const char* s) {
fl_font(style,size);
fl_color(fgcolor);
@@ -373,7 +373,7 @@
inline void fl_set_font_name(fltk3::Font n,const char* s) {fltk3::set_font(n,s);}
-inline void fl_mapcolor(Fl_Color c, uchar r, uchar g, uchar b) {fltk3::set_color(c,r,g,b);}
+inline void fl_mapcolor(fltk3::Color c, uchar r, uchar g, uchar b) {fltk3::set_color(c,r,g,b);}
#define fl_set_clipping(x,y,w,h) fl_push_clip(x,y,w,h)
#define fl_unset_clipping() fl_pop_clip()
@@ -408,7 +408,7 @@
((Fl_FormsPixmap*)o)->set(b);
}
//inline void fl_set_pixmap_file(fltk3::Widget*, const char*);
-inline void fl_set_pixmap_align(fltk3::Widget* o,Fl_Align a,int,int) {o->align(a);}
+inline void fl_set_pixmap_align(fltk3::Widget* o,fltk3::Align a,int,int) {o->align(a);}
//inline void fl_set_pixmap_colorcloseness(int, int, int);
#include "Box.h"
@@ -531,7 +531,7 @@
((Fl_Chart*)o)->textfont(v);}
inline void fl_set_chart_lsize(fltk3::Widget* o, int v) {
((Fl_Chart*)o)->textsize(v);}
-inline void fl_set_chart_lcolor(fltk3::Widget* o, Fl_Color v) {
+inline void fl_set_chart_lcolor(fltk3::Widget* o, fltk3::Color v) {
((Fl_Chart*)o)->textcolor(v);}
#define fl_set_chart_lcol fl_set_chart_lcolor
@@ -585,7 +585,7 @@
inline void fl_set_counter_precision(fltk3::Widget* o, int v) {
((Fl_Counter*)o)->precision(v);}
inline void fl_set_counter_return(fltk3::Widget* o, int v) {
- ((Fl_Counter*)o)->when((Fl_When)(v|FL_WHEN_RELEASE));}
+ ((Fl_Counter*)o)->when((fltk3::When)(v|fltk3::WHEN_RELEASE));}
inline double fl_get_counter_value(fltk3::Widget* o) {
return ((Fl_Counter*)o)->value();}
inline void fl_get_counter_bounds(fltk3::Widget* o, float* a, float* b) {
@@ -595,9 +595,9 @@
//inline void fl_set_counter_filter(fltk3::Widget*,const char* (*)(fltk3::Widget*,double,int));
// Cursor stuff cannot be emulated because it uses X stuff
-inline void fl_set_cursor(fltk3::Window* w, Fl_Cursor c) {w->cursor(c);}
-#define FL_INVISIBLE_CURSOR FL_CURSOR_NONE
-#define FL_DEFAULT_CURSOR FL_CURSOR_DEFAULT
+inline void fl_set_cursor(fltk3::Window* w, fltk3::Cursor c) {w->cursor(c);}
+#define FL_INVISIBLE_CURSOR fltk3::CURSOR_NONE
+#define FL_DEFAULT_CURSOR fltk3::CURSOR_DEFAULT
#include "Fl_Dial.H"
@@ -616,7 +616,7 @@
*b = float(((Fl_Dial*)o)->maximum());
}
inline void fl_set_dial_return(fltk3::Widget* o, int i) {
- ((Fl_Dial*)o)->when((Fl_When)(i|FL_WHEN_RELEASE));}
+ ((Fl_Dial*)o)->when((fltk3::When)(i|fltk3::WHEN_RELEASE));}
inline void fl_set_dial_angles(fltk3::Widget* o, int a, int b) {
((Fl_Dial*)o)->angles((short)a, (short)b);}
//inline void fl_set_dial_cross(fltk3::Widget* o, int);
@@ -633,7 +633,7 @@
// labelframe nyi
inline fltk3::Widget* fl_add_labelframe(fltk3::Boxtype i,int x,int y,int w,int h,const char* l) {
fltk3::Widget* o = fl_add_box(i,x-3,y-3,w+6,h+6,l);
- o->align(FL_ALIGN_TOP_LEFT);
+ o->align(fltk3::ALIGN_TOP_LEFT);
return o;
}
@@ -686,8 +686,8 @@
inline void fl_set_input(fltk3::Widget* o, const char* v) {
((Fl_Input*)o)->value(v);}
inline void fl_set_input_return(fltk3::Widget* o, int x) {
- ((Fl_Input*)o)->when((Fl_When)(x | FL_WHEN_RELEASE));}
-inline void fl_set_input_color(fltk3::Widget* o, Fl_Color a, Fl_Color b) {
+ ((Fl_Input*)o)->when((fltk3::When)(x | fltk3::WHEN_RELEASE));}
+inline void fl_set_input_color(fltk3::Widget* o, fltk3::Color a, fltk3::Color b) {
((Fl_Input*)o)->textcolor(a);
((Fl_Input*)o)->cursor_color(b);
}
@@ -775,7 +775,7 @@
inline void fl_set_positioner_ystep(fltk3::Widget* o, double v) {
((Fl_Positioner*)o)->ystep(v);}
inline void fl_set_positioner_return(fltk3::Widget* o, int v) {
- ((Fl_Positioner*)o)->when((Fl_When)(v|FL_WHEN_RELEASE));}
+ ((Fl_Positioner*)o)->when((fltk3::When)(v|fltk3::WHEN_RELEASE));}
#include "Fl_Slider.H"
@@ -795,7 +795,7 @@
*b = float(((Fl_Slider*)o)->maximum());
}
inline void fl_set_slider_return(fltk3::Widget* o, int i) {
- ((Fl_Slider*)o)->when((Fl_When)(i|FL_WHEN_RELEASE));}
+ ((Fl_Slider*)o)->when((fltk3::When)(i|fltk3::WHEN_RELEASE));}
inline void fl_set_slider_step(fltk3::Widget* o, double v) {
((Fl_Slider*)o)->step(v);}
// inline void fl_set_slider_increment(fltk3::Widget* o, double v, double);
@@ -810,13 +810,13 @@
// filter function!
// The forms text object was the same as an fltk3::Box except it inverted the
-// meaning of FL_ALIGN_INSIDE. Implementation in forms.cxx
+// meaning of fltk3::ALIGN_INSIDE. Implementation in forms.cxx
class FL_EXPORT Fl_FormsText : public fltk3::Widget {
protected:
void draw();
public:
Fl_FormsText(fltk3::Boxtype b, int X, int Y, int W, int H, const char* l=0)
- : fltk3::Widget(X,Y,W,H,l) {box(b); align(FL_ALIGN_LEFT);}
+ : fltk3::Widget(X,Y,W,H,l) {box(b); align(fltk3::ALIGN_LEFT);}
};
#define FL_NORMAL_TEXT fltk3::NO_BOX
forms_constructorb(Fl_FormsText, fl_add_text)
Modified: branches/branch-3.0-2011/fltk3/gl.h
===================================================================
--- branches/branch-3.0-2011/fltk3/gl.h 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/gl.h 2011-01-09 22:48:30 UTC (rev 8233)
@@ -72,9 +72,9 @@
FL_EXPORT void gl_start();
FL_EXPORT void gl_finish();
-FL_EXPORT void gl_color(Fl_Color i);
+FL_EXPORT void gl_color(fltk3::Color i);
/** back compatability */
-inline void gl_color(int c) {gl_color((Fl_Color)c);}
+inline void gl_color(int c) {gl_color((fltk3::Color)c);}
FL_EXPORT void gl_rect(int x,int y,int w,int h);
/**
@@ -96,7 +96,7 @@
FL_EXPORT void gl_draw(const char*, float x, float y);
FL_EXPORT void gl_draw(const char*, int n, int x, int y);
FL_EXPORT void gl_draw(const char*, int n, float x, float y);
-FL_EXPORT void gl_draw(const char*, int x, int y, int w, int h, Fl_Align);
+FL_EXPORT void gl_draw(const char*, int x, int y, int w, int h, fltk3::Align);
FL_EXPORT void gl_measure(const char*, int& x, int& y);
#ifdef __APPLE__
extern FL_EXPORT void gl_texture_pile_height(int max);
Modified: branches/branch-3.0-2011/fltk3/glut.H
===================================================================
--- branches/branch-3.0-2011/fltk3/glut.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/glut.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -148,31 +148,31 @@
inline void glutFullScreen() {glut_window->fullscreen();}
-inline void glutSetCursor(Fl_Cursor cursor) {glut_window->cursor(cursor);}
+inline void glutSetCursor(fltk3::Cursor cursor) {glut_window->cursor(cursor);}
// notice that the numeric values are different than glut:
-# define GLUT_CURSOR_RIGHT_ARROW ((Fl_Cursor)2)
-# define GLUT_CURSOR_LEFT_ARROW ((Fl_Cursor)67)
-# define GLUT_CURSOR_INFO FL_CURSOR_HAND
-# define GLUT_CURSOR_DESTROY ((Fl_Cursor)45)
-# define GLUT_CURSOR_HELP FL_CURSOR_HELP
-# define GLUT_CURSOR_CYCLE ((Fl_Cursor)26)
-# define GLUT_CURSOR_SPRAY ((Fl_Cursor)63)
-# define GLUT_CURSOR_WAIT FL_CURSOR_WAIT
-# define GLUT_CURSOR_TEXT FL_CURSOR_INSERT
-# define GLUT_CURSOR_CROSSHAIR FL_CURSOR_CROSS
-# define GLUT_CURSOR_UP_DOWN FL_CURSOR_NS
-# define GLUT_CURSOR_LEFT_RIGHT FL_CURSOR_WE
-# define GLUT_CURSOR_TOP_SIDE FL_CURSOR_N
-# define GLUT_CURSOR_BOTTOM_SIDE FL_CURSOR_S
-# define GLUT_CURSOR_LEFT_SIDE FL_CURSOR_W
-# define GLUT_CURSOR_RIGHT_SIDE FL_CURSOR_E
-# define GLUT_CURSOR_TOP_LEFT_CORNER FL_CURSOR_NW
-# define GLUT_CURSOR_TOP_RIGHT_CORNER FL_CURSOR_NE
-# define GLUT_CURSOR_BOTTOM_RIGHT_CORNER FL_CURSOR_SE
-# define GLUT_CURSOR_BOTTOM_LEFT_CORNER FL_CURSOR_SW
-# define GLUT_CURSOR_INHERIT FL_CURSOR_DEFAULT
-# define GLUT_CURSOR_NONE FL_CURSOR_NONE
-# define GLUT_CURSOR_FULL_CROSSHAIR FL_CURSOR_CROSS
+# define GLUT_CURSOR_RIGHT_ARROW ((fltk3::Cursor)2)
+# define GLUT_CURSOR_LEFT_ARROW ((fltk3::Cursor)67)
+# define GLUT_CURSOR_INFO fltk3::CURSOR_HAND
+# define GLUT_CURSOR_DESTROY ((fltk3::Cursor)45)
+# define GLUT_CURSOR_HELP fltk3::CURSOR_HELP
+# define GLUT_CURSOR_CYCLE ((fltk3::Cursor)26)
+# define GLUT_CURSOR_SPRAY ((fltk3::Cursor)63)
+# define GLUT_CURSOR_WAIT fltk3::CURSOR_WAIT
+# define GLUT_CURSOR_TEXT fltk3::CURSOR_INSERT
+# define GLUT_CURSOR_CROSSHAIR fltk3::CURSOR_CROSS
+# define GLUT_CURSOR_UP_DOWN fltk3::CURSOR_NS
+# define GLUT_CURSOR_LEFT_RIGHT fltk3::CURSOR_WE
+# define GLUT_CURSOR_TOP_SIDE fltk3::CURSOR_N
+# define GLUT_CURSOR_BOTTOM_SIDE fltk3::CURSOR_S
+# define GLUT_CURSOR_LEFT_SIDE fltk3::CURSOR_W
+# define GLUT_CURSOR_RIGHT_SIDE fltk3::CURSOR_E
+# define GLUT_CURSOR_TOP_LEFT_CORNER fltk3::CURSOR_NW
+# define GLUT_CURSOR_TOP_RIGHT_CORNER fltk3::CURSOR_NE
+# define GLUT_CURSOR_BOTTOM_RIGHT_CORNER fltk3::CURSOR_SE
+# define GLUT_CURSOR_BOTTOM_LEFT_CORNER fltk3::CURSOR_SW
+# define GLUT_CURSOR_INHERIT fltk3::CURSOR_DEFAULT
+# define GLUT_CURSOR_NONE fltk3::CURSOR_NONE
+# define GLUT_CURSOR_FULL_CROSSHAIR fltk3::CURSOR_CROSS
inline void glutWarpPointer(int, int) { /* do nothing */ }
@@ -368,9 +368,9 @@
FL_EXPORT int glutDeviceGet(GLenum type);
// WARNING: these values are different than GLUT uses:
-# define GLUT_ACTIVE_SHIFT FL_SHIFT
-# define GLUT_ACTIVE_CTRL FL_CTRL
-# define GLUT_ACTIVE_ALT FL_ALT
+# define GLUT_ACTIVE_SHIFT fltk3::SHIFT
+# define GLUT_ACTIVE_CTRL fltk3::CTRL
+# define GLUT_ACTIVE_ALT fltk3::ALT
inline int glutGetModifiers() {return fltk3::event_state() & (GLUT_ACTIVE_SHIFT | GLUT_ACTIVE_CTRL | GLUT_ACTIVE_ALT);}
FL_EXPORT int glutLayerGet(GLenum);
Modified: branches/branch-3.0-2011/fltk3/mac.H
===================================================================
--- branches/branch-3.0-2011/fltk3/mac.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/mac.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -144,7 +144,7 @@
WindowRef window_ref(void);
void contains_GL_subwindow(void);
void set_key_window(void);
- void set_cursor(Fl_Cursor);
+ void set_cursor(fltk3::Cursor);
static int screen_init(XRectangle screens[], float dpi[]);
static CGImageRef CGImage_from_window_rect(fltk3::Window *win, int x, int y, int w, int h);
static unsigned char *bitmap_from_window_rect(fltk3::Window *win, int x, int y, int w, int h, int *bytesPerPixel);
@@ -201,7 +201,7 @@
* \param cb a callback that will be called by "About myprog" menu item
* with NULL 1st argument.
* \param user_data a pointer transmitted as 2nd argument to the callback.
- * \param shortcut optional shortcut to attach to the "About myprog" menu item (e.g., FL_META+'a')
+ * \param shortcut optional shortcut to attach to the "About myprog" menu item (e.g., fltk3::META+'a')
*/
extern void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut = 0);
Modified: branches/branch-3.0-2011/fltk3/run.h
===================================================================
--- branches/branch-3.0-2011/fltk3/run.h 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/run.h 2011-01-09 22:48:30 UTC (rev 8233)
@@ -72,13 +72,13 @@
@{ */
/** signature of some label drawing functions passed as parameters */
-typedef void (Fl_Label_Draw_F)(const Fl_Label *label, int x, int y, int w, int h, Fl_Align align);
+typedef void (Fl_Label_Draw_F)(const Fl_Label *label, int x, int y, int w, int h, fltk3::Align align);
/** signature of some label measurement functions passed as parameters */
typedef void (Fl_Label_Measure_F)(const Fl_Label *label, int &width, int &height);
/** signature of some box drawing functions passed as parameters */
-typedef void (Fl_Box_Draw_F)(int x, int y, int w, int h, Fl_Color color);
+typedef void (Fl_Box_Draw_F)(int x, int y, int w, int h, fltk3::Color color);
/** signature of some timeout callback functions passed as parameters */
typedef void (*Fl_Timeout_Handler)(void *data);
@@ -336,7 +336,7 @@
arbitrary void* argument.
The second version takes a when bitfield, with the bits
- FL_READ, FL_WRITE, and FL_EXCEPT defined,
+ fltk3::READ, fltk3::WRITE, and fltk3::EXCEPT defined,
to indicate when the callback should be done.
There can only be one callback of each type for a file descriptor.
@@ -562,19 +562,19 @@
returns non-zero if any of the passed bits are turned on.
The legal bits are:
- \li FL_SHIFT
+ \li fltk3::SHIFT
\li FL_CAPS_LOCK
- \li FL_CTRL
- \li FL_ALT
- \li FL_NUM_LOCK
- \li FL_META
- \li FL_SCROLL_LOCK
- \li FL_BUTTON1
- \li FL_BUTTON2
- \li FL_BUTTON3
+ \li fltk3::CTRL
+ \li fltk3::ALT
+ \li fltk3::NUM_LOCK
+ \li fltk3::META
+ \li fltk3::SCROLL_LOCK
+ \li fltk3::BUTTON1
+ \li fltk3::BUTTON2
+ \li fltk3::BUTTON3
- X servers do not agree on shift states, and FL_NUM_LOCK, FL_META, and
- FL_SCROLL_LOCK may not work. The values were selected to match the
+ X servers do not agree on shift states, and fltk3::NUM_LOCK, fltk3::META, and
+ fltk3::SCROLL_LOCK may not work. The values were selected to match the
XFree86 server on Linux. In addition there is a bug in the way X works
so that the shift state is not correctly reported until the first event
<I>after</I> the shift key is pressed or released.
@@ -786,20 +786,20 @@
@{ */
// color map:
- void set_color(Fl_Color, uchar, uchar, uchar);
+ void set_color(fltk3::Color, uchar, uchar, uchar);
/**
Sets an entry in the fl_color index table. You can set it to any
8-bit RGB color. The color is not allocated until fl_color(i) is used.
*/
- void set_color(Fl_Color i, unsigned c); // platform dependent
- unsigned get_color(Fl_Color i);
- void get_color(Fl_Color i, uchar &red, uchar &green, uchar &blue);
+ void set_color(fltk3::Color i, unsigned c); // platform dependent
+ unsigned get_color(fltk3::Color i);
+ void get_color(fltk3::Color i, uchar &red, uchar &green, uchar &blue);
/**
Frees the specified color from the colormap, if applicable.
If overlay is non-zero then the color is freed from the
overlay colormap.
*/
- void free_color(Fl_Color i, int overlay = 0); // platform dependent
+ void free_color(fltk3::Color i, int overlay = 0); // platform dependent
// fonts:
const char* get_font(fltk3::Font);
@@ -890,37 +890,37 @@
/** \addtogroup fl_events
@{ */
/** Returns non-zero if the Shift key is pressed. */
- inline int event_shift() {return e_state&FL_SHIFT;}
+ inline int event_shift() {return e_state&fltk3::SHIFT;}
/** Returns non-zero if the Control key is pressed. */
- inline int event_ctrl() {return e_state&FL_CTRL;}
- /** Returns non-zero if the FL_COMMAND key is pressed, either FL_CTRL or on OSX FL_META. */
- inline int event_command() {return e_state&FL_COMMAND;}
+ inline int event_ctrl() {return e_state&fltk3::CTRL;}
+ /** Returns non-zero if the fltk3::COMMAND key is pressed, either fltk3::CTRL or on OSX fltk3::META. */
+ inline int event_command() {return e_state&fltk3::COMMAND;}
/** Returns non-zero if the Alt key is pressed. */
- inline int event_alt() {return e_state&FL_ALT;}
+ inline int event_alt() {return e_state&fltk3::ALT;}
/**
Returns the mouse buttons state bits; if non-zero, then at least one
button is pressed now. This function returns the button state at the
time of the event. During an FL_RELEASE event, the state
of the released button will be 0. To find out, which button
caused an FL_RELEASE event, you can use fltk3::event_button() instead.
- \return a bit mask value like { [FL_BUTTON1] | [FL_BUTTON2] | [FL_BUTTON3] }
+ \return a bit mask value like { [fltk3::BUTTON1] | [fltk3::BUTTON2] | [fltk3::BUTTON3] }
*/
inline int event_buttons() {return e_state&0x7f000000;}
/**
Returns non-zero if mouse button 1 is currently held down.
For more details, see fltk3::event_buttons().
*/
- inline int event_button1() {return e_state&FL_BUTTON1;}
+ inline int event_button1() {return e_state&fltk3::BUTTON1;}
/**
Returns non-zero if button 2 is currently held down.
For more details, see fltk3::event_buttons().
*/
- inline int event_button2() {return e_state&FL_BUTTON2;}
+ inline int event_button2() {return e_state&fltk3::BUTTON2;}
/**
Returns non-zero if button 3 is currently held down.
For more details, see fltk3::event_buttons().
*/
- inline int event_button3() {return e_state&FL_BUTTON3;}
+ inline int event_button3() {return e_state&fltk3::BUTTON3;}
/** @} */
/**
Modified: branches/branch-3.0-2011/fltk3/x.H
===================================================================
--- branches/branch-3.0-2011/fltk3/x.H 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/fltk3/x.H 2011-01-09 22:48:30 UTC (rev 8233)
@@ -95,7 +95,7 @@
extern FL_EXPORT GC fl_gc;
extern FL_EXPORT Window fl_window;
extern FL_EXPORT void *fl_xftfont;
-FL_EXPORT ulong fl_xpixel(Fl_Color i);
+FL_EXPORT ulong fl_xpixel(fltk3::Color i);
FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);
FL_EXPORT void fl_clip_region(Fl_Region);
FL_EXPORT Fl_Region fl_clip_region();
Modified: branches/branch-3.0-2011/src/Fl.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -891,7 +891,7 @@
// MRS: Originally we checked the button state, but a user reported that it
// broke click-to-focus in FLWM?!?
-// if (!(fltk3::event_state() & 0x7f00000 /*FL_BUTTONS*/)) {
+// if (!(fltk3::event_state() & 0x7f00000 /*fltk3::BUTTONS*/)) {
if (!fltk3::pushed()) {
// set belowmouse based on fltk3::modal() and fl_xmousewin:
w = fl_xmousewin;
@@ -1220,7 +1220,7 @@
// MacOS X manages a single pointer per application. Make sure that hiding
// a toplevel window will not leave us with some random pointer shape, or
// worst case, an invisible pointer
- if (!parent()) cursor(FL_CURSOR_DEFAULT);
+ if (!parent()) cursor(fltk3::CURSOR_DEFAULT);
#endif
i = 0;
@@ -1404,7 +1404,7 @@
#include <fltk3/fl_draw.H>
void fltk3::Widget::redraw() {
- damage(FL_DAMAGE_ALL);
+ damage(fltk3::DAMAGE_ALL);
}
void fltk3::Widget::redraw_label() {
@@ -1415,10 +1415,10 @@
// background...
int X = x() > 0 ? x() - 1 : 0;
int Y = y() > 0 ? y() - 1 : 0;
- window()->damage(FL_DAMAGE_ALL, X, Y, w() + 2, h() + 2);
+ window()->damage(fltk3::DAMAGE_ALL, X, Y, w() + 2, h() + 2);
}
- if (align() && !(align() & FL_ALIGN_INSIDE) && window()->shown()) {
+ if (align() && !(align() & fltk3::ALIGN_INSIDE) && window()->shown()) {
// If the label is not inside the widget, compute the location of
// the label and redraw the window within that bounding box...
int W = 0, H = 0;
@@ -1430,36 +1430,36 @@
// This assumes the measure() returns the correct outline, which it does
// not in all possible cases of alignment combinedwith image and symbols.
switch (align() & 0x0f) {
- case FL_ALIGN_TOP_LEFT:
- window()->damage(FL_DAMAGE_EXPOSE, x(), y()-H, W, H); break;
- case FL_ALIGN_TOP:
- window()->damage(FL_DAMAGE_EXPOSE, x()+(w()-W)/2, y()-H, W, H); break;
- case FL_ALIGN_TOP_RIGHT:
- window()->damage(FL_DAMAGE_EXPOSE, x()+w()-W, y()-H, W, H); break;
- case FL_ALIGN_LEFT_TOP:
- window()->damage(FL_DAMAGE_EXPOSE, x()-W, y(), W, H); break;
- case FL_ALIGN_RIGHT_TOP:
- window()->damage(FL_DAMAGE_EXPOSE, x()+w(), y(), W, H); break;
- case FL_ALIGN_LEFT:
- window()->damage(FL_DAMAGE_EXPOSE, x()-W, y()+(h()-H)/2, W, H); break;
- case FL_ALIGN_RIGHT:
- window()->damage(FL_DAMAGE_EXPOSE, x()+w(), y()+(h()-H)/2, W, H); break;
- case FL_ALIGN_LEFT_BOTTOM:
- window()->damage(FL_DAMAGE_EXPOSE, x()-W, y()+h()-H, W, H); break;
- case FL_ALIGN_RIGHT_BOTTOM:
- window()->damage(FL_DAMAGE_EXPOSE, x()+w(), y()+h()-H, W, H); break;
- case FL_ALIGN_BOTTOM_LEFT:
- window()->damage(FL_DAMAGE_EXPOSE, x(), y()+h(), W, H); break;
- case FL_ALIGN_BOTTOM:
- window()->damage(FL_DAMAGE_EXPOSE, x()+(w()-W)/2, y()+h(), W, H); break;
- case FL_ALIGN_BOTTOM_RIGHT:
- window()->damage(FL_DAMAGE_EXPOSE, x()+w()-W, y()+h(), W, H); break;
+ case fltk3::ALIGN_TOP_LEFT:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x(), y()-H, W, H); break;
+ case fltk3::ALIGN_TOP:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+(w()-W)/2, y()-H, W, H); break;
+ case fltk3::ALIGN_TOP_RIGHT:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+w()-W, y()-H, W, H); break;
+ case fltk3::ALIGN_LEFT_TOP:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()-W, y(), W, H); break;
+ case fltk3::ALIGN_RIGHT_TOP:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+w(), y(), W, H); break;
+ case fltk3::ALIGN_LEFT:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()-W, y()+(h()-H)/2, W, H); break;
+ case fltk3::ALIGN_RIGHT:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+w(), y()+(h()-H)/2, W, H); break;
+ case fltk3::ALIGN_LEFT_BOTTOM:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()-W, y()+h()-H, W, H); break;
+ case fltk3::ALIGN_RIGHT_BOTTOM:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+w(), y()+h()-H, W, H); break;
+ case fltk3::ALIGN_BOTTOM_LEFT:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x(), y()+h(), W, H); break;
+ case fltk3::ALIGN_BOTTOM:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+(w()-W)/2, y()+h(), W, H); break;
+ case fltk3::ALIGN_BOTTOM_RIGHT:
+ window()->damage(fltk3::DAMAGE_EXPOSE, x()+w()-W, y()+h(), W, H); break;
default:
- window()->damage(FL_DAMAGE_ALL); break;
+ window()->damage(fltk3::DAMAGE_ALL); break;
}
} else {
// The label is inside the widget, so just redraw the widget itself...
- damage(FL_DAMAGE_ALL);
+ damage(fltk3::DAMAGE_ALL);
}
}
}
@@ -1474,18 +1474,18 @@
if (!i) return; // window not mapped, so ignore it
if (i->region) {XDestroyRegion(i->region); i->region = 0;}
damage_ |= fl;
- fltk3::damage(FL_DAMAGE_CHILD);
+ fltk3::damage(fltk3::DAMAGE_CHILD);
}
}
void fltk3::Widget::damage(uchar fl, int X, int Y, int W, int H) {
fltk3::Widget* wi = this;
- // mark all parent widgets between this and window with FL_DAMAGE_CHILD:
+ // mark all parent widgets between this and window with fltk3::DAMAGE_CHILD:
while (wi->type() < FL_WINDOW) {
wi->damage_ |= fl;
wi = wi->parent();
if (!wi) return;
- fl = FL_DAMAGE_CHILD;
+ fl = fltk3::DAMAGE_CHILD;
}
Fl_X* i = Fl_X::i((fltk3::Window*)wi);
if (!i) return; // window not mapped, so ignore it
@@ -1535,11 +1535,11 @@
i->region = XRectangleRegion(X,Y,W,H);
wi->damage_ = fl;
}
- fltk3::damage(FL_DAMAGE_CHILD);
+ fltk3::damage(fltk3::DAMAGE_CHILD);
}
void fltk3::Window::flush() {
make_current();
-//if (damage() == FL_DAMAGE_EXPOSE && can_boxcheat(box())) fl_boxcheat = this;
+//if (damage() == fltk3::DAMAGE_EXPOSE && can_boxcheat(box())) fl_boxcheat = this;
fl_clip_region(i->region); i->region = 0;
draw();
}
Modified: branches/branch-3.0-2011/src/Fl_Bitmap.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Bitmap.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Bitmap.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -315,13 +315,13 @@
if (use_print_algo) { // algorithm for bitmap output to Fl_GDI_Printer
Fl_Offscreen tmp_id = fl_create_offscreen(W, H);
fl_begin_offscreen(tmp_id);
- Fl_Color save_c = fl_color(); // save bitmap's desired color
+ fltk3::Color save_c = fl_color(); // save bitmap's desired color
uchar r, g, b;
fltk3::get_color(save_c, r, g, b);
r = 255-r;
g = 255-g;
b = 255-b;
- Fl_Color background = fl_rgb_color(r, g, b); // a color very different from the bitmap's
+ fltk3::Color background = fl_rgb_color(r, g, b); // a color very different from the bitmap's
fl_color(background);
fl_rectf(0,0,W,H); // use this color as offscreen background
fl_color(save_c); // back to bitmap's color
Modified: branches/branch-3.0-2011/src/Fl_Browser.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Browser.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Browser.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -531,8 +531,8 @@
}
int tsize = textsize();
fltk3::Font font = textfont();
- Fl_Color lcol = textcolor();
- Fl_Align talign = FL_ALIGN_LEFT;
+ fltk3::Color lcol = textcolor();
+ fltk3::Align talign = fltk3::ALIGN_LEFT;
// check for all the @-lines recognized by XForms:
//#if defined(__GNUC__)
//#warning FIXME This maybe needs to be more UTF8 aware now...?
@@ -546,16 +546,16 @@
case 'b': font = (fltk3::Font)(font|fltk3::BOLD); break;
case 'i': font = (fltk3::Font)(font|fltk3::ITALIC); break;
case 'f': case 't': font = fltk3::COURIER; break;
- case 'c': talign = FL_ALIGN_CENTER; break;
- case 'r': talign = FL_ALIGN_RIGHT; break;
+ case 'c': talign = fltk3::ALIGN_CENTER; break;
+ case 'r': talign = fltk3::ALIGN_RIGHT; break;
case 'B':
if (!(l->flags & SELECTED)) {
- fl_color((Fl_Color)strtol(str, &str, 10));
+ fl_color((fltk3::Color)strtol(str, &str, 10));
fl_rectf(X, Y, w1, H);
} else dummy = strtol(str, &str, 10);
break;
case 'C':
- lcol = (Fl_Color)strtol(str, &str, 10);
+ lcol = (fltk3::Color)strtol(str, &str, 10);
break;
case 'F':
font = (fltk3::Font)strtol(str, &str, 10);
@@ -589,7 +589,7 @@
lcol = fl_contrast(lcol, selection_color());
if (!active_r()) lcol = fl_inactive(lcol);
fl_color(lcol);
- fl_draw(str, X+3, Y, w1-6, H, e ? Fl_Align(talign|FL_ALIGN_CLIP) : talign, 0, 0);
+ fl_draw(str, X+3, Y, w1-6, H, e ? fltk3::Align(talign|fltk3::ALIGN_CLIP) : talign, 0, 0);
if (!e) break; // no more fields...
*e = column_char(); // put the separator back
X += w1;
Modified: branches/branch-3.0-2011/src/Fl_Browser_.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Browser_.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Browser_.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -83,12 +83,12 @@
H = h()-fltk3::box_dh(b);
if (scrollbar.visible()) {
W -= scrollsize;
- if (scrollbar.align() & FL_ALIGN_LEFT) X += scrollsize;
+ if (scrollbar.align() & fltk3::ALIGN_LEFT) X += scrollsize;
}
if (W < 0) W = 0;
if (hscrollbar.visible()) {
H -= scrollsize;
- if (scrollbar.align() & FL_ALIGN_TOP) Y += scrollsize;
+ if (scrollbar.align() & fltk3::ALIGN_TOP) Y += scrollsize;
}
if (H < 0) H = 0;
}
@@ -117,10 +117,10 @@
// move the scrollbars so they can respond to events:
bbox(X,Y,W,H);
scrollbar.resize(
- scrollbar.align()&FL_ALIGN_LEFT ? X-scrollsize : X+W,
+ scrollbar.align()&fltk3::ALIGN_LEFT ? X-scrollsize : X+W,
Y, scrollsize, H);
hscrollbar.resize(
- X, scrollbar.align()&FL_ALIGN_TOP ? Y-scrollsize : Y+H,
+ X, scrollbar.align()&fltk3::ALIGN_TOP ? Y-scrollsize : Y+H,
W, scrollsize);
}
@@ -132,9 +132,9 @@
\see redraw_lines(), redraw_line()
*/
void Fl_Browser_::redraw_line(void* item) {
- if (!redraw1 || redraw1 == item) {redraw1 = item; damage(FL_DAMAGE_EXPOSE);}
- else if (!redraw2 || redraw2 == item) {redraw2 = item; damage(FL_DAMAGE_EXPOSE);}
- else damage(FL_DAMAGE_SCROLL);
+ if (!redraw1 || redraw1 == item) {redraw1 = item; damage(fltk3::DAMAGE_EXPOSE);}
+ else if (!redraw2 || redraw2 == item) {redraw2 = item; damage(fltk3::DAMAGE_EXPOSE);}
+ else damage(fltk3::DAMAGE_SCROLL);
}
// Figure out top() based on position():
@@ -187,7 +187,7 @@
offset_ = yy-ly;
real_position_ = yy;
}
- damage(FL_DAMAGE_SCROLL);
+ damage(fltk3::DAMAGE_SCROLL);
}
}
@@ -342,7 +342,7 @@
int X, Y, W, H; bbox(X, Y, W, H);
int dont_repeat = 0;
J1:
- if (damage() & FL_DAMAGE_ALL) { // redraw the box if full redraw
+ if (damage() & fltk3::DAMAGE_ALL) { // redraw the box if full redraw
fltk3::Boxtype b = box() ? box() : fltk3::DOWN_BOX;
draw_box(b, x(), y(), w(), h(), color());
drawsquare = 1;
@@ -359,7 +359,7 @@
top_ = item_first(); real_position_ = offset_ = 0;
if (scrollbar.visible()) {
scrollbar.clear_visible();
- clear_damage((uchar)(damage()|FL_DAMAGE_SCROLL));
+ clear_damage((uchar)(damage()|fltk3::DAMAGE_SCROLL));
}
}
@@ -374,7 +374,7 @@
real_hposition_ = 0;
if (hscrollbar.visible()) {
hscrollbar.clear_visible();
- clear_damage((uchar)(damage()|FL_DAMAGE_SCROLL));
+ clear_damage((uchar)(damage()|fltk3::DAMAGE_SCROLL));
}
}
@@ -392,7 +392,7 @@
top_ = item_first(); real_position_ = offset_ = 0;
if (scrollbar.visible()) {
scrollbar.clear_visible();
- clear_damage((uchar)(damage()|FL_DAMAGE_SCROLL));
+ clear_damage((uchar)(damage()|fltk3::DAMAGE_SCROLL));
}
}
@@ -406,11 +406,11 @@
for (; l && yy < H; l = item_next(l)) {
int hh = item_height(l);
if (hh <= 0) continue;
- if ((damage()&(FL_DAMAGE_SCROLL|FL_DAMAGE_ALL)) || l == redraw1 || l == redraw2) {
+ if ((damage()&(fltk3::DAMAGE_SCROLL|fltk3::DAMAGE_ALL)) || l == redraw1 || l == redraw2) {
if (item_selected(l)) {
fl_color(active_r() ? selection_color() : fl_inactive(selection_color()));
fl_rectf(X, yy+Y, W, hh);
- } else if (!(damage()&FL_DAMAGE_ALL)) {
+ } else if (!(damage()&fltk3::DAMAGE_ALL)) {
fl_push_clip(X, yy+Y, W, hh);
draw_box(box() ? box() : fltk3::DOWN_BOX, x(), y(), w(), h(), color());
fl_pop_clip();
@@ -426,7 +426,7 @@
yy += hh;
}
// erase the area below last line:
- if (!(damage()&FL_DAMAGE_ALL) && yy < H) {
+ if (!(damage()&fltk3::DAMAGE_ALL) && yy < H) {
fl_push_clip(X, yy+Y, W, H-yy);
draw_box(box() ? box() : fltk3::DOWN_BOX, x(), y(), w(), h(), color());
fl_pop_clip();
@@ -442,15 +442,15 @@
full_width_ = full_width();
if ((has_scrollbar_ & VERTICAL) &&
((has_scrollbar_ & ALWAYS_ON) || position_ || full_height_>H)) {
- if (!scrollbar.visible()) { damage(FL_DAMAGE_ALL); goto J1; }
+ if (!scrollbar.visible()) { damage(fltk3::DAMAGE_ALL); goto J1; }
} else {
- if (scrollbar.visible()) { damage(FL_DAMAGE_ALL); goto J1; }
+ if (scrollbar.visible()) { damage(fltk3::DAMAGE_ALL); goto J1; }
}
if ((has_scrollbar_ & HORIZONTAL) &&
((has_scrollbar_ & ALWAYS_ON) || hposition_ || full_width_>W)) {
- if (!hscrollbar.visible()) { damage(FL_DAMAGE_ALL); goto J1; }
+ if (!hscrollbar.visible()) { damage(fltk3::DAMAGE_ALL); goto J1; }
} else {
- if (hscrollbar.visible()) { damage(FL_DAMAGE_ALL); goto J1; }
+ if (hscrollbar.visible()) { damage(fltk3::DAMAGE_ALL); goto J1; }
}
}
@@ -459,7 +459,7 @@
int dy = top_ ? item_quick_height(top_) : 0; if (dy < 10) dy = 10;
if (scrollbar.visible()) {
scrollbar.damage_resize(
- scrollbar.align()&FL_ALIGN_LEFT ? X-scrollsize : X+W,
+ scrollbar.align()&fltk3::ALIGN_LEFT ? X-scrollsize : X+W,
Y, scrollsize, H);
scrollbar.value(position_, H, 0, full_height_);
scrollbar.linesize(dy);
@@ -468,7 +468,7 @@
}
if (hscrollbar.visible()) {
hscrollbar.damage_resize(
- X, scrollbar.align()&FL_ALIGN_TOP ? Y-scrollsize : Y+H,
+ X, scrollbar.align()&fltk3::ALIGN_TOP ? Y-scrollsize : Y+H,
W, scrollsize);
hscrollbar.value(hposition_, W, 0, full_width_);
hscrollbar.linesize(dy);
@@ -736,20 +736,20 @@
switch (fltk3::event_key()) {
case FL_Enter:
case FL_KP_Enter:
- select_only(l, when() & ~FL_WHEN_ENTER_KEY);
+ select_only(l, when() & ~fltk3::WHEN_ENTER_KEY);
if (wp.deleted()) return 1;
- if (when() & FL_WHEN_ENTER_KEY) {
+ if (when() & fltk3::WHEN_ENTER_KEY) {
set_changed();
do_callback();
}
return 1;
case ' ':
selection_ = l;
- select(l, !item_selected(l), when() & ~FL_WHEN_ENTER_KEY);
+ select(l, !item_selected(l), when() & ~fltk3::WHEN_ENTER_KEY);
return 1;
case FL_Down:
while ((l = item_next(l))) {
- if (fltk3::event_state(FL_SHIFT|FL_CTRL))
+ if (fltk3::event_state(fltk3::SHIFT|fltk3::CTRL))
select(l, l1 ? item_selected(l1) : 1, when());
if (wp.deleted()) return 1;
if (item_height(l)>0) goto J1;
@@ -757,7 +757,7 @@
return 1;
case FL_Up:
while ((l = item_prev(l))) {
- if (fltk3::event_state(FL_SHIFT|FL_CTRL))
+ if (fltk3::event_state(fltk3::SHIFT|fltk3::CTRL))
select(l, l1 ? item_selected(l1) : 1, when());
if (wp.deleted()) return 1;
if (item_height(l)>0) goto J1;
@@ -780,10 +780,10 @@
int my;
// NOTE:
// instead of:
-// change = select_only(find_item(my), when() & FL_WHEN_CHANGED)
+// change = select_only(find_item(my), when() & fltk3::WHEN_CHANGED)
// we use the construct:
// change = select_only(find_item(my), 0);
-// if (change && (when() & FL_WHEN_CHANGED)) {
+// if (change && (when() & fltk3::WHEN_CHANGED)) {
// set_changed();
// do_callback();
// }
@@ -812,7 +812,7 @@
else if (type() != FL_MULTI_BROWSER) {
change = select_only(find_item(my), 0);
if (wp.deleted()) return 1;
- if (change && (when() & FL_WHEN_CHANGED)) {
+ if (change && (when() & fltk3::WHEN_CHANGED)) {
set_changed();
do_callback();
if (wp.deleted()) return 1;
@@ -820,19 +820,19 @@
} else {
void* l = find_item(my);
whichway = 1;
- if (fltk3::event_state(FL_CTRL)) { // toggle selection:
+ if (fltk3::event_state(fltk3::CTRL)) { // toggle selection:
TOGGLE:
if (l) {
whichway = !item_selected(l);
change = select(l, whichway, 0);
if (wp.deleted()) return 1;
- if (change && (when() & FL_WHEN_CHANGED)) {
+ if (change && (when() & fltk3::WHEN_CHANGED)) {
set_changed();
do_callback();
if (wp.deleted()) return 1;
}
}
- } else if (fltk3::event_state(FL_SHIFT)) { // extend selection:
+ } else if (fltk3::event_state(fltk3::SHIFT)) { // extend selection:
if (l == selection_) goto TOGGLE;
// state of previous selection determines new value:
whichway = l ? !item_selected(l) : 1;
@@ -846,25 +846,25 @@
}}
if (down) {
for (void* m = selection_; m != l; m = item_next(m)) {
- select(m, whichway, when() & FL_WHEN_CHANGED);
+ select(m, whichway, when() & fltk3::WHEN_CHANGED);
if (wp.deleted()) return 1;
}
} else {
void* e = selection_;
for (void* m = item_next(l); m; m = item_next(m)) {
- select(m, whichway, when() & FL_WHEN_CHANGED);
+ select(m, whichway, when() & fltk3::WHEN_CHANGED);
if (wp.deleted()) return 1;
if (m == e) break;
}
}
// do the clicked item last so the select box is around it:
change = 1;
- if (l) select(l, whichway, when() & FL_WHEN_CHANGED);
+ if (l) select(l, whichway, when() & fltk3::WHEN_CHANGED);
if (wp.deleted()) return 1;
} else { // select only this item
change = select_only(l, 0);
if (wp.deleted()) return 1;
- if (change && (when() & FL_WHEN_CHANGED)) {
+ if (change && (when() & fltk3::WHEN_CHANGED)) {
set_changed();
do_callback();
if (wp.deleted()) return 1;
@@ -902,7 +902,7 @@
change_t = select(t, whichway, 0);
if (wp.deleted()) return 1;
change |= change_t;
- if (change_t && (when() & FL_WHEN_CHANGED)) {
+ if (change_t && (when() & fltk3::WHEN_CHANGED)) {
set_changed();
do_callback();
if (wp.deleted()) return 1;
@@ -915,7 +915,7 @@
(fltk3::event_x()<x() || fltk3::event_x()>x()+w()) ? selection_ :
find_item(my);
change = (l != l1);
- select_only(l, when() & FL_WHEN_CHANGED);
+ select_only(l, when() & fltk3::WHEN_CHANGED);
if (wp.deleted()) return 1;
}
py = my;
@@ -929,14 +929,14 @@
}
if (change) {
set_changed();
- if (when() & FL_WHEN_RELEASE) do_callback();
+ if (when() & fltk3::WHEN_RELEASE) do_callback();
} else {
- if (when() & FL_WHEN_NOT_CHANGED) do_callback();
+ if (when() & fltk3::WHEN_NOT_CHANGED) do_callback();
}
if (wp.deleted()) return 1;
// double click calls the callback: (like Enter Key)
- if (fltk3::event_clicks() && (when() & FL_WHEN_ENTER_KEY)) {
+ if (fltk3::event_clicks() && (when() & fltk3::WHEN_ENTER_KEY)) {
set_changed();
do_callback();
}
@@ -963,20 +963,20 @@
hscrollbar(0, 0, 0, 0, 0)
{
box(fltk3::NO_BOX);
- align(FL_ALIGN_BOTTOM);
+ align(fltk3::ALIGN_BOTTOM);
position_ = real_position_ = 0;
hposition_ = real_hposition_ = 0;
offset_ = 0;
top_ = 0;
- when(FL_WHEN_RELEASE_ALWAYS);
+ when(fltk3::WHEN_RELEASE_ALWAYS);
selection_ = 0;
color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
scrollbar.callback(scrollbar_callback);
-//scrollbar.align(FL_ALIGN_LEFT|FL_ALIGN_BOTTOM); // back compatibility?
+//scrollbar.align(fltk3::ALIGN_LEFT|fltk3::ALIGN_BOTTOM); // back compatibility?
hscrollbar.callback(hscrollbar_callback);
hscrollbar.type(FL_HORIZONTAL);
textfont_ = fltk3::HELVETICA;
- textsize_ = FL_NORMAL_SIZE;
+ textsize_ = fltk3::NORMAL_SIZE;
textcolor_ = FL_FOREGROUND_COLOR;
has_scrollbar_ = BOTH;
max_width = 0;
Modified: branches/branch-3.0-2011/src/Fl_Button.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Button.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Button.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -74,11 +74,11 @@
void Fl_Button::draw() {
if (type() == FL_HIDDEN_BUTTON) return;
- Fl_Color col = value() ? selection_color() : color();
+ fltk3::Color col = value() ? selection_color() : color();
draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(), col);
draw_backdrop();
if (labeltype() == fltk3::NORMAL_LABEL && value()) {
- Fl_Color c = labelcolor();
+ fltk3::Color c = labelcolor();
labelcolor(fl_contrast(c, col));
draw_label();
labelcolor(c);
@@ -108,12 +108,12 @@
value_ = newval;
set_changed();
redraw();
- if (when() & FL_WHEN_CHANGED) do_callback();
+ if (when() & fltk3::WHEN_CHANGED) do_callback();
}
return 1;
case FL_RELEASE:
if (value_ == oldval) {
- if (when() & FL_WHEN_NOT_CHANGED) do_callback();
+ if (when() & fltk3::WHEN_NOT_CHANGED) do_callback();
return 1;
}
set_changed();
@@ -122,13 +122,13 @@
else {
value(oldval);
set_changed();
- if (when() & FL_WHEN_CHANGED) {
+ if (when() & fltk3::WHEN_CHANGED) {
Fl_Widget_Tracker wp(this);
do_callback();
if (wp.deleted()) return 1;
}
}
- if (when() & FL_WHEN_RELEASE) do_callback();
+ if (when() & fltk3::WHEN_RELEASE) do_callback();
return 1;
case FL_SHORTCUT:
if (!(shortcut() ?
@@ -144,27 +144,27 @@
// background...
int X = x() > 0 ? x() - 1 : 0;
int Y = y() > 0 ? y() - 1 : 0;
- if (window()) window()->damage(FL_DAMAGE_ALL, X, Y, w() + 2, h() + 2);
+ if (window()) window()->damage(fltk3::DAMAGE_ALL, X, Y, w() + 2, h() + 2);
} else redraw();
return 1;
} else return 0;
case FL_KEYBOARD :
if (fltk3::focus() == this && fltk3::event_key() == ' ' &&
- !(fltk3::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) {
+ !(fltk3::event_state() & (fltk3::SHIFT | fltk3::CTRL | fltk3::ALT | fltk3::META))) {
set_changed();
triggered_by_keyboard:
Fl_Widget_Tracker wp(this);
if (type() == FL_RADIO_BUTTON && !value_) {
setonly();
- if (when() & FL_WHEN_CHANGED) do_callback();
+ if (when() & fltk3::WHEN_CHANGED) do_callback();
} else if (type() == FL_TOGGLE_BUTTON) {
value(!value());
- if (when() & FL_WHEN_CHANGED) do_callback();
+ if (when() & fltk3::WHEN_CHANGED) do_callback();
} else {
simulate_key_action();
}
if (wp.deleted()) return 1;
- if (when() & FL_WHEN_RELEASE) do_callback();
+ if (when() & fltk3::WHEN_RELEASE) do_callback();
return 1;
}
default:
Modified: branches/branch-3.0-2011/src/Fl_Chart.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Chart.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Chart.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -35,14 +35,14 @@
#define ARCINC (2.0*M_PI/360.0)
// this function is in fl_boxtype.cxx:
-void fl_rectbound(int x,int y,int w,int h, Fl_Color color);
+void fl_rectbound(int x,int y,int w,int h, fltk3::Color color);
/* Widget specific information */
static void draw_barchart(int x,int y,int w,int h,
int numb, FL_CHART_ENTRY entries[],
double min, double max, int autosize, int maxnumb,
- Fl_Color textcolor)
+ fltk3::Color textcolor)
/* Draws a bar chart. x,y,w,h is the bounding box, entries the array of
numb entries and min and max the boundaries. */
{
@@ -67,22 +67,22 @@
for (i=0; i<numb; i++) {
int hh = (int)rint(entries[i].val*incr);
if (hh < 0)
- fl_rectbound(x+i*bwidth,zeroh,bwidth+1,-hh+1, (Fl_Color)entries[i].col);
+ fl_rectbound(x+i*bwidth,zeroh,bwidth+1,-hh+1, (fltk3::Color)entries[i].col);
else if (hh > 0)
- fl_rectbound(x+i*bwidth,zeroh-hh,bwidth+1,hh+1,(Fl_Color)entries[i].col);
+ fl_rectbound(x+i*bwidth,zeroh-hh,bwidth+1,hh+1,(fltk3::Color)entries[i].col);
}
/* Draw the labels */
fl_color(textcolor);
for (i=0; i<numb; i++)
fl_draw(entries[i].str,
x+i*bwidth+bwidth/2,zeroh,0,0,
- FL_ALIGN_TOP);
+ fltk3::ALIGN_TOP);
}
static void draw_horbarchart(int x,int y,int w,int h,
int numb, FL_CHART_ENTRY entries[],
double min, double max, int autosize, int maxnumb,
- Fl_Color textcolor)
+ fltk3::Color textcolor)
/* Draws a horizontal bar chart. x,y,w,h is the bounding box, entries the
array of numb entries and min and max the boundaries. */
{
@@ -113,22 +113,22 @@
for (i=0; i<numb; i++) {
int ww = (int)rint(entries[i].val*incr);
if (ww > 0)
- fl_rectbound(zeroh,y+i*bwidth,ww+1,bwidth+1, (Fl_Color)entries[i].col);
+ fl_rectbound(zeroh,y+i*bwidth,ww+1,bwidth+1, (fltk3::Color)entries[i].col);
else if (ww < 0)
- fl_rectbound(zeroh+ww,y+i*bwidth,-ww+1,bwidth+1,(Fl_Color)entries[i].col);
+ fl_rectbound(zeroh+ww,y+i*bwidth,-ww+1,bwidth+1,(fltk3::Color)entries[i].col);
}
/* Draw the labels */
fl_color(textcolor);
for (i=0; i<numb; i++)
fl_draw(entries[i].str,
zeroh-2,y+i*bwidth+bwidth/2,0,0,
- FL_ALIGN_RIGHT);
+ fltk3::ALIGN_RIGHT);
}
static void draw_linechart(int type, int x,int y,int w,int h,
int numb, FL_CHART_ENTRY entries[],
double min, double max, int autosize, int maxnumb,
- Fl_Color textcolor)
+ fltk3::Color textcolor)
/* Draws a line chart. x,y,w,h is the bounding box, entries the array of
numb entries and min and max the boundaries. */
{
@@ -146,13 +146,13 @@
int yy0 = i ? zeroh - (int)rint(entries[i-1].val*incr) : 0;
int yy1 = zeroh - (int)rint(entries[i].val*incr);
if (type == FL_SPIKE_CHART) {
- fl_color((Fl_Color)entries[i].col);
+ fl_color((fltk3::Color)entries[i].col);
fl_line(x1, zeroh, x1, yy1);
} else if (type == FL_LINE_CHART && i != 0) {
- fl_color((Fl_Color)entries[i-1].col);
+ fl_color((fltk3::Color)entries[i-1].col);
fl_line(x0,yy0,x1,yy1);
} else if (type == FL_FILLED_CHART && i != 0) {
- fl_color((Fl_Color)entries[i-1].col);
+ fl_color((fltk3::Color)entries[i-1].col);
if ((entries[i-1].val>0.0)!=(entries[i].val>0.0)) {
double ttt = entries[i-1].val/(entries[i-1].val-entries[i].val);
int xt = x + (int)rint((i-.5+ttt)*bwidth);
@@ -172,12 +172,12 @@
for (i=0; i<numb; i++)
fl_draw(entries[i].str,
x+(int)rint((i+.5)*bwidth), zeroh - (int)rint(entries[i].val*incr),0,0,
- entries[i].val>=0 ? FL_ALIGN_BOTTOM : FL_ALIGN_TOP);
+ entries[i].val>=0 ? fltk3::ALIGN_BOTTOM : fltk3::ALIGN_TOP);
}
static void draw_piechart(int x,int y,int w,int h,
int numb, FL_CHART_ENTRY entries[], int special,
- Fl_Color textcolor)
+ fltk3::Color textcolor)
/* Draws a pie chart. x,y,w,h is the bounding box, entries the array of
numb entries */
{
@@ -210,7 +210,7 @@
txc += 0.3*rad*cos(ARCINC*(curang+0.5*incr*entries[i].val));
tyc -= 0.3*rad*sin(ARCINC*(curang+0.5*incr*entries[i].val));
}
- fl_color((Fl_Color)entries[i].col);
+ fl_color((fltk3::Color)entries[i].col);
fl_begin_polygon(); fl_vertex(txc,tyc);
fl_arc(txc,tyc,rad,curang, curang+incr*entries[i].val);
fl_end_polygon();
@@ -225,7 +225,7 @@
(int)rint(xl),
(int)rint(tyc - 1.1*rad*sin(ARCINC*curang)),
0, 0,
- xl<txc ? FL_ALIGN_RIGHT : FL_ALIGN_LEFT);
+ xl<txc ? fltk3::ALIGN_RIGHT : fltk3::ALIGN_LEFT);
curang += 0.5 * incr * entries[i].val;
}
}
@@ -283,7 +283,7 @@
#define FL_CHART_BOXTYPE FL_BORDER_BOX
#define FL_CHART_COL1 FL_COL1
#define FL_CHART_LCOL FL_LCOL
-#define FL_CHART_ALIGN FL_ALIGN_BOTTOM
+#define FL_CHART_ALIGN fltk3::ALIGN_BOTTOM
/**
Create a new Fl_Chart widget using the given position, size and label string.
@@ -294,7 +294,7 @@
Fl_Chart::Fl_Chart(int X, int Y, int W, int H,const char *L) :
fltk3::Widget(X,Y,W,H,L) {
box(fltk3::BORDER_BOX);
- align(FL_ALIGN_BOTTOM);
+ align(fltk3::ALIGN_BOTTOM);
numb = 0;
maxnumb = 0;
sizenumb = FL_CHART_MAX;
Modified: branches/branch-3.0-2011/src/Fl_Check_Browser.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Check_Browser.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Check_Browser.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -88,7 +88,7 @@
/** The constructor makes an empty browser.*/
: Fl_Browser_(X, Y, W, H, l) {
type(FL_SELECT_BROWSER);
- when(FL_WHEN_NEVER);
+ when(fltk3::WHEN_NEVER);
first = last = 0;
nitems_ = nchecked_ = 0;
cached_item = -1;
@@ -121,7 +121,7 @@
cb_item *i = (cb_item *)v;
char *s = i->text;
int tsize = textsize();
- Fl_Color col = active_r() ? textcolor() : fl_inactive(textcolor());
+ fltk3::Color col = active_r() ? textcolor() : fl_inactive(textcolor());
int cy = Y + (tsize + 1 - CHECK_SIZE) / 2;
X += 2;
Modified: branches/branch-3.0-2011/src/Fl_Choice.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Choice.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Choice.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -98,9 +98,9 @@
l.font = m.labelsize_ || m.labelfont_ ? m.labelfont_ : textfont();
l.size = m.labelsize_ ? m.labelsize_ : textsize();
l.color= m.labelcolor_ ? m.labelcolor_ : textcolor();
- if (!m.active()) l.color = fl_inactive((Fl_Color)l.color);
+ if (!m.active()) l.color = fl_inactive((fltk3::Color)l.color);
fl_draw_shortcut = 2; // hack value to make '&' disappear
- l.draw(xx+3, yy, ww>6 ? ww-6 : 0, hh, FL_ALIGN_LEFT);
+ l.draw(xx+3, yy, ww>6 ? ww-6 : 0, hh, fltk3::ALIGN_LEFT);
fl_draw_shortcut = 0;
if ( fltk3::focus() == this ) draw_focus(box(), xx, yy, ww, hh);
}
@@ -128,8 +128,8 @@
*/
Fl_Choice::Fl_Choice(int X, int Y, int W, int H, const char *L)
: Fl_Menu_(X,Y,W,H,L) {
- align(FL_ALIGN_LEFT);
- when(FL_WHEN_RELEASE);
+ align(fltk3::ALIGN_LEFT);
+ when(fltk3::WHEN_RELEASE);
textfont(fltk3::HELVETICA);
box(fltk3::FLAT_BOX);
down_box(fltk3::BORDER_BOX);
@@ -171,7 +171,7 @@
case FL_KEYBOARD:
if (fltk3::event_key() != ' ' ||
- (fltk3::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) return 0;
+ (fltk3::event_state() & (fltk3::SHIFT | fltk3::CTRL | fltk3::ALT | fltk3::META))) return 0;
case FL_PUSH:
if (fltk3::visible_focus()) fltk3::focus(this);
J1:
@@ -181,7 +181,7 @@
} else {
// In order to preserve the old look-n-feel of "white" menus,
// temporarily override the color() of this widget...
- Fl_Color c = color();
+ fltk3::Color c = color();
color(FL_BACKGROUND2_COLOR);
v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
color(c);
Modified: branches/branch-3.0-2011/src/Fl_Clock.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Clock.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Clock.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -42,7 +42,7 @@
const float minhand[4][2] = {{-0.5f, 0}, {0, 1.5f}, {0.5f, 0}, {0, -11.5f}};
const float sechand[4][2] = {{-0.1f, 0}, {0, 2.0f}, {0.1f, 0}, {0, -11.5f}};
-static void drawhand(double ang,const float v[][2],Fl_Color fill,Fl_Color line)
+static void drawhand(double ang,const float v[][2],fltk3::Color fill,fltk3::Color line)
{
fl_push_matrix();
fl_rotate(ang);
@@ -53,7 +53,7 @@
fl_pop_matrix();
}
-void Fl_Clock_Output::drawhands(Fl_Color fill, Fl_Color line) {
+void Fl_Clock_Output::drawhands(fltk3::Color fill, fltk3::Color line) {
if (!active_r()) {
fill = fl_inactive(fill);
line = fl_inactive(line);
@@ -79,8 +79,8 @@
\param[in] X, Y, W, H position and size
*/
void Fl_Clock_Output::draw(int X, int Y, int W, int H) {
- Fl_Color box_color = type()==FL_ROUND_CLOCK ? FL_GRAY : color();
- Fl_Color shadow_color = fl_color_average(box_color, FL_BLACK, 0.5);
+ fltk3::Color box_color = type()==FL_ROUND_CLOCK ? FL_GRAY : color();
+ fltk3::Color shadow_color = fl_color_average(box_color, FL_BLACK, 0.5);
draw_box(box(), X, Y, W, H, box_color);
fl_push_matrix();
fl_translate(X+W/2.0-.5, Y+H/2.0-.5);
@@ -129,7 +129,7 @@
if (H!=hour_ || m!=minute_ || s!=second_) {
hour_ = H; minute_ = m; second_ = s;
value_ = (H * 60 + m) * 60 + s;
- damage(FL_DAMAGE_CHILD);
+ damage(fltk3::DAMAGE_CHILD);
}
}
@@ -158,7 +158,7 @@
: fltk3::Widget(X, Y, W, H, L) {
box(fltk3::UP_BOX);
selection_color(fl_gray_ramp(5));
- align(FL_ALIGN_BOTTOM);
+ align(fltk3::ALIGN_BOTTOM);
hour_ = 0;
minute_ = 0;
second_ = 0;
Modified: branches/branch-3.0-2011/src/Fl_Color_Chooser.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Color_Chooser.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Color_Chooser.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -155,12 +155,12 @@
set_changed();
if (value_ != pv) {
#ifdef UPDATE_HUE_BOX
- huebox.damage(FL_DAMAGE_SCROLL);
+ huebox.damage(fltk3::DAMAGE_SCROLL);
#endif
- valuebox.damage(FL_DAMAGE_EXPOSE);}
+ valuebox.damage(fltk3::DAMAGE_EXPOSE);}
if (hue_ != ph || saturation_ != ps) {
- huebox.damage(FL_DAMAGE_EXPOSE);
- valuebox.damage(FL_DAMAGE_SCROLL);
+ huebox.damage(fltk3::DAMAGE_EXPOSE);
+ valuebox.damage(fltk3::DAMAGE_SCROLL);
}
return 1;
}
@@ -183,12 +183,12 @@
hue_ = H; saturation_ = S; value_ = V;
if (value_ != pv) {
#ifdef UPDATE_HUE_BOX
- huebox.damage(FL_DAMAGE_SCROLL);
+ huebox.damage(fltk3::DAMAGE_SCROLL);
#endif
- valuebox.damage(FL_DAMAGE_EXPOSE);}
+ valuebox.damage(fltk3::DAMAGE_EXPOSE);}
if (hue_ != ph || saturation_ != ps) {
- huebox.damage(FL_DAMAGE_EXPOSE);
- valuebox.damage(FL_DAMAGE_SCROLL);
+ huebox.damage(fltk3::DAMAGE_EXPOSE);
+ valuebox.damage(fltk3::DAMAGE_SCROLL);
}
hsv2rgb(H,S,V,r_,g_,b_);
set_valuators();
@@ -230,7 +230,7 @@
tohs(Xf, Yf, H, S);
if (fabs(H-ih) < 3*6.0/w()) H = ih;
if (fabs(S-is) < 3*1.0/h()) S = is;
- if (fltk3::event_state(FL_CTRL)) H = ih;
+ if (fltk3::event_state(fltk3::CTRL)) H = ih;
if (c->hsv(H, S, c->value())) c->do_callback();
} return 1;
case FL_FOCUS : /* FALLTHROUGH */
@@ -311,14 +311,14 @@
#ifndef FL_DOXYGEN
void Flcc_HueBox::draw() {
- if (damage()&FL_DAMAGE_ALL) draw_box();
+ if (damage()&fltk3::DAMAGE_ALL) draw_box();
int x1 = x()+fltk3::box_dx(box());
int yy1 = y()+fltk3::box_dy(box());
int w1 = w()-fltk3::box_dw(box());
int h1 = h()-fltk3::box_dh(box());
- if (damage() == FL_DAMAGE_EXPOSE) fl_push_clip(x1+px,yy1+py,6,6);
+ if (damage() == fltk3::DAMAGE_EXPOSE) fl_push_clip(x1+px,yy1+py,6,6);
fl_draw_image(generate_image, this, x1, yy1, w1, h1);
- if (damage() == FL_DAMAGE_EXPOSE) fl_pop_clip();
+ if (damage() == fltk3::DAMAGE_EXPOSE) fl_pop_clip();
Fl_Color_Chooser* c = (Fl_Color_Chooser*)parent();
#ifdef CIRCLE
int X = int(.5*(cos(c->hue()*(M_PI/3.0))*c->saturation()+1) * (w1-6));
@@ -383,16 +383,16 @@
#ifndef FL_DOXYGEN
void Flcc_ValueBox::draw() {
- if (damage()&FL_DAMAGE_ALL) draw_box();
+ if (damage()&fltk3::DAMAGE_ALL) draw_box();
Fl_Color_Chooser* c = (Fl_Color_Chooser*)parent();
c->hsv2rgb(c->hue(),c->saturation(),1.0,tr,tg,tb);
int x1 = x()+fltk3::box_dx(box());
int yy1 = y()+fltk3::box_dy(box());
int w1 = w()-fltk3::box_dw(box());
int h1 = h()-fltk3::box_dh(box());
- if (damage() == FL_DAMAGE_EXPOSE) fl_push_clip(x1,yy1+py,w1,6);
+ if (damage() == fltk3::DAMAGE_EXPOSE) fl_push_clip(x1,yy1+py,w1,6);
fl_draw_image(generate_vimage, this, x1, yy1, w1, h1);
- if (damage() == FL_DAMAGE_EXPOSE) fl_pop_clip();
+ if (damage() == fltk3::DAMAGE_EXPOSE) fl_pop_clip();
int Y = int((1-c->value()) * (h1-6));
if (Y < 0) Y = 0; else if (Y > h1-6) Y = h1-6;
draw_box(fltk3::UP_BOX,x1,yy1+Y,w1,6,fltk3::focus() == this ? FL_FOREGROUND_COLOR : FL_GRAY);
@@ -516,7 +516,7 @@
};
void ColorChip::draw() {
- if (damage()&FL_DAMAGE_ALL) draw_box();
+ if (damage()&fltk3::DAMAGE_ALL) draw_box();
fl_rectf(x()+fltk3::box_dx(box()),
y()+fltk3::box_dy(box()),
w()-fltk3::box_dw(box()),
@@ -529,7 +529,7 @@
v->r = uchar(255*c->r()+.5);
v->g = uchar(255*c->g()+.5);
v->b = uchar(255*c->b()+.5);
- v->damage(FL_DAMAGE_EXPOSE);
+ v->damage(fltk3::DAMAGE_EXPOSE);
}
extern const char* fl_ok;
Modified: branches/branch-3.0-2011/src/Fl_Counter.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Counter.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Counter.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -31,7 +31,7 @@
void Fl_Counter::draw() {
int i; fltk3::Boxtype boxtype[5];
- Fl_Color selcolor;
+ fltk3::Color selcolor;
boxtype[0] = box();
if (boxtype[0] == fltk3::UP_BOX) boxtype[0] = fltk3::DOWN_BOX;
@@ -63,9 +63,9 @@
fl_font(textfont(), textsize());
fl_color(active_r() ? textcolor() : fl_inactive(textcolor()));
char str[128]; format(str);
- fl_draw(str, xx[0], y(), ww[0], h(), FL_ALIGN_CENTER);
+ fl_draw(str, xx[0], y(), ww[0], h(), fltk3::ALIGN_CENTER);
if (fltk3::focus() == this) draw_focus(boxtype[0], xx[0], y(), ww[0], h());
- if (!(damage()&FL_DAMAGE_ALL)) return; // only need to redraw text
+ if (!(damage()&fltk3::DAMAGE_ALL)) return; // only need to redraw text
if (active_r())
selcolor = labelcolor();
@@ -196,13 +196,13 @@
: Fl_Valuator(X, Y, W, H, L) {
box(fltk3::UP_BOX);
selection_color(FL_INACTIVE_COLOR); // was FL_BLUE
- align(FL_ALIGN_BOTTOM);
+ align(fltk3::ALIGN_BOTTOM);
bounds(-1000000.0, 1000000.0);
Fl_Valuator::step(1, 10);
lstep_ = 1.0;
mouseobj = 0;
textfont_ = fltk3::HELVETICA;
- textsize_ = FL_NORMAL_SIZE;
+ textsize_ = fltk3::NORMAL_SIZE;
textcolor_ = FL_FOREGROUND_COLOR;
}
Modified: branches/branch-3.0-2011/src/Fl_Dial.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Dial.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Dial.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -37,7 +37,7 @@
\param[in] X, Y, W, H position and size
*/
void Fl_Dial::draw(int X, int Y, int W, int H) {
- if (damage()&FL_DAMAGE_ALL) draw_box(box(), X, Y, W, H, color());
+ if (damage()&fltk3::DAMAGE_ALL) draw_box(box(), X, Y, W, H, color());
X += fltk3::box_dx(box());
Y += fltk3::box_dy(box());
W -= fltk3::box_dw(box());
@@ -60,7 +60,7 @@
}
return;
}
- if (!(damage()&FL_DAMAGE_ALL)) {
+ if (!(damage()&fltk3::DAMAGE_ALL)) {
if (active_r()) fl_color(color());
else fl_color(fl_inactive(color()));
fl_pie(X+1, Y+1, W-2, H-2, 0, 360);
Modified: branches/branch-3.0-2011/src/Fl_Double_Window.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Double_Window.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Double_Window.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -343,11 +343,11 @@
#endif
#if defined(USE_X11) || defined(WIN32)
myi->other_xid = fl_create_offscreen(w(), h());
- clear_damage(FL_DAMAGE_ALL);
+ clear_damage(fltk3::DAMAGE_ALL);
#elif defined(__APPLE_QUARTZ__)
if (force_doublebuffering_) {
myi->other_xid = fl_create_offscreen(w(), h());
- clear_damage(FL_DAMAGE_ALL);
+ clear_damage(fltk3::DAMAGE_ALL);
}
#else
# error unsupported platform
@@ -358,7 +358,7 @@
if (myi->backbuffer_bad || eraseoverlay) {
// Make sure we do a complete redraw...
if (myi->region) {XDestroyRegion(myi->region); myi->region = 0;}
- clear_damage(FL_DAMAGE_ALL);
+ clear_damage(fltk3::DAMAGE_ALL);
myi->backbuffer_bad = 0;
}
@@ -378,7 +378,7 @@
return;
} else
#endif
- if (damage() & ~FL_DAMAGE_EXPOSE) {
+ if (damage() & ~fltk3::DAMAGE_EXPOSE) {
fl_clip_region(myi->region); myi->region = 0;
#ifdef WIN32
HDC _sgc = fl_gc;
Modified: branches/branch-3.0-2011/src/Fl_File_Browser.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_File_Browser.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_File_Browser.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -269,7 +269,7 @@
{
int i; // Looping var
FL_BLINE *line; // Pointer to line
- Fl_Color c; // Text color
+ fltk3::Color c; // Text color
char *t, // Pointer into text
*ptr, // Pointer into fragment
fragment[10240]; // Fragment of text
@@ -340,7 +340,7 @@
*ptr = '\0';
fl_draw(fragment, X + width, Y, W - width, fl_height(),
- (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_CLIP), 0, 0);
+ (fltk3::Align)(fltk3::ALIGN_LEFT | fltk3::ALIGN_CLIP), 0, 0);
// Point back to the start of the fragment...
ptr = fragment;
@@ -365,7 +365,7 @@
}
fl_draw(fragment, X + width, Y, cW, fl_height(),
- (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_CLIP), 0, 0);
+ (fltk3::Align)(fltk3::ALIGN_LEFT | fltk3::ALIGN_CLIP), 0, 0);
// Advance to the next column...
column ++;
@@ -388,7 +388,7 @@
*ptr = '\0';
fl_draw(fragment, X + width, Y, W - width, fl_height(),
- (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_CLIP), 0, 0);
+ (fltk3::Align)(fltk3::ALIGN_LEFT | fltk3::ALIGN_CLIP), 0, 0);
}
}
Modified: branches/branch-3.0-2011/src/Fl_File_Chooser.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_File_Chooser.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_File_Chooser.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -173,7 +173,7 @@
{ favoritesButton = new Fl_Menu_Button(290, 10, 155, 25, "Favorites");
favoritesButton->down_box(fltk3::BORDER_BOX);
favoritesButton->callback((Fl_Callback*)cb_favoritesButton);
- favoritesButton->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
+ favoritesButton->align(fltk3::Align(fltk3::ALIGN_LEFT|fltk3::ALIGN_INSIDE));
favoritesButton->label(favorites_label);
} // Fl_Menu_Button* favoritesButton
{ Fl_Button* o = newButton = new Fl_Button(455, 10, 25, 25);
@@ -194,7 +194,7 @@
{ previewBox = new fltk3::Box(305, 45, 175, 225, "?");
previewBox->box(fltk3::DOWN_BOX);
previewBox->labelsize(100);
- previewBox->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE));
+ previewBox->align(fltk3::Align(fltk3::ALIGN_CLIP|fltk3::ALIGN_INSIDE));
} // fltk3::Box* previewBox
o->end();
fltk3::Group::current()->resizable(o);
@@ -216,13 +216,13 @@
{ fileName = new Fl_File_Input(115, 300, 365, 35);
fileName->labelfont(1);
fileName->callback((Fl_Callback*)cb_fileName);
- fileName->when(FL_WHEN_ENTER_KEY);
+ fileName->when(fltk3::WHEN_ENTER_KEY);
fltk3::Group::current()->resizable(fileName);
- fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY);
+ fileName->when(fltk3::WHEN_CHANGED | fltk3::WHEN_ENTER_KEY);
} // Fl_File_Input* fileName
{ fltk3::Box* o = new fltk3::Box(10, 310, 105, 25, "Filename:");
o->labelfont(1);
- o->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_RIGHT|fltk3::ALIGN_INSIDE));
o->label(filename_label);
} // fltk3::Box* o
{ fltk3::Group* o = new fltk3::Group(10, 345, 470, 25);
@@ -313,11 +313,11 @@
data_ = d;
}
-void Fl_File_Chooser::color(Fl_Color c) {
+void Fl_File_Chooser::color(fltk3::Color c) {
fileList->color(c);
}
-Fl_Color Fl_File_Chooser::color() {
+fltk3::Color Fl_File_Chooser::color() {
return (fileList->color());
}
@@ -375,9 +375,9 @@
window->hotspot(fileList);
window->show();
fltk3::flush();
-fl_cursor(FL_CURSOR_WAIT);
+fl_cursor(fltk3::CURSOR_WAIT);
rescan_keep_filename();
-fl_cursor(FL_CURSOR_DEFAULT);
+fl_cursor(fltk3::CURSOR_DEFAULT);
fileName->take_focus();
}
@@ -385,11 +385,11 @@
return window->shown();
}
-void Fl_File_Chooser::textcolor(Fl_Color c) {
+void Fl_File_Chooser::textcolor(fltk3::Color c) {
fileList->textcolor(c);
}
-Fl_Color Fl_File_Chooser::textcolor() {
+fltk3::Color Fl_File_Chooser::textcolor() {
return (fileList->textcolor());
}
Modified: branches/branch-3.0-2011/src/Fl_File_Chooser2.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_File_Chooser2.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_File_Chooser2.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -164,10 +164,10 @@
/** \fn Fl_File_Chooser::~Fl_File_Chooser()
Destroys the widget and frees all memory used by it.*/
-/** \fn void Fl_File_Chooser::color(Fl_Color c)
+/** \fn void Fl_File_Chooser::color(fltk3::Color c)
Sets or gets the background color of the Fl_File_Browser list.*/
-/** \fn Fl_Color Fl_File_Chooser::color()
+/** \fn fltk3::Color Fl_File_Chooser::color()
Sets or gets the background color of the Fl_File_Browser list.*/
/** \fn int Fl_File_Chooser::count()
@@ -236,10 +236,10 @@
/** \fn void Fl_File_Chooser::show()
Shows the Fl_File_Chooser window.*/
-/** \fn void Fl_File_Chooser::textcolor(Fl_Color c)
+/** \fn void Fl_File_Chooser::textcolor(fltk3::Color c)
Sets or gets the current Fl_File_Browser text color.*/
-/** \fn Fl_Color Fl_File_Chooser::textcolor()
+/** \fn fltk3::Color Fl_File_Chooser::textcolor()
Sets or gets the current Fl_File_Browser text color.*/
/** \fn void Fl_File_Chooser::textfont(fltk3::Font f)
@@ -1258,13 +1258,13 @@
favoritesButton->clear();
favoritesButton->add("bla");
favoritesButton->clear();
- favoritesButton->add(add_favorites_label, FL_ALT + 'a', 0);
- favoritesButton->add(manage_favorites_label, FL_ALT + 'm', 0, 0, FL_MENU_DIVIDER);
- favoritesButton->add(filesystems_label, FL_ALT + 'f', 0);
+ favoritesButton->add(add_favorites_label, fltk3::ALT + 'a', 0);
+ favoritesButton->add(manage_favorites_label, fltk3::ALT + 'm', 0, 0, FL_MENU_DIVIDER);
+ favoritesButton->add(filesystems_label, fltk3::ALT + 'f', 0);
if ((home = getenv("HOME")) != NULL) {
quote_pathname(menuname, home, sizeof(menuname));
- favoritesButton->add(menuname, FL_ALT + 'h', 0);
+ favoritesButton->add(menuname, fltk3::ALT + 'h', 0);
}
for (i = 0; i < 100; i ++) {
@@ -1274,7 +1274,7 @@
quote_pathname(menuname, pathname, sizeof(menuname));
- if (i < 10) favoritesButton->add(menuname, FL_ALT + '0' + i, 0);
+ if (i < 10) favoritesButton->add(menuname, fltk3::ALT + '0' + i, 0);
else favoritesButton->add(menuname);
}
@@ -1321,13 +1321,13 @@
set = 1;
} else {
// if this file is an image, try to load it
- window->cursor(FL_CURSOR_WAIT);
+ window->cursor(fltk3::CURSOR_WAIT);
fltk3::check();
image = Fl_Shared_Image::get(filename);
if (image) {
- window->cursor(FL_CURSOR_DEFAULT);
+ window->cursor(fltk3::CURSOR_DEFAULT);
fltk3::check();
set = 1;
}
@@ -1359,7 +1359,7 @@
preview_text_[0] = '\0';
}
- window->cursor(FL_CURSOR_DEFAULT);
+ window->cursor(fltk3::CURSOR_DEFAULT);
fltk3::check();
// Scan the buffer for printable UTF8 chars...
@@ -1397,7 +1397,7 @@
if (*ptr || ptr == preview_text_) {
// Non-printable file, just show a big ?...
previewBox->label(filename ? "?" : 0);
- previewBox->align(FL_ALIGN_CLIP);
+ previewBox->align(fltk3::ALIGN_CLIP);
previewBox->labelsize(75);
previewBox->labelfont(fltk3::HELVETICA);
} else {
@@ -1407,8 +1407,8 @@
else if (size > 14) size = 14;
previewBox->label(preview_text_);
- previewBox->align((Fl_Align)(FL_ALIGN_CLIP | FL_ALIGN_INSIDE |
- FL_ALIGN_LEFT | FL_ALIGN_TOP));
+ previewBox->align((fltk3::Align)(fltk3::ALIGN_CLIP | fltk3::ALIGN_INSIDE |
+ fltk3::ALIGN_LEFT | fltk3::ALIGN_TOP));
previewBox->labelsize(size);
previewBox->labelfont(fltk3::COURIER);
}
@@ -1433,11 +1433,11 @@
previewBox->image((Fl_Image *)image);
}
- previewBox->align(FL_ALIGN_CLIP);
+ previewBox->align(fltk3::ALIGN_CLIP);
previewBox->label(0);
} else if (newlabel) {
previewBox->label(newlabel);
- previewBox->align(FL_ALIGN_CLIP);
+ previewBox->align(fltk3::ALIGN_CLIP);
previewBox->labelsize(newlabel[0]=='@'?75:12);
previewBox->labelfont(fltk3::HELVETICA);
}
Modified: branches/branch-3.0-2011/src/Fl_File_Icon.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_File_Icon.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_File_Icon.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -258,10 +258,10 @@
int y, // I - Upper-lefthand Y
int w, // I - Width of bounding box
int h, // I - Height of bounding box
- Fl_Color ic, // I - Icon color...
+ fltk3::Color ic, // I - Icon color...
int active) // I - Active or inactive?
{
- Fl_Color c, // Current color
+ fltk3::Color c, // Current color
oc; // Outline color
short *d, // Pointer to data
*dend; // End of data...
@@ -314,7 +314,7 @@
case OUTLINEPOLYGON :
fl_end_complex_polygon();
- oc = (Fl_Color)((((unsigned short *)prim)[1] << 16) |
+ oc = (fltk3::Color)((((unsigned short *)prim)[1] << 16) |
((unsigned short *)prim)[2]);
if (active)
{
@@ -350,7 +350,7 @@
break;
case COLOR :
- c = (Fl_Color)((((unsigned short *)d)[1] << 16) |
+ c = (fltk3::Color)((((unsigned short *)d)[1] << 16) |
((unsigned short *)d)[2]);
if (c == FL_ICON_COLOR)
@@ -416,7 +416,7 @@
case OUTLINEPOLYGON :
fl_end_polygon();
- oc = (Fl_Color)((((unsigned short *)prim)[1] << 16) |
+ oc = (fltk3::Color)((((unsigned short *)prim)[1] << 16) |
((unsigned short *)prim)[2]);
if (active)
{
@@ -475,7 +475,7 @@
int y, // I - Y position of label
int w, // I - Width of label
int h, // I - Height of label
- Fl_Align a) // I - Label alignment (not used)
+ fltk3::Align a) // I - Label alignment (not used)
{
Fl_File_Icon *icon; // Pointer to icon data
@@ -483,7 +483,7 @@
(void)a;
icon = (Fl_File_Icon *)(o->value);
- if (icon) icon->draw(x, y, w, h, (Fl_Color)(o->color));
+ if (icon) icon->draw(x, y, w, h, (fltk3::Color)(o->color));
}
Modified: branches/branch-3.0-2011/src/Fl_File_Icon2.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_File_Icon2.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_File_Icon2.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -257,11 +257,11 @@
{
// Composite color; compute average...
c = -c;
- add_color(fl_color_average((Fl_Color)(c >> 4),
- (Fl_Color)(c & 15), 0.5f));
+ add_color(fl_color_average((fltk3::Color)(c >> 4),
+ (fltk3::Color)(c & 15), 0.5f));
}
else
- add_color((Fl_Color)c);
+ add_color((fltk3::Color)c);
}
}
else if (strcmp(command, "bgnline") == 0)
@@ -296,7 +296,7 @@
{
// Composite color; compute average...
c = -c;
- cval = fl_color_average((Fl_Color)(c >> 4), (Fl_Color)(c & 15), 0.5f);
+ cval = fl_color_average((fltk3::Color)(c >> 4), (fltk3::Color)(c & 15), 0.5f);
}
else
cval = c;
@@ -358,7 +358,7 @@
if (img->count() == 1) {
int x, y; // X & Y in image
int startx; // Starting X coord
- Fl_Color c, // Current color
+ fltk3::Color c, // Current color
temp; // Temporary color
const uchar *row; // Pointer into image
@@ -366,7 +366,7 @@
// Loop through grayscale or RGB image...
for (y = 0, row = (const uchar *)(*(img->data())); y < img->h(); y ++, row += img->ld())
{
- for (x = 0, startx = 0, c = (Fl_Color)-1;
+ for (x = 0, startx = 0, c = (fltk3::Color)-1;
x < img->w();
x ++, row += img->d())
{
@@ -379,7 +379,7 @@
if (row[1] > 127)
temp = fl_rgb_color(row[0], row[0], row[0]);
else
- temp = (Fl_Color)-1;
+ temp = (fltk3::Color)-1;
break;
case 3 :
temp = fl_rgb_color(row[0], row[1], row[2]);
@@ -388,13 +388,13 @@
if (row[3] > 127)
temp = fl_rgb_color(row[0], row[1], row[2]);
else
- temp = (Fl_Color)-1;
+ temp = (fltk3::Color)-1;
break;
}
if (temp != c)
{
- if (x > startx && c != (Fl_Color)-1)
+ if (x > startx && c != (fltk3::Color)-1)
{
add_color(c);
add(POLYGON);
@@ -410,7 +410,7 @@
}
}
- if (x > startx && c != (Fl_Color)-1)
+ if (x > startx && c != (fltk3::Color)-1)
{
add_color(c);
add(POLYGON);
@@ -431,7 +431,7 @@
*const*ptr; // Pointer into data array
int ncolors, // Number of colors
chars_per_color; // Characters per color
- Fl_Color *colors; // Colors
+ fltk3::Color *colors; // Colors
int red, green, blue; // Red, green, and blue values
int x, y; // X & Y in image
int startx; // Starting X coord
@@ -441,10 +441,10 @@
ptr = img->data();
sscanf(*ptr, "%*d%*d%d%d", &ncolors, &chars_per_color);
- colors = new Fl_Color[1 << (chars_per_color * 8)];
+ colors = new fltk3::Color[1 << (chars_per_color * 8)];
// Read the colormap...
- memset(colors, 0, sizeof(Fl_Color) << (chars_per_color * 8));
+ memset(colors, 0, sizeof(fltk3::Color) << (chars_per_color * 8));
bg = ' ';
ptr ++;
Modified: branches/branch-3.0-2011/src/Fl_File_Input.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_File_Input.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_File_Input.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -46,7 +46,7 @@
// Redraw bit for directory bar...
//
-#define FL_DAMAGE_BAR 0x10
+static const unsigned int DAMAGE_BAR = 0x10;
/**
@@ -73,7 +73,7 @@
X; // Current X position
- if (damage() & (FL_DAMAGE_BAR | FL_DAMAGE_ALL)) {
+ if (damage() & (DAMAGE_BAR | fltk3::DAMAGE_ALL)) {
update_buttons();
}
@@ -148,7 +148,7 @@
int // O - TRUE on success
Fl_File_Input::value(const char *str, // I - New string value
int len) { // I - Length of value
- damage(FL_DAMAGE_BAR);
+ damage(DAMAGE_BAR);
return Fl_Input::value(str,len);
}
@@ -160,7 +160,7 @@
*/
int // O - TRUE on success
Fl_File_Input::value(const char *str) { // I - New string value
- damage(FL_DAMAGE_BAR);
+ damage(DAMAGE_BAR);
return Fl_Input::value(str);
}
@@ -170,11 +170,11 @@
*/
void Fl_File_Input::draw() {
fltk3::Boxtype b = box();
- if (damage() & (FL_DAMAGE_BAR | FL_DAMAGE_ALL)) draw_buttons();
+ if (damage() & (DAMAGE_BAR | fltk3::DAMAGE_ALL)) draw_buttons();
// this flag keeps Fl_Input_::drawtext from drawing a bogus box!
char must_trick_fl_input_ =
- fltk3::focus()!=this && !size() && !(damage()&FL_DAMAGE_ALL);
- if ((damage() & FL_DAMAGE_ALL) || must_trick_fl_input_)
+ fltk3::focus()!=this && !size() && !(damage()&fltk3::DAMAGE_ALL);
+ if ((damage() & fltk3::DAMAGE_ALL) || must_trick_fl_input_)
draw_box(b,x(),y()+DIR_HEIGHT,w(),h()-DIR_HEIGHT,color());
if (!must_trick_fl_input_)
Fl_Input_::drawtext(x()+fltk3::box_dx(b)+3, y()+fltk3::box_dy(b)+DIR_HEIGHT,
@@ -199,9 +199,9 @@
case FL_ENTER :
if (active_r()) {
if (fltk3::event_y() < (y() + DIR_HEIGHT))
- window()->cursor(FL_CURSOR_DEFAULT);
+ window()->cursor(fltk3::CURSOR_DEFAULT);
else
- window()->cursor(FL_CURSOR_INSERT);
+ window()->cursor(fltk3::CURSOR_INSERT);
}
return 1;
@@ -219,7 +219,7 @@
{ Fl_Widget_Tracker wp(this);
if (Fl_Input::handle(event)) {
if (wp.exists())
- damage(FL_DAMAGE_BAR);
+ damage(DAMAGE_BAR);
return 1;
}
}
@@ -286,7 +286,7 @@
// Then do the callbacks, if necessary...
set_changed();
- if (when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE) ) do_callback();
+ if (when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE) ) do_callback();
}
return 1;
Modified: branches/branch-3.0-2011/src/Fl_Gl_Choice.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Gl_Choice.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Gl_Choice.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -65,40 +65,40 @@
blist = alistp;
else {
int n = 0;
- if (m & FL_INDEX) {
+ if (m & fltk3::INDEX) {
list[n++] = GLX_BUFFER_SIZE;
list[n++] = 8; // glut tries many sizes, but this should work...
} else {
list[n++] = GLX_RGBA;
list[n++] = GLX_GREEN_SIZE;
- list[n++] = (m & FL_RGB8) ? 8 : 1;
- if (m & FL_ALPHA) {
+ list[n++] = (m & fltk3::RGB8) ? 8 : 1;
+ if (m & fltk3::ALPHA) {
list[n++] = GLX_ALPHA_SIZE;
- list[n++] = (m & FL_RGB8) ? 8 : 1;
+ list[n++] = (m & fltk3::RGB8) ? 8 : 1;
}
- if (m & FL_ACCUM) {
+ if (m & fltk3::ACCUM) {
list[n++] = GLX_ACCUM_GREEN_SIZE;
list[n++] = 1;
- if (m & FL_ALPHA) {
+ if (m & fltk3::ALPHA) {
list[n++] = GLX_ACCUM_ALPHA_SIZE;
list[n++] = 1;
}
}
}
- if (m & FL_DOUBLE) {
+ if (m & fltk3::DOUBLE) {
list[n++] = GLX_DOUBLEBUFFER;
}
- if (m & FL_DEPTH) {
+ if (m & fltk3::DEPTH) {
list[n++] = GLX_DEPTH_SIZE; list[n++] = 1;
}
- if (m & FL_STENCIL) {
+ if (m & fltk3::STENCIL) {
list[n++] = GLX_STENCIL_SIZE; list[n++] = 1;
}
- if (m & FL_STEREO) {
+ if (m & fltk3::STEREO) {
list[n++] = GLX_STEREO;
}
# if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
- if (m & FL_MULTISAMPLE) {
+ if (m & fltk3::MULTISAMPLE) {
list[n++] = GLX_SAMPLES_SGIS;
list[n++] = 4; // value Glut uses
}
@@ -111,7 +111,7 @@
XVisualInfo *visp = glXChooseVisual(fl_display, fl_screen, (int *)blist);
if (!visp) {
# if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
- if (m&FL_MULTISAMPLE) return find(m&~FL_MULTISAMPLE,0);
+ if (m&fltk3::MULTISAMPLE) return find(m&~fltk3::MULTISAMPLE,0);
# endif
return 0;
}
@@ -125,37 +125,37 @@
blist = alistp;
else {
int n = 0;
- if (m & FL_INDEX) {
+ if (m & fltk3::INDEX) {
list[n++] = AGL_BUFFER_SIZE;
list[n++] = 8; // glut tries many sizes, but this should work...
} else {
list[n++] = AGL_RGBA;
list[n++] = AGL_GREEN_SIZE;
- list[n++] = (m & FL_RGB8) ? 8 : 1;
- if (m & FL_ALPHA) {
+ list[n++] = (m & fltk3::RGB8) ? 8 : 1;
+ if (m & fltk3::ALPHA) {
list[n++] = AGL_ALPHA_SIZE;
- list[n++] = (m & FL_RGB8) ? 8 : 1;
+ list[n++] = (m & fltk3::RGB8) ? 8 : 1;
}
- if (m & FL_ACCUM) {
+ if (m & fltk3::ACCUM) {
list[n++] = AGL_ACCUM_GREEN_SIZE;
list[n++] = 1;
- if (m & FL_ALPHA) {
+ if (m & fltk3::ALPHA) {
list[n++] = AGL_ACCUM_ALPHA_SIZE;
list[n++] = 1;
}
}
}
- if (m & FL_DOUBLE) {
+ if (m & fltk3::DOUBLE) {
list[n++] = AGL_DOUBLEBUFFER;
}
- if (m & FL_DEPTH) {
+ if (m & fltk3::DEPTH) {
list[n++] = AGL_DEPTH_SIZE; list[n++] = 24;
}
- if (m & FL_STENCIL) {
+ if (m & fltk3::STENCIL) {
list[n++] = AGL_STENCIL_SIZE; list[n++] = 1;
}
# ifdef AGL_STEREO
- if (m & FL_STEREO) {
+ if (m & fltk3::STEREO) {
list[n++] = AGL_STEREO;
}
# endif
@@ -178,13 +178,13 @@
if (!DescribePixelFormat(fl_gc, i, sizeof(pfd), &pfd)) break;
// continue if it does not satisfy our requirements:
if (~pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL)) continue;
- if (pfd.iPixelType != ((m&FL_INDEX)?PFD_TYPE_COLORINDEX:PFD_TYPE_RGBA)) continue;
- if ((m & FL_ALPHA) && !pfd.cAlphaBits) continue;
- if ((m & FL_ACCUM) && !pfd.cAccumBits) continue;
- if ((!(m & FL_DOUBLE)) != (!(pfd.dwFlags & PFD_DOUBLEBUFFER))) continue;
- if ((!(m & FL_STEREO)) != (!(pfd.dwFlags & PFD_STEREO))) continue;
- if ((m & FL_DEPTH) && !pfd.cDepthBits) continue;
- if ((m & FL_STENCIL) && !pfd.cStencilBits) continue;
+ if (pfd.iPixelType != ((m&fltk3::INDEX)?PFD_TYPE_COLORINDEX:PFD_TYPE_RGBA)) continue;
+ if ((m & fltk3::ALPHA) && !pfd.cAlphaBits) continue;
+ if ((m & fltk3::ACCUM) && !pfd.cAccumBits) continue;
+ if ((!(m & fltk3::DOUBLE)) != (!(pfd.dwFlags & PFD_DOUBLEBUFFER))) continue;
+ if ((!(m & fltk3::STEREO)) != (!(pfd.dwFlags & PFD_STEREO))) continue;
+ if ((m & fltk3::DEPTH) && !pfd.cDepthBits) continue;
+ if ((m & fltk3::STENCIL) && !pfd.cStencilBits) continue;
// see if better than the one we have already:
if (pixelformat) {
// offering non-generic rendering is better (read: hardware accelleration)
Modified: branches/branch-3.0-2011/src/Fl_Gl_Overlay.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Gl_Overlay.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Gl_Overlay.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -96,7 +96,7 @@
void _Fl_Gl_Overlay::draw() {
if (!valid()) glClearIndex((GLfloat)fl_transparent_pixel);
- if (damage() != FL_DAMAGE_EXPOSE) glClear(GL_COLOR_BUFFER_BIT);
+ if (damage() != fltk3::DAMAGE_EXPOSE) glClear(GL_COLOR_BUFFER_BIT);
Fl_Gl_Window *w = (Fl_Gl_Window *)parent();
uchar save_valid = w->valid();
w->valid(valid());
@@ -164,7 +164,7 @@
int n = (1<<fl_overlay_depth)-1;
// copy all colors except #0 into the overlay palette:
for (int i = 0; i <= n; i++) {
- uchar r,g,b; fltk3::get_color((Fl_Color)i,r,g,b);
+ uchar r,g,b; fltk3::get_color((fltk3::Color)i,r,g,b);
palette[i] = RGB(r,g,b);
}
// always provide black & white in the last 2 pixels:
@@ -204,7 +204,7 @@
((Fl_Gl_Window*)overlay)->redraw();
else
#endif
- damage(FL_DAMAGE_OVERLAY);
+ damage(fltk3::DAMAGE_OVERLAY);
#endif
}
Modified: branches/branch-3.0-2011/src/Fl_Gl_Window.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Gl_Window.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Gl_Window.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -292,7 +292,7 @@
// Draw into hardware overlay planes if they are damaged:
if (overlay && overlay != this
- && (damage()&(FL_DAMAGE_OVERLAY|FL_DAMAGE_EXPOSE) || !save_valid)) {
+ && (damage()&(fltk3::DAMAGE_OVERLAY|fltk3::DAMAGE_EXPOSE) || !save_valid)) {
// SGI 320 messes up overlay with user-defined cursors:
if (Fl_X::i(this)->cursor && Fl_X::i(this)->cursor != fl_default_cursor) {
fixcursor = true; // make it restore cursor later
@@ -309,7 +309,7 @@
valid_f_ = save_valid_f;
wglSwapLayerBuffers(Fl_X::i(this)->private_dc, WGL_SWAP_OVERLAY1);
// if only the overlay was damaged we are done, leave main layer alone:
- if (damage() == FL_DAMAGE_OVERLAY) {
+ if (damage() == fltk3::DAMAGE_OVERLAY) {
if (fixcursor) SetCursor(Fl_X::i(this)->cursor);
return;
}
@@ -340,18 +340,18 @@
if (SWAP_TYPE == NODAMAGE) {
// don't draw if only overlay damage or expose events:
- if ((damage()&~(FL_DAMAGE_OVERLAY|FL_DAMAGE_EXPOSE)) || !save_valid)
+ if ((damage()&~(fltk3::DAMAGE_OVERLAY|fltk3::DAMAGE_EXPOSE)) || !save_valid)
draw();
swap_buffers();
} else if (SWAP_TYPE == COPY) {
// don't draw if only the overlay is damaged:
- if (damage() != FL_DAMAGE_OVERLAY || !save_valid) draw();
+ if (damage() != fltk3::DAMAGE_OVERLAY || !save_valid) draw();
swap_buffers();
} else if (SWAP_TYPE == SWAP){
- damage(FL_DAMAGE_ALL);
+ damage(fltk3::DAMAGE_ALL);
draw();
if (overlay == this) draw_overlay();
swap_buffers();
@@ -361,7 +361,7 @@
// SWAP_TYPE == COPY. Otherwise overlay redraw is way too slow.
if (overlay == this) {
// don't draw if only the overlay is damaged:
- if (damage1_ || damage() != FL_DAMAGE_OVERLAY || !save_valid) draw();
+ if (damage1_ || damage() != fltk3::DAMAGE_OVERLAY || !save_valid) draw();
// we use a separate context for the copy because rasterpos must be 0
// and depth test needs to be off:
static GLContext ortho_context = 0;
Modified: branches/branch-3.0-2011/src/Fl_Group.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Group.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Group.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -133,7 +133,7 @@
case 0: // not an FL_KEYBOARD/FL_SHORTCUT event
break;
case FL_Tab:
- if (!fltk3::event_state(FL_SHIFT)) return FL_Right;
+ if (!fltk3::event_state(fltk3::SHIFT)) return FL_Right;
return FL_Left;
case FL_Right:
return FL_Right;
@@ -365,7 +365,7 @@
fltk3::Group::Group(int X,int Y,int W,int H,const char *l)
: fltk3::Widget(X,Y,W,H,l) {
- align(FL_ALIGN_TOP);
+ align(fltk3::ALIGN_TOP);
children_ = 0;
array_ = 0;
savedfocus_ = 0;
@@ -725,7 +725,7 @@
h() - fltk3::box_dh(box()));
}
- if (damage() & ~FL_DAMAGE_CHILD) { // redraw the entire thing:
+ if (damage() & ~fltk3::DAMAGE_CHILD) { // redraw the entire thing:
for (int i=children_; i--;) {
fltk3::Widget& o = **a++;
draw_child(o);
@@ -739,7 +739,7 @@
}
void fltk3::Group::draw() {
- if (damage() & ~FL_DAMAGE_CHILD) { // redraw the entire thing:
+ if (damage() & ~fltk3::DAMAGE_CHILD) { // redraw the entire thing:
draw_box();
draw_label();
}
@@ -771,7 +771,7 @@
void fltk3::Group::draw_child(fltk3::Widget& widget) const {
if (widget.visible() && widget.type() < FL_WINDOW &&
fl_not_clipped(widget.x(), widget.y(), widget.w(), widget.h())) {
- widget.clear_damage(FL_DAMAGE_ALL);
+ widget.clear_damage(fltk3::DAMAGE_ALL);
widget.draw();
widget.clear_damage();
}
@@ -783,9 +783,9 @@
void fltk3::Group::draw_outside_label(const fltk3::Widget& widget) const {
if (!widget.visible()) return;
// skip any labels that are inside the widget:
- if (!(widget.align()&15) || (widget.align() & FL_ALIGN_INSIDE)) return;
+ if (!(widget.align()&15) || (widget.align() & fltk3::ALIGN_INSIDE)) return;
// invent a box that is outside the widget:
- Fl_Align a = widget.align();
+ fltk3::Align a = widget.align();
int X = widget.x();
int Y = widget.y();
int W = widget.w();
@@ -796,40 +796,40 @@
} else {
wx = x(); wy = y();
}
- if ( (a & 0x0f) == FL_ALIGN_LEFT_TOP ) {
- a = (a &~0x0f ) | FL_ALIGN_TOP_RIGHT;
+ if ( (a & 0x0f) == fltk3::ALIGN_LEFT_TOP ) {
+ a = (a &~0x0f ) | fltk3::ALIGN_TOP_RIGHT;
X = wx;
W = widget.x()-X-3;
- } else if ( (a & 0x0f) == FL_ALIGN_LEFT_BOTTOM ) {
- a = (a &~0x0f ) | FL_ALIGN_BOTTOM_RIGHT;
+ } else if ( (a & 0x0f) == fltk3::ALIGN_LEFT_BOTTOM ) {
+ a = (a &~0x0f ) | fltk3::ALIGN_BOTTOM_RIGHT;
X = wx;
W = widget.x()-X-3;
- } else if ( (a & 0x0f) == FL_ALIGN_RIGHT_TOP ) {
- a = (a &~0x0f ) | FL_ALIGN_TOP_LEFT;
+ } else if ( (a & 0x0f) == fltk3::ALIGN_RIGHT_TOP ) {
+ a = (a &~0x0f ) | fltk3::ALIGN_TOP_LEFT;
X = X+W+3;
W = wx+this->w()-X;
- } else if ( (a & 0x0f) == FL_ALIGN_RIGHT_BOTTOM ) {
- a = (a &~0x0f ) | FL_ALIGN_BOTTOM_LEFT;
+ } else if ( (a & 0x0f) == fltk3::ALIGN_RIGHT_BOTTOM ) {
+ a = (a &~0x0f ) | fltk3::ALIGN_BOTTOM_LEFT;
X = X+W+3;
W = wx+this->w()-X;
- } else if (a & FL_ALIGN_TOP) {
- a ^= (FL_ALIGN_BOTTOM|FL_ALIGN_TOP);
+ } else if (a & fltk3::ALIGN_TOP) {
+ a ^= (fltk3::ALIGN_BOTTOM|fltk3::ALIGN_TOP);
Y = wy;
H = widget.y()-Y;
- } else if (a & FL_ALIGN_BOTTOM) {
- a ^= (FL_ALIGN_BOTTOM|FL_ALIGN_TOP);
+ } else if (a & fltk3::ALIGN_BOTTOM) {
+ a ^= (fltk3::ALIGN_BOTTOM|fltk3::ALIGN_TOP);
Y = Y+H;
H = wy+h()-Y;
- } else if (a & FL_ALIGN_LEFT) {
- a ^= (FL_ALIGN_LEFT|FL_ALIGN_RIGHT);
+ } else if (a & fltk3::ALIGN_LEFT) {
+ a ^= (fltk3::ALIGN_LEFT|fltk3::ALIGN_RIGHT);
X = wx;
W = widget.x()-X-3;
- } else if (a & FL_ALIGN_RIGHT) {
- a ^= (FL_ALIGN_LEFT|FL_ALIGN_RIGHT);
+ } else if (a & fltk3::ALIGN_RIGHT) {
+ a ^= (fltk3::ALIGN_LEFT|fltk3::ALIGN_RIGHT);
X = X+W+3;
W = wx+this->w()-X;
}
- widget.draw_label(X,Y,W,H,(Fl_Align)a);
+ widget.draw_label(X,Y,W,H,(fltk3::Align)a);
}
//
Modified: branches/branch-3.0-2011/src/Fl_Help_Dialog.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Help_Dialog.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Help_Dialog.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -153,13 +153,13 @@
{ back_ = new Fl_Button(10, 10, 25, 25, "@<-");
back_->tooltip("Show the previous help page.");
back_->shortcut(0xff51);
- back_->labelcolor((Fl_Color)2);
+ back_->labelcolor((fltk3::Color)2);
back_->callback((Fl_Callback*)cb_back_);
} // Fl_Button* back_
{ forward_ = new Fl_Button(45, 10, 25, 25, "@->");
forward_->tooltip("Show the next help page.");
forward_->shortcut(0xff53);
- forward_->labelcolor((Fl_Color)2);
+ forward_->labelcolor((fltk3::Color)2);
forward_->callback((Fl_Callback*)cb_forward_);
} // Fl_Button* forward_
{ smaller_ = new Fl_Button(80, 10, 25, 25, "F");
@@ -183,7 +183,7 @@
find_->labelsize(13);
find_->textfont(4);
find_->callback((Fl_Callback*)cb_find_);
- find_->when(FL_WHEN_ENTER_KEY_ALWAYS);
+ find_->when(fltk3::WHEN_ENTER_KEY_ALWAYS);
} // Fl_Input* find_
o->end();
} // fltk3::Group* o
Modified: branches/branch-3.0-2011/src/Fl_Help_View.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Help_View.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Help_View.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -212,7 +212,7 @@
The following functions are also used to draw stuff and should be replaced with
local copies that are much faster when merely counting:
-fl_color(Fl_Color);
+fl_color(fltk3::Color);
fl_rectf(int, int, int, int);
fl_push_clip(int, int, int, int);
fl_xyline(int, int, int);
@@ -236,8 +236,8 @@
int Fl_Help_View::mouse_y = 0;
int Fl_Help_View::current_pos = 0;
Fl_Help_View *Fl_Help_View::current_view = 0L;
-Fl_Color Fl_Help_View::hv_selection_color;
-Fl_Color Fl_Help_View::hv_selection_text_color;
+fltk3::Color Fl_Help_View::hv_selection_color;
+fltk3::Color Fl_Help_View::hv_selection_text_color;
/*
* Limitation: if a word contains &code; notations, we will calculate a wrong length.
@@ -247,7 +247,7 @@
void Fl_Help_View::hv_draw(const char *t, int x, int y)
{
if (selected && current_view==this && current_pos<selection_last && current_pos>=selection_first) {
- Fl_Color c = fl_color();
+ fltk3::Color c = fl_color();
fl_color(hv_selection_color);
int w = (int)fl_width(t);
if (current_pos+(int)strlen(t)<selection_last)
@@ -448,7 +448,7 @@
int line; // Current line
fltk3::Font font;
fltk3::Fontsize fsize; // Current font and size
- Fl_Color fcolor; // current font color
+ fltk3::Color fcolor; // current font color
int head, pre, // Flags for text
needspace; // Do we need whitespace?
fltk3::Boxtype b = box() ? box() : fltk3::DOWN_BOX;
@@ -1075,7 +1075,7 @@
int links; // Links for current line
fltk3::Font font;
fltk3::Fontsize fsize; // Current font and size
- Fl_Color fcolor; // Current font color
+ fltk3::Color fcolor; // Current font color
unsigned char border; // Draw border?
int talign, // Current alignment
newalign, // New alignment
@@ -1087,7 +1087,7 @@
int column, // Current table column number
columns[MAX_COLUMNS];
// Column widths
- Fl_Color tc, rc; // Table/row background color
+ fltk3::Color tc, rc; // Table/row background color
fltk3::Boxtype b = box() ? box() : fltk3::DOWN_BOX;
// Box to draw...
fl_margins margins; // Left margin stack...
@@ -1899,7 +1899,7 @@
int minwidths[MAX_COLUMNS]; // Minimum widths for each column
fltk3::Font font;
fltk3::Fontsize fsize; // Current font and size
- Fl_Color fcolor; // Currrent font color
+ fltk3::Color fcolor; // Currrent font color
// Clear widths...
*table_width = 0;
@@ -2503,9 +2503,9 @@
/** Gets a color attribute. */
-Fl_Color // O - Color value
+fltk3::Color // O - Color value
Fl_Help_View::get_color(const char *n, // I - Color name
- Fl_Color c) // I - Default color value
+ fltk3::Color c) // I - Default color value
{
int i; // Looping var
int rgb, r, g, b; // RGB values
@@ -2964,47 +2964,47 @@
fltk3::Group::handle(event);
return 1;
case FL_LEAVE :
- fl_cursor(FL_CURSOR_DEFAULT);
+ fl_cursor(fltk3::CURSOR_DEFAULT);
break;
case FL_MOVE:
- if (find_link(xx, yy)) fl_cursor(FL_CURSOR_HAND);
- else fl_cursor(FL_CURSOR_DEFAULT);
+ if (find_link(xx, yy)) fl_cursor(fltk3::CURSOR_HAND);
+ else fl_cursor(fltk3::CURSOR_DEFAULT);
return 1;
case FL_PUSH:
if (fltk3::Group::handle(event)) return 1;
linkp = find_link(xx, yy);
if (linkp) {
- fl_cursor(FL_CURSOR_HAND);
+ fl_cursor(fltk3::CURSOR_HAND);
return 1;
}
if (begin_selection()) {
- fl_cursor(FL_CURSOR_INSERT);
+ fl_cursor(fltk3::CURSOR_INSERT);
return 1;
}
- fl_cursor(FL_CURSOR_DEFAULT);
+ fl_cursor(fltk3::CURSOR_DEFAULT);
return 1;
case FL_DRAG:
if (linkp) {
if (fltk3::event_is_click()) {
- fl_cursor(FL_CURSOR_HAND);
+ fl_cursor(fltk3::CURSOR_HAND);
} else {
- fl_cursor(FL_CURSOR_DEFAULT); // should be "FL_CURSOR_CANCEL" if we had it
+ fl_cursor(fltk3::CURSOR_DEFAULT); // should be "fltk3::CURSOR_CANCEL" if we had it
}
return 1;
}
if (current_view==this && selection_push_last) {
if (extend_selection()) redraw();
- fl_cursor(FL_CURSOR_INSERT);
+ fl_cursor(fltk3::CURSOR_INSERT);
return 1;
}
- fl_cursor(FL_CURSOR_DEFAULT);
+ fl_cursor(fltk3::CURSOR_DEFAULT);
return 1;
case FL_RELEASE:
if (linkp) {
if (fltk3::event_is_click()) {
follow_link(linkp);
}
- fl_cursor(FL_CURSOR_DEFAULT);
+ fl_cursor(fltk3::CURSOR_DEFAULT);
linkp = 0;
return 1;
}
Modified: branches/branch-3.0-2011/src/Fl_Image.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Image.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Image.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -96,7 +96,7 @@
color. <I>The original image data is not altered by this
method.</I>
*/
-void Fl_Image::color_average(Fl_Color, float) {
+void Fl_Image::color_average(fltk3::Color, float) {
}
/**
@@ -137,21 +137,21 @@
int ly, // I - Y position
int lw, // I - Width of label
int lh, // I - Height of label
- Fl_Align la) { // I - Alignment
+ fltk3::Align la) { // I - Alignment
Fl_Image *img; // Image pointer
int cx, cy; // Image position
img = (Fl_Image *)(lo->value);
- if (la & FL_ALIGN_LEFT) cx = 0;
- else if (la & FL_ALIGN_RIGHT) cx = img->w() - lw;
+ if (la & fltk3::ALIGN_LEFT) cx = 0;
+ else if (la & fltk3::ALIGN_RIGHT) cx = img->w() - lw;
else cx = (img->w() - lw) / 2;
- if (la & FL_ALIGN_TOP) cy = 0;
- else if (la & FL_ALIGN_BOTTOM) cy = img->h() - lh;
+ if (la & fltk3::ALIGN_TOP) cy = 0;
+ else if (la & fltk3::ALIGN_BOTTOM) cy = img->h() - lh;
else cy = (img->h() - lh) / 2;
- fl_color((Fl_Color)lo->color);
+ fl_color((fltk3::Color)lo->color);
img->draw(lx, ly, lw, lh, cx, cy);
}
@@ -277,7 +277,7 @@
return new_image;
}
-void Fl_RGB_Image::color_average(Fl_Color c, float i) {
+void Fl_RGB_Image::color_average(fltk3::Color c, float i) {
// Don't average an empty image...
if (!w() || !h() || !d() || !array) return;
Modified: branches/branch-3.0-2011/src/Fl_Input.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Input.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Input.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -48,18 +48,18 @@
void Fl_Input::draw() {
if (input_type() == FL_HIDDEN_INPUT) return;
fltk3::Boxtype b = box();
- if (damage() & FL_DAMAGE_ALL) draw_box(b, color());
+ if (damage() & fltk3::DAMAGE_ALL) draw_box(b, color());
Fl_Input_::drawtext(x()+fltk3::box_dx(b), y()+fltk3::box_dy(b),
w()-fltk3::box_dw(b), h()-fltk3::box_dh(b));
}
// kludge so shift causes selection to extend:
int Fl_Input::shift_position(int p) {
- return position(p, fltk3::event_state(FL_SHIFT) ? mark() : p);
+ return position(p, fltk3::event_state(fltk3::SHIFT) ? mark() : p);
}
int Fl_Input::shift_up_down_position(int p) {
- return up_down_position(p, fltk3::event_state(FL_SHIFT));
+ return up_down_position(p, fltk3::event_state(fltk3::SHIFT));
}
// Old text from FLTK 1.1 for reference:
@@ -363,8 +363,8 @@
return 1;
}
- unsigned int mods = fltk3::event_state() & (FL_META|FL_CTRL|FL_ALT);
- unsigned int shift = fltk3::event_state() & FL_SHIFT;
+ unsigned int mods = fltk3::event_state() & (fltk3::META|fltk3::CTRL|fltk3::ALT);
+ unsigned int shift = fltk3::event_state() & fltk3::SHIFT;
unsigned int multiline = (input_type() == FL_MULTILINE_INPUT) ? 1 : 0;
//
// The following lists apps that support these keypresses.
@@ -386,14 +386,14 @@
//
if (mods==0 && shift) return kf_paste(); // Shift-Insert (WP,NP,WOW,GE,KE,OF)
if (mods==0) return kf_insert_toggle(); // Insert (Standard)
- if (mods==FL_CTRL) return kf_copy(); // Ctrl-Insert (WP,NP,WOW,GE,KE,OF)
+ if (mods==fltk3::CTRL) return kf_copy(); // Ctrl-Insert (WP,NP,WOW,GE,KE,OF)
return 0; // ignore other combos, pass to parent
case FL_Delete: {
#ifdef __APPLE__
if (mods==0) return kf_delete_char_right(); // Delete (OSX-HIG,TE,SA,WOX)
- if (mods==FL_CTRL) return kf_delete_char_right(); // Ctrl-Delete (??? TE,!SA,!WOX)
- if (mods==FL_ALT) return kf_delete_word_right(); // Alt-Delete (OSX-HIG,TE,SA)
+ if (mods==fltk3::CTRL) return kf_delete_char_right(); // Ctrl-Delete (??? TE,!SA,!WOX)
+ if (mods==fltk3::ALT) return kf_delete_word_right(); // Alt-Delete (OSX-HIG,TE,SA)
return 0; // ignore other combos, pass to parent
#else
int selected = (position() != mark()) ? 1 : 0;
@@ -402,7 +402,7 @@
if (mods==0 && shift && !selected)
return kf_delete_char_right(); // Shift-Delete no selection (WP,NP,WOW,GE,KE,!OF)
if (mods==0) return kf_delete_char_right(); // Delete (Standard)
- if (mods==FL_CTRL) return kf_delete_word_right(); // Ctrl-Delete (WP,!NP,WOW,GE,KE,!OF)
+ if (mods==fltk3::CTRL) return kf_delete_word_right(); // Ctrl-Delete (WP,!NP,WOW,GE,KE,!OF)
return 0; // ignore other combos, pass to parent
#endif
}
@@ -410,54 +410,54 @@
case FL_Left:
#ifdef __APPLE__
if (mods==0) return kf_move_char_left(); // Left (OSX-HIG)
- if (mods==FL_ALT) return kf_move_word_left(); // Alt-Left (OSX-HIG)
- if (mods==FL_META) return kf_move_sol(); // Meta-Left (OSX-HIG)
- if (mods==FL_CTRL) return kf_move_sol(); // Ctrl-Left (TE/SA)
+ if (mods==fltk3::ALT) return kf_move_word_left(); // Alt-Left (OSX-HIG)
+ if (mods==fltk3::META) return kf_move_sol(); // Meta-Left (OSX-HIG)
+ if (mods==fltk3::CTRL) return kf_move_sol(); // Ctrl-Left (TE/SA)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_move_char_left(); // Left (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_move_word_left(); // Ctrl-Left (WP,NP,WOW,GE,KE,!OF)
- if (mods==FL_META) return kf_move_char_left(); // Meta-Left (WP,NP,?WOW,GE,KE)
+ if (mods==fltk3::CTRL) return kf_move_word_left(); // Ctrl-Left (WP,NP,WOW,GE,KE,!OF)
+ if (mods==fltk3::META) return kf_move_char_left(); // Meta-Left (WP,NP,?WOW,GE,KE)
return 0; // ignore other combos, pass to parent
#endif
case FL_Right:
#ifdef __APPLE__
if (mods==0) return kf_move_char_right(); // Right (OSX-HIG)
- if (mods==FL_ALT) return kf_move_word_right(); // Alt-Right (OSX-HIG)
- if (mods==FL_META) return kf_move_eol(); // Meta-Right (OSX-HIG)
- if (mods==FL_CTRL) return kf_move_eol(); // Ctrl-Right (TE/SA)
+ if (mods==fltk3::ALT) return kf_move_word_right(); // Alt-Right (OSX-HIG)
+ if (mods==fltk3::META) return kf_move_eol(); // Meta-Right (OSX-HIG)
+ if (mods==fltk3::CTRL) return kf_move_eol(); // Ctrl-Right (TE/SA)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_move_char_right(); // Right (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_move_word_right(); // Ctrl-Right (WP,NP,WOW,GE,KE,!OF)
- if (mods==FL_META) return kf_move_char_right(); // Meta-Right (WP,NP,?WOW,GE,KE,!OF)
+ if (mods==fltk3::CTRL) return kf_move_word_right(); // Ctrl-Right (WP,NP,WOW,GE,KE,!OF)
+ if (mods==fltk3::META) return kf_move_char_right(); // Meta-Right (WP,NP,?WOW,GE,KE,!OF)
return 0; // ignore other combos, pass to parent
#endif
case FL_Up:
#ifdef __APPLE__
if (mods==0) return kf_lines_up(1); // Up (OSX-HIG)
- if (mods==FL_CTRL) return kf_page_up(); // Ctrl-Up (TE !HIG)
- if (mods==FL_ALT) return kf_move_up_and_sol(); // Alt-Up (OSX-HIG)
- if (mods==FL_META) return kf_top(); // Meta-Up (OSX-HIG)
+ if (mods==fltk3::CTRL) return kf_page_up(); // Ctrl-Up (TE !HIG)
+ if (mods==fltk3::ALT) return kf_move_up_and_sol(); // Alt-Up (OSX-HIG)
+ if (mods==fltk3::META) return kf_top(); // Meta-Up (OSX-HIG)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_lines_up(1); // Up (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_move_up_and_sol(); // Ctrl-Up (WP,!NP,WOW,GE,!KE,OF)
+ if (mods==fltk3::CTRL) return kf_move_up_and_sol(); // Ctrl-Up (WP,!NP,WOW,GE,!KE,OF)
return 0; // ignore other combos, pass to parent
#endif
case FL_Down:
#ifdef __APPLE__
if (mods==0) return kf_lines_down(1); // Dn (OSX-HIG)
- if (mods==FL_CTRL) return kf_page_down(); // Ctrl-Dn (TE !HIG)
- if (mods==FL_ALT) return kf_move_down_and_eol(); // Alt-Dn (OSX-HIG)
- if (mods==FL_META) return kf_bottom(); // Meta-Dn (OSX-HIG)
+ if (mods==fltk3::CTRL) return kf_page_down(); // Ctrl-Dn (TE !HIG)
+ if (mods==fltk3::ALT) return kf_move_down_and_eol(); // Alt-Dn (OSX-HIG)
+ if (mods==fltk3::META) return kf_bottom(); // Meta-Dn (OSX-HIG)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_lines_down(1); // Dn (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_move_down_and_eol(); // Ctrl-Down (WP,!NP,WOW,GE,!KE,OF)
+ if (mods==fltk3::CTRL) return kf_move_down_and_eol(); // Ctrl-Down (WP,!NP,WOW,GE,!KE,OF)
return 0; // ignore other combos, pass to parent
#endif
@@ -466,13 +466,13 @@
// OSX-HIG recommends Alt increase one semantic unit, Meta next higher..
#ifdef __APPLE__
if (mods==0) return kf_page_up(); // PgUp (OSX-HIG)
- if (mods==FL_ALT) return kf_page_up(); // Alt-PageUp (OSX-HIG)
- if (mods==FL_META) return kf_top(); // Meta-PageUp (OSX-HIG,!TE)
+ if (mods==fltk3::ALT) return kf_page_up(); // Alt-PageUp (OSX-HIG)
+ if (mods==fltk3::META) return kf_top(); // Meta-PageUp (OSX-HIG,!TE)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_page_up(); // PageUp (WP,NP,WOW,GE,KE)
- if (mods==FL_CTRL) return kf_page_up(); // Ctrl-PageUp (!WP,!NP,!WOW,!GE,KE,OF)
- if (mods==FL_ALT) return kf_page_up(); // Alt-PageUp (!WP,!NP,!WOW,!GE,KE,OF)
+ if (mods==fltk3::CTRL) return kf_page_up(); // Ctrl-PageUp (!WP,!NP,!WOW,!GE,KE,OF)
+ if (mods==fltk3::ALT) return kf_page_up(); // Alt-PageUp (!WP,!NP,!WOW,!GE,KE,OF)
return 0; // ignore other combos, pass to parent
#endif
@@ -481,54 +481,54 @@
// Fl_Input has no scroll control, so instead we move the cursor by one page
// OSX-HIG recommends Alt increase one semantic unit, Meta next higher..
if (mods==0) return kf_page_down(); // PgDn (OSX-HIG)
- if (mods==FL_ALT) return kf_page_down(); // Alt-PageDn (OSX-HIG)
- if (mods==FL_META) return kf_bottom(); // Meta-PageDn (OSX-HIG,!TE)
+ if (mods==fltk3::ALT) return kf_page_down(); // Alt-PageDn (OSX-HIG)
+ if (mods==fltk3::META) return kf_bottom(); // Meta-PageDn (OSX-HIG,!TE)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_page_down(); // PageDn (WP,NP,WOW,GE,KE)
- if (mods==FL_CTRL) return kf_page_down(); // Ctrl-PageDn (!WP,!NP,!WOW,!GE,KE,OF)
- if (mods==FL_ALT) return kf_page_down(); // Alt-PageDn (!WP,!NP,!WOW,!GE,KE,OF)
+ if (mods==fltk3::CTRL) return kf_page_down(); // Ctrl-PageDn (!WP,!NP,!WOW,!GE,KE,OF)
+ if (mods==fltk3::ALT) return kf_page_down(); // Alt-PageDn (!WP,!NP,!WOW,!GE,KE,OF)
return 0; // ignore other combos, pass to parent
#endif
case FL_Home:
#ifdef __APPLE__
if (mods==0) return kf_top(); // Home (OSX-HIG)
- if (mods==FL_ALT) return kf_top(); // Alt-Home (???)
+ if (mods==fltk3::ALT) return kf_top(); // Alt-Home (???)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_move_sol(); // Home (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_top(); // Ctrl-Home (WP,NP,WOW,GE,KE,OF)
+ if (mods==fltk3::CTRL) return kf_top(); // Ctrl-Home (WP,NP,WOW,GE,KE,OF)
return 0; // ignore other combos, pass to parent
#endif
case FL_End:
#ifdef __APPLE__
if (mods==0) return kf_bottom(); // End (OSX-HIG)
- if (mods==FL_ALT) return kf_bottom(); // Alt-End (???)
+ if (mods==fltk3::ALT) return kf_bottom(); // Alt-End (???)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_move_eol(); // End (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_bottom(); // Ctrl-End (WP,NP,WOW,GE,KE,OF)
+ if (mods==fltk3::CTRL) return kf_bottom(); // Ctrl-End (WP,NP,WOW,GE,KE,OF)
return 0; // ignore other combos, pass to parent
#endif
case FL_BackSpace:
#ifdef __APPLE__
if (mods==0) return kf_delete_char_left(); // Backspace (OSX-HIG)
- if (mods==FL_CTRL) return kf_delete_char_left(); // Ctrl-Backspace (TE/SA)
- if (mods==FL_ALT) return kf_delete_word_left(); // Alt-Backspace (OSX-HIG)
- if (mods==FL_META) return kf_delete_sol(); // Meta-Backspace (OSX-HIG,!TE)
+ if (mods==fltk3::CTRL) return kf_delete_char_left(); // Ctrl-Backspace (TE/SA)
+ if (mods==fltk3::ALT) return kf_delete_word_left(); // Alt-Backspace (OSX-HIG)
+ if (mods==fltk3::META) return kf_delete_sol(); // Meta-Backspace (OSX-HIG,!TE)
return 0; // ignore other combos, pass to parent
#else
if (mods==0) return kf_delete_char_left(); // Backspace (WP,NP,WOW,GE,KE,OF)
- if (mods==FL_CTRL) return kf_delete_word_left(); // Ctrl-Backspace (WP,!NP,WOW,GE,KE,!OF)
+ if (mods==fltk3::CTRL) return kf_delete_word_left(); // Ctrl-Backspace (WP,!NP,WOW,GE,KE,!OF)
return 0; // ignore other combos, pass to parent
#endif
case FL_Enter:
case FL_KP_Enter:
- if (when() & FL_WHEN_ENTER_KEY) {
+ if (when() & fltk3::WHEN_ENTER_KEY) {
position(size(), 0);
maybe_do_callback();
return 1;
@@ -549,20 +549,20 @@
return 0; // ignore other combos, pass to parent
case 'a':
- if (mods==FL_COMMAND) return kf_select_all(); // Ctrl-A, Mac:Meta-A (Standard/OSX-HIG)
+ if (mods==fltk3::COMMAND) return kf_select_all(); // Ctrl-A, Mac:Meta-A (Standard/OSX-HIG)
break; // handle other combos elsewhere
case 'c':
- if (mods==FL_COMMAND) return kf_copy(); // Ctrl-C, Mac:Meta-C (Standard/OSX-HIG)
+ if (mods==fltk3::COMMAND) return kf_copy(); // Ctrl-C, Mac:Meta-C (Standard/OSX-HIG)
break; // handle other combos elsewhere
case 'v':
- if (mods==FL_COMMAND) return kf_paste(); // Ctrl-V, Mac:Meta-V (Standard/OSX-HIG)
+ if (mods==fltk3::COMMAND) return kf_paste(); // Ctrl-V, Mac:Meta-V (Standard/OSX-HIG)
break; // handle other combos elsewhere
case 'x':
- if (mods==FL_COMMAND) return kf_copy_cut(); // Ctrl-X, Mac:Meta-X (Standard/OSX-HIG)
+ if (mods==fltk3::COMMAND) return kf_copy_cut(); // Ctrl-X, Mac:Meta-X (Standard/OSX-HIG)
break;
case 'z':
- if (mods==FL_COMMAND && !shift) return kf_undo(); // Ctrl-Z, Mac:Meta-Z (Standard/OSX-HIG)
- if (mods==FL_COMMAND && shift) return kf_redo(); // Shift-Ctrl-Z, Mac:Shift-Meta-Z (Standard/OSX-HIG)
+ if (mods==fltk3::COMMAND && !shift) return kf_undo(); // Ctrl-Z, Mac:Meta-Z (Standard/OSX-HIG)
+ if (mods==fltk3::COMMAND && shift) return kf_redo(); // Shift-Ctrl-Z, Mac:Shift-Meta-Z (Standard/OSX-HIG)
break; // handle other combos elsewhere
}
@@ -616,7 +616,7 @@
// widget doesn't destroy the field, replacing it with a tab character.
//
if (fltk3::event_key() == FL_Tab // Tab key?
- && !fltk3::event_state(FL_SHIFT) // no shift?
+ && !fltk3::event_state(fltk3::SHIFT) // no shift?
&& !tab_nav() // with tab navigation disabled?
&& input_type() == FL_MULTILINE_INPUT // with a multiline input?
&& (mark()==0 && position()==size())) { // while entire field selected?
@@ -628,7 +628,7 @@
return (1);
} else {
if (active_r() && window() && this == fltk3::belowmouse())
- window()->cursor(FL_CURSOR_NONE);
+ window()->cursor(fltk3::CURSOR_NONE);
return handle_key();
}
//NOTREACHED
@@ -641,7 +641,7 @@
w()-fltk3::box_dw(b), h()-fltk3::box_dh(b), 0);
newpos = position();
position( oldpos, oldmark );
- if (fltk3::focus()==this && !fltk3::event_state(FL_SHIFT) && input_type()!=FL_SECRET_INPUT &&
+ if (fltk3::focus()==this && !fltk3::event_state(fltk3::SHIFT) && input_type()!=FL_SECRET_INPUT &&
( (newpos >= mark() && newpos < position()) ||
(newpos >= position() && newpos < mark()) ) ) {
// user clicked in the selection, may be trying to drag
@@ -729,7 +729,7 @@
handle(FL_UNFOCUS);
}
#if !(defined(__APPLE__) || defined(WIN32))
- fltk3::first_window()->cursor(FL_CURSOR_MOVE);
+ fltk3::first_window()->cursor(fltk3::CURSOR_MOVE);
#endif
return 1;
Modified: branches/branch-3.0-2011/src/Fl_Input_.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Input_.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Input_.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -163,14 +163,14 @@
\param [in] p start of update range
*/
void Fl_Input_::minimal_update(int p) {
- if (damage() & FL_DAMAGE_ALL) return; // don't waste time if it won't be done
- if (damage() & FL_DAMAGE_EXPOSE) {
+ if (damage() & fltk3::DAMAGE_ALL) return; // don't waste time if it won't be done
+ if (damage() & fltk3::DAMAGE_EXPOSE) {
if (p < mu_p) mu_p = p;
} else {
mu_p = p;
}
- damage(FL_DAMAGE_EXPOSE);
+ damage(fltk3::DAMAGE_EXPOSE);
erase_cursor_only = 0;
}
@@ -206,14 +206,14 @@
/**
Draws the text in the passed bounding box.
- If <tt>damage() & FL_DAMAGE_ALL</tt> is true, this assumes the
+ If <tt>damage() & fltk3::DAMAGE_ALL</tt> is true, this assumes the
area has already been erased to color(). Otherwise it does
minimal update and erases the area itself.
\param X, Y, W, H area that must be redrawn
*/
void Fl_Input_::drawtext(int X, int Y, int W, int H) {
- int do_mu = !(damage()&FL_DAMAGE_ALL);
+ int do_mu = !(damage()&fltk3::DAMAGE_ALL);
if (fltk3::focus()!=this && !size()) {
if (do_mu) { // we have to erase it if cursor was there
@@ -282,7 +282,7 @@
}
fl_push_clip(X, Y, W, H);
- Fl_Color tc = active_r() ? textcolor() : fl_inactive(textcolor());
+ fltk3::Color tc = active_r() ? textcolor() : fl_inactive(textcolor());
p = value();
// visit each line and draw it:
@@ -623,7 +623,7 @@
// new position is a cursor
if (position_ == mark_) {
// old position was just a cursor
- if (fltk3::focus() == this && !(damage()&FL_DAMAGE_EXPOSE)) {
+ if (fltk3::focus() == this && !(damage()&fltk3::DAMAGE_EXPOSE)) {
minimal_update(position_); erase_cursor_only = 1;
}
} else { // old position was a selection
@@ -721,7 +721,7 @@
equal to the other), and then inserts the string \p text
at that point and moves the mark() and
position() to the end of the insertion. Does the callback if
- <tt>when() & FL_WHEN_CHANGED</tt> and there is a change.
+ <tt>when() & fltk3::WHEN_CHANGED</tt> and there is a change.
Set \p b and \p e equal to not delete anything.
Set \p text to \c NULL to not insert anything.
@@ -833,7 +833,7 @@
mark_ = position_ = undoat;
set_changed();
- if (when()&FL_WHEN_CHANGED) do_callback();
+ if (when()&fltk3::WHEN_CHANGED) do_callback();
return 1;
}
@@ -880,7 +880,7 @@
while (b1 > 0 && index(b1)!='\n') b1--;
minimal_update(b1);
set_changed();
- if (when()&FL_WHEN_CHANGED) do_callback();
+ if (when()&fltk3::WHEN_CHANGED) do_callback();
return 1;
}
@@ -905,7 +905,7 @@
Checks the when() field and does a callback if indicated.
*/
void Fl_Input_::maybe_do_callback() {
- if (changed() || (when()&FL_WHEN_NOT_CHANGED)) {
+ if (changed() || (when()&fltk3::WHEN_NOT_CHANGED)) {
do_callback();
}
}
@@ -921,11 +921,11 @@
case FL_ENTER:
case FL_MOVE:
- if (active_r() && window()) window()->cursor(FL_CURSOR_INSERT);
+ if (active_r() && window()) window()->cursor(fltk3::CURSOR_INSERT);
return 1;
case FL_LEAVE:
- if (active_r() && window()) window()->cursor(FL_CURSOR_DEFAULT);
+ if (active_r() && window()) window()->cursor(fltk3::CURSOR_DEFAULT);
return 1;
case FL_FOCUS:
@@ -937,21 +937,21 @@
return 1;
case FL_UNFOCUS:
- if (active_r() && window()) window()->cursor(FL_CURSOR_DEFAULT);
+ if (active_r() && window()) window()->cursor(fltk3::CURSOR_DEFAULT);
if (mark_ == position_) {
- if (!(damage()&FL_DAMAGE_EXPOSE)) {minimal_update(position_); erase_cursor_only = 1;}
+ if (!(damage()&fltk3::DAMAGE_EXPOSE)) {minimal_update(position_); erase_cursor_only = 1;}
} else //if (fltk3::selection_owner() != this)
minimal_update(mark_, position_);
case FL_HIDE:
fl_reset_spot();
- if (!readonly() && (when() & FL_WHEN_RELEASE))
+ if (!readonly() && (when() & fltk3::WHEN_RELEASE))
maybe_do_callback();
return 1;
case FL_PUSH:
- if (active_r() && window()) window()->cursor(FL_CURSOR_INSERT);
+ if (active_r() && window()) window()->cursor(fltk3::CURSOR_INSERT);
- handle_mouse(X, Y, W, H, fltk3::event_state(FL_SHIFT));
+ handle_mouse(X, Y, W, H, fltk3::event_state(fltk3::SHIFT));
if (fltk3::focus() != this) {
fltk3::focus(this);
@@ -1046,8 +1046,8 @@
: fltk3::Widget(X, Y, W, H, l) {
box(fltk3::DOWN_BOX);
color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
- align(FL_ALIGN_LEFT);
- textsize_ = FL_NORMAL_SIZE;
+ align(fltk3::ALIGN_LEFT);
+ textsize_ = fltk3::NORMAL_SIZE;
textfont_ = fltk3::HELVETICA;
textcolor_ = FL_FOREGROUND_COLOR;
cursor_color_ = FL_FOREGROUND_COLOR; // was FL_BLUE
Modified: branches/branch-3.0-2011/src/Fl_Light_Button.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Light_Button.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Light_Button.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -39,7 +39,7 @@
void Fl_Light_Button::draw() {
if (box()) draw_box(this==fltk3::pushed() ? fl_down(box()) : box(), color());
- Fl_Color col = value() ? (active_r() ? selection_color() :
+ fltk3::Color col = value() ? (active_r() ? selection_color() :
fl_inactive(selection_color())) : color();
int W;
int dx, dy;
@@ -166,7 +166,7 @@
: Fl_Button(X, Y, W, H, l) {
type(FL_TOGGLE_BUTTON);
selection_color(FL_YELLOW);
- align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ align(fltk3::ALIGN_LEFT|fltk3::ALIGN_INSIDE);
}
//
Modified: branches/branch-3.0-2011/src/Fl_Menu.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Menu.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Menu.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -132,7 +132,7 @@
l.deimage = 0;
l.type = labeltype_;
l.font = labelsize_ || labelfont_ ? labelfont_ : (m ? m->textfont() : fltk3::HELVETICA);
- l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE;
+ l.size = labelsize_ ? labelsize_ : m ? m->textsize() : fltk3::NORMAL_SIZE;
l.color = FL_FOREGROUND_COLOR; // this makes no difference?
fl_draw_shortcut = 1;
int w = 0; int h = 0;
@@ -151,23 +151,23 @@
l.deimage = 0;
l.type = labeltype_;
l.font = labelsize_ || labelfont_ ? labelfont_ : (m ? m->textfont() : fltk3::HELVETICA);
- l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE;
+ l.size = labelsize_ ? labelsize_ : m ? m->textsize() : fltk3::NORMAL_SIZE;
l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_FOREGROUND_COLOR);
- if (!active()) l.color = fl_inactive((Fl_Color)l.color);
- Fl_Color color = m ? m->color() : FL_GRAY;
+ if (!active()) l.color = fl_inactive((fltk3::Color)l.color);
+ fltk3::Color color = m ? m->color() : FL_GRAY;
if (selected) {
- Fl_Color r = m ? m->selection_color() : FL_SELECTION_COLOR;
+ fltk3::Color r = m ? m->selection_color() : FL_SELECTION_COLOR;
fltk3::Boxtype b = m && m->down_box() ? m->down_box() : fltk3::FLAT_BOX;
if (fl_contrast(r,color)!=r) { // back compatibility boxtypes
if (selected == 2) { // menu title
r = color;
b = m ? m->box() : fltk3::UP_BOX;
} else {
- r = (Fl_Color)(FL_COLOR_CUBE-1); // white
- l.color = fl_contrast((Fl_Color)labelcolor_, r);
+ r = (fltk3::Color)(FL_COLOR_CUBE-1); // white
+ l.color = fl_contrast((fltk3::Color)labelcolor_, r);
}
} else {
- l.color = fl_contrast((Fl_Color)labelcolor_, r);
+ l.color = fl_contrast((fltk3::Color)labelcolor_, r);
}
if (selected == 2) { // menu title
fl_draw_box(b, x, y, w, h, r);
@@ -179,7 +179,7 @@
}
if (flags & (FL_MENU_TOGGLE|FL_MENU_RADIO)) {
- int d = (h - FL_NORMAL_SIZE + 1) / 2;
+ int d = (h - fltk3::NORMAL_SIZE + 1) / 2;
int W = h - 2 * d;
if (flags & FL_MENU_RADIO) {
@@ -256,7 +256,7 @@
}
if (!fl_draw_shortcut) fl_draw_shortcut = 1;
- l.draw(x+3, y, w>6 ? w-6 : 0, h, FL_ALIGN_LEFT);
+ l.draw(x+3, y, w>6 ? w-6 : 0, h, fltk3::ALIGN_LEFT);
fl_draw_shortcut = 0;
}
@@ -453,16 +453,16 @@
fltk3::Font f = m->labelsize_ || m->labelfont_ ? (fltk3::Font)m->labelfont_ :
button ? button->textfont() : fltk3::HELVETICA;
fl_font(f, m->labelsize_ ? m->labelsize_ :
- button ? button->textsize() : FL_NORMAL_SIZE);
+ button ? button->textsize() : fltk3::NORMAL_SIZE);
const char *k, *s = fl_shortcut_label(m->shortcut_, &k);
if (fl_utf_nb_char((const unsigned char*)k, strlen(k))<=4) {
// righ-align the modifiers and left-align the key
char buf[32]; strcpy(buf, s); buf[k-s] = 0;
- fl_draw(buf, xx, yy, ww-shortcutWidth, hh, FL_ALIGN_RIGHT);
- fl_draw( k, xx+ww-shortcutWidth, yy, shortcutWidth, hh, FL_ALIGN_LEFT);
+ fl_draw(buf, xx, yy, ww-shortcutWidth, hh, fltk3::ALIGN_RIGHT);
+ fl_draw( k, xx+ww-shortcutWidth, yy, shortcutWidth, hh, fltk3::ALIGN_LEFT);
} else {
// right-align to the menu
- fl_draw(s, xx, yy, ww-4, hh, FL_ALIGN_RIGHT);
+ fl_draw(s, xx, yy, ww-4, hh, fltk3::ALIGN_RIGHT);
}
}
@@ -479,14 +479,14 @@
}
void menuwindow::draw() {
- if (damage() != FL_DAMAGE_CHILD) { // complete redraw
+ if (damage() != fltk3::DAMAGE_CHILD) { // complete redraw
fl_draw_box(box(), 0, 0, w(), h(), button ? button->color() : color());
if (menu) {
const Fl_Menu_Item* m; int j;
for (m=menu->first(), j=0; m->text; j++, m = m->next()) drawentry(m, j, 0);
}
} else {
- if (damage() & FL_DAMAGE_CHILD && selected!=drawn_selected) { // change selection
+ if (damage() & fltk3::DAMAGE_CHILD && selected!=drawn_selected) { // change selection
drawentry(menu->next(drawn_selected), drawn_selected, 1);
drawentry(menu->next(selected), selected, 1);
}
@@ -495,7 +495,7 @@
}
void menuwindow::set_selected(int n) {
- if (n != selected) {selected = n; damage(FL_DAMAGE_CHILD);}
+ if (n != selected) {selected = n; damage(fltk3::DAMAGE_CHILD);}
}
////////////////////////////////////////////////////////////////
Modified: branches/branch-3.0-2011/src/Fl_Menu_.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Menu_.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Menu_.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -274,8 +274,8 @@
set_changed();
}
value_ = v;
- if (when()&(FL_WHEN_CHANGED|FL_WHEN_RELEASE)) {
- if (changed() || when()&FL_WHEN_NOT_CHANGED) {
+ if (when()&(fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE)) {
+ if (changed() || when()&fltk3::WHEN_NOT_CHANGED) {
if (value_ && value_->callback_) value_->do_callback((fltk3::Widget*)this);
else do_callback();
}
@@ -308,12 +308,12 @@
: fltk3::Widget(X,Y,W,H,l) {
set_flag(SHORTCUT_LABEL);
box(fltk3::UP_BOX);
- when(FL_WHEN_RELEASE_ALWAYS);
+ when(fltk3::WHEN_RELEASE_ALWAYS);
value_ = menu_ = 0;
alloc = 0;
selection_color(FL_SELECTION_COLOR);
textfont(fltk3::HELVETICA);
- textsize(FL_NORMAL_SIZE);
+ textsize(fltk3::NORMAL_SIZE);
textcolor(FL_FOREGROUND_COLOR);
down_box(fltk3::NO_BOX);
}
Modified: branches/branch-3.0-2011/src/Fl_Menu_Button.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Menu_Button.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Menu_Button.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -88,7 +88,7 @@
case FL_KEYBOARD:
if (!box()) return 0;
if (fltk3::event_key() == ' ' &&
- !(fltk3::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) {
+ !(fltk3::event_state() & (fltk3::SHIFT | fltk3::CTRL | fltk3::ALT | fltk3::META))) {
popup();
return 1;
} else return 0;
Modified: branches/branch-3.0-2011/src/Fl_Menu_add.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Menu_add.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Menu_add.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -222,7 +222,7 @@
Adds a new menu item.
\param[in] label The text label for the menu item.
- \param[in] shortcut Optional keyboard shortcut that can be an int or string; (FL_CTRL+'a') or "^a". Default 0 if none.
+ \param[in] shortcut Optional keyboard shortcut that can be an int or string; (fltk3::CTRL+'a') or "^a". Default 0 if none.
\param[in] callback Optional callback invoked when user clicks the item. Default 0 if none.
\param[in] userdata Optional user data passed as an argument to the callback. Default 0 if none.
\param[in] flags Optional flags that control the type of menu item; see below. Default is 0 for none.
@@ -265,13 +265,13 @@
\par
This parameter is optional, and defaults to 0 to indicate no shortcut.
\par
- The shortcut can either be a raw integer value (eg. FL_CTRL+'A')
+ The shortcut can either be a raw integer value (eg. fltk3::CTRL+'A')
or a string (eg. "^c" or "^97").
\par
Raw integer shortcuts can be a combination of keyboard chars (eg. 'A')
- and optional keyboard modifiers (see fltk3::event_state(), e.g. FL_SHIFT, etc).
- In addition, FL_COMMAND can be used to denote FL_META under Mac OS X and
- FL_CTRL under other platforms.
+ and optional keyboard modifiers (see fltk3::event_state(), e.g. fltk3::SHIFT, etc).
+ In addition, fltk3::COMMAND can be used to denote fltk3::META under Mac OS X and
+ fltk3::CTRL under other platforms.
\par
String shortcuts can be specified in one of two ways:
\par
@@ -348,7 +348,7 @@
\param[in] label The text label for the menu item. If the label
is a menu pathname, \p index is ignored, and the pathname
indicates the position of the new item.
- \param[in] shortcut Optional keyboard shortcut. Can be an int (FL_CTRL+'a')
+ \param[in] shortcut Optional keyboard shortcut. Can be an int (fltk3::CTRL+'a')
or a string ("^a"). Default is 0.
\param[in] callback Optional callback invoked when user clicks the item.
Default 0 if none.
Modified: branches/branch-3.0-2011/src/Fl_Multi_Label.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Multi_Label.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Multi_Label.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -34,7 +34,7 @@
#include <fltk3/Fl_Multi_Label.H>
static void multi_labeltype(
- const Fl_Label* o, int x, int y, int w, int h, Fl_Align a)
+ const Fl_Label* o, int x, int y, int w, int h, fltk3::Align a)
{
Fl_Multi_Label* b = (Fl_Multi_Label*)(o->value);
Fl_Label local = *o;
@@ -42,10 +42,10 @@
local.type = b->typea;
int W = w; int H = h; local.measure(W, H);
local.draw(x,y,w,h,a);
- if (a & FL_ALIGN_BOTTOM) h -= H;
- else if (a & FL_ALIGN_TOP) {y += H; h -= H;}
- else if (a & FL_ALIGN_RIGHT) w -= W;
- else if (a & FL_ALIGN_LEFT) {x += W; w -= W;}
+ if (a & fltk3::ALIGN_BOTTOM) h -= H;
+ else if (a & fltk3::ALIGN_TOP) {y += H; h -= H;}
+ else if (a & fltk3::ALIGN_RIGHT) w -= W;
+ else if (a & fltk3::ALIGN_LEFT) {x += W; w -= W;}
else {int d = (h+H)/2; y += d; h -= d;}
local.value = b->labelb;
local.type = b->typeb;
Modified: branches/branch-3.0-2011/src/Fl_Overlay_Window.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Overlay_Window.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Overlay_Window.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -61,8 +61,8 @@
return;
}
#endif
- int erase_overlay = (damage()&FL_DAMAGE_OVERLAY) | (overlay_ == this);
- clear_damage((uchar)(damage()&~FL_DAMAGE_OVERLAY));
+ int erase_overlay = (damage()&fltk3::DAMAGE_OVERLAY) | (overlay_ == this);
+ clear_damage((uchar)(damage()&~fltk3::DAMAGE_OVERLAY));
Fl_Double_Window::flush(erase_overlay);
if (overlay_ == this) draw_overlay();
}
@@ -92,8 +92,8 @@
*/
void Fl_Overlay_Window::redraw_overlay() {
overlay_ = this;
- clear_damage((uchar)(damage()|FL_DAMAGE_OVERLAY));
- fltk3::damage(FL_DAMAGE_CHILD);
+ clear_damage((uchar)(damage()|fltk3::DAMAGE_OVERLAY));
+ fltk3::damage(fltk3::DAMAGE_CHILD);
}
#else
@@ -141,7 +141,7 @@
fl_overlay = 1;
Fl_Overlay_Window *w = (Fl_Overlay_Window *)parent();
Fl_X *myi = Fl_X::i(this);
- if (damage() != FL_DAMAGE_EXPOSE) XClearWindow(fl_display, fl_xid(this));
+ if (damage() != fltk3::DAMAGE_EXPOSE) XClearWindow(fl_display, fl_xid(this));
fl_clip_region(myi->region); myi->region = 0;
w->draw_overlay();
fl_overlay = 0;
@@ -160,8 +160,8 @@
}
if (shown()) {
if (overlay_ == this) {
- clear_damage(damage()|FL_DAMAGE_OVERLAY);
- fltk3::damage(FL_DAMAGE_CHILD);
+ clear_damage(damage()|fltk3::DAMAGE_OVERLAY);
+ fltk3::damage(fltk3::DAMAGE_CHILD);
} else if (!overlay_->shown())
overlay_->show();
else
Modified: branches/branch-3.0-2011/src/Fl_Pack.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Pack.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Pack.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -103,7 +103,7 @@
H = th - rh;
}
if (spacing_ && current_position>maximum_position && box() &&
- (X != o->x() || Y != o->y() || d&FL_DAMAGE_ALL)) {
+ (X != o->x() || Y != o->y() || d&fltk3::DAMAGE_ALL)) {
fl_color(color());
if (horizontal())
fl_rectf(maximum_position, ty, spacing_, th);
@@ -112,9 +112,9 @@
}
if (X != o->x() || Y != o->y() || W != o->w() || H != o->h()) {
o->resize(X,Y,W,H);
- o->clear_damage(FL_DAMAGE_ALL);
+ o->clear_damage(fltk3::DAMAGE_ALL);
}
- if (d&FL_DAMAGE_ALL) {
+ if (d&fltk3::DAMAGE_ALL) {
draw_child(*o);
draw_outside_label(*o);
} else update_child(*o);
@@ -144,9 +144,9 @@
th += fltk3::box_dh(box()); if (th <= 0) th = 1;
if (tw != w() || th != h()) {
fltk3::Widget::resize(x(),y(),tw,th);
- d = FL_DAMAGE_ALL;
+ d = fltk3::DAMAGE_ALL;
}
- if (d&FL_DAMAGE_ALL) {
+ if (d&fltk3::DAMAGE_ALL) {
draw_box();
draw_label();
}
Modified: branches/branch-3.0-2011/src/Fl_Paged_Device.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Paged_Device.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Paged_Device.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -51,7 +51,7 @@
int old_x, old_y, new_x, new_y, is_window;
if ( ! widget->visible() ) return;
is_window = (widget->as_window() != NULL);
- widget->damage(FL_DAMAGE_ALL);
+ widget->damage(fltk3::DAMAGE_ALL);
// set origin to the desired top-left position of the widget
origin(&old_x, &old_y);
new_x = old_x + delta_x;
Modified: branches/branch-3.0-2011/src/Fl_Pixmap.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Pixmap.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Pixmap.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -410,7 +410,7 @@
return new_image;
}
-void Fl_Pixmap::color_average(Fl_Color c, float i) {
+void Fl_Pixmap::color_average(fltk3::Color c, float i) {
// Delete any existing pixmap/mask objects...
uncache();
Modified: branches/branch-3.0-2011/src/Fl_Positioner.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Positioner.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Positioner.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -108,9 +108,9 @@
set_changed();
redraw();
} }
- if (!(when() & FL_WHEN_CHANGED ||
- (when() & FL_WHEN_RELEASE && event == FL_RELEASE))) return 1;
- if (changed() || when()&FL_WHEN_NOT_CHANGED) {
+ if (!(when() & fltk3::WHEN_CHANGED ||
+ (when() & fltk3::WHEN_RELEASE && event == FL_RELEASE))) return 1;
+ if (changed() || when()&fltk3::WHEN_NOT_CHANGED) {
if (event == FL_RELEASE) clear_changed();
do_callback();
}
@@ -132,8 +132,8 @@
: fltk3::Widget(X, Y, W, H, l) {
box(fltk3::DOWN_BOX);
selection_color(FL_RED);
- align(FL_ALIGN_BOTTOM);
- when(FL_WHEN_CHANGED);
+ align(fltk3::ALIGN_BOTTOM);
+ when(fltk3::WHEN_CHANGED);
xmin = ymin = 0;
xmax = ymax = 1;
xvalue_ = yvalue_ = .5;
Modified: branches/branch-3.0-2011/src/Fl_PostScript.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_PostScript.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_PostScript.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -935,7 +935,7 @@
font_ = f; size_ = s;
}
-void Fl_PostScript_Graphics_Driver::color(Fl_Color c) {
+void Fl_PostScript_Graphics_Driver::color(fltk3::Color c) {
fltk3::get_color(c, cr_, cg_, cb_);
color(cr_, cg_, cb_);
}
@@ -964,7 +964,7 @@
// computes the mask for the RGB image img of all pixels with color != bg
-static uchar *calc_mask(uchar *img, int w, int h, Fl_Color bg)
+static uchar *calc_mask(uchar *img, int w, int h, fltk3::Color bg)
{
uchar red, green, blue, r, g, b;
uchar bit, byte, *q;
@@ -1001,8 +1001,8 @@
w = (int)(w *scale + 0.5);
int h = fl_height();
// create an offscreen image of the string
- Fl_Color text_color = fl_color();
- Fl_Color bg_color = fl_contrast(FL_WHITE, text_color);
+ fltk3::Color text_color = fl_color();
+ fltk3::Color bg_color = fl_contrast(FL_WHITE, text_color);
Fl_Offscreen off = fl_create_offscreen(w+2, (int)(h+3*scale) );
fl_begin_offscreen(off);
fl_color(bg_color);
Modified: branches/branch-3.0-2011/src/Fl_Progress.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Progress.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Progress.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -75,7 +75,7 @@
// Draw the box and label...
if (progress > 0) {
- Fl_Color c = labelcolor();
+ fltk3::Color c = labelcolor();
labelcolor(fl_contrast(labelcolor(), selection_color()));
fl_push_clip(x(), y(), progress + bx, h());
@@ -109,7 +109,7 @@
*/
Fl_Progress::Fl_Progress(int X, int Y, int W, int H, const char* L)
: fltk3::Widget(X, Y, W, H, L) {
- align(FL_ALIGN_INSIDE);
+ align(fltk3::ALIGN_INSIDE);
box(fltk3::DOWN_BOX);
color(FL_BACKGROUND2_COLOR, FL_YELLOW);
minimum(0.0f);
Modified: branches/branch-3.0-2011/src/Fl_Roller.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Roller.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Roller.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -87,7 +87,7 @@
}
void Fl_Roller::draw() {
- if (damage()&FL_DAMAGE_ALL) draw_box();
+ if (damage()&fltk3::DAMAGE_ALL) draw_box();
int X = x()+fltk3::box_dx(box());
int Y = y()+fltk3::box_dy(box());
int W = w()-fltk3::box_dw(box())-1;
@@ -101,7 +101,7 @@
int h1 = W/4+1; // distance from end that shading starts
fl_color(color()); fl_rectf(X+h1,Y,W-2*h1,H);
for (int i=0; h1; i++) {
- fl_color((Fl_Color)(FL_GRAY-i-1));
+ fl_color((fltk3::Color)(FL_GRAY-i-1));
int h2 = FL_GRAY-i-1 > FL_DARK3 ? 2*h1/3+1 : 0;
fl_rectf(X+h2,Y,h1-h2,H);
fl_rectf(X+W-h1,Y,h1-h2,H);
@@ -135,7 +135,7 @@
int h1 = H/4+1; // distance from end that shading starts
fl_color(color()); fl_rectf(X,Y+h1,W,H-2*h1);
for (int i=0; h1; i++) {
- fl_color((Fl_Color)(FL_GRAY-i-1));
+ fl_color((fltk3::Color)(FL_GRAY-i-1));
int h2 = FL_GRAY-i-1 > FL_DARK3 ? 2*h1/3+1 : 0;
fl_rectf(X,Y+h2,W,h1-h2);
fl_rectf(X,Y+H-h1,W,h1-h2);
Modified: branches/branch-3.0-2011/src/Fl_Scroll.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Scroll.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Scroll.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -152,20 +152,20 @@
if ((type() & ALWAYS_ON) || si.child_t < Y || si.child_b > Y+H) {
si.vneeded = 1;
W -= si.scrollsize;
- if (scrollbar.align() & FL_ALIGN_LEFT) X += si.scrollsize;
+ if (scrollbar.align() & fltk3::ALIGN_LEFT) X += si.scrollsize;
}
}
if (type() & HORIZONTAL) {
if ((type() & ALWAYS_ON) || si.child_l < X || si.child_r > X+W) {
si.hneeded = 1;
H -= si.scrollsize;
- if (scrollbar.align() & FL_ALIGN_TOP) Y += si.scrollsize;
+ if (scrollbar.align() & fltk3::ALIGN_TOP) Y += si.scrollsize;
// recheck vertical since we added a horizontal scrollbar
if (!si.vneeded && (type() & VERTICAL)) {
if ((type() & ALWAYS_ON) || si.child_t < Y || si.child_b > Y+H) {
si.vneeded = 1;
W -= si.scrollsize;
- if (scrollbar.align() & FL_ALIGN_LEFT) X += si.scrollsize;
+ if (scrollbar.align() & fltk3::ALIGN_LEFT) X += si.scrollsize;
}
}
}
@@ -178,14 +178,14 @@
// calculate hor scrollbar position
si.hscroll_x = si.innerchild_x;
- si.hscroll_y = (scrollbar.align() & FL_ALIGN_TOP)
+ si.hscroll_y = (scrollbar.align() & fltk3::ALIGN_TOP)
? si.innerbox_y
: si.innerbox_y + si.innerbox_h - si.scrollsize;
si.hscroll_w = si.innerchild_w;
si.hscroll_h = si.scrollsize;
// calculate ver scrollbar position
- si.vscroll_x = (scrollbar.align() & FL_ALIGN_LEFT)
+ si.vscroll_x = (scrollbar.align() & fltk3::ALIGN_LEFT)
? si.innerbox_x
: si.innerbox_x + si.innerbox_w - si.scrollsize;
si.vscroll_y = si.innerchild_y;
@@ -235,11 +235,11 @@
H = h()-fltk3::box_dh(box());
if (scrollbar.visible()) {
W -= scrollbar.w();
- if (scrollbar.align() & FL_ALIGN_LEFT) X += scrollbar.w();
+ if (scrollbar.align() & fltk3::ALIGN_LEFT) X += scrollbar.w();
}
if (hscrollbar.visible()) {
H -= hscrollbar.h();
- if (scrollbar.align() & FL_ALIGN_TOP) Y += hscrollbar.h();
+ if (scrollbar.align() & fltk3::ALIGN_TOP) Y += hscrollbar.h();
}
}
@@ -249,11 +249,11 @@
uchar d = damage();
- if (d & FL_DAMAGE_ALL) { // full redraw
+ if (d & fltk3::DAMAGE_ALL) { // full redraw
draw_box(box(),x(),y(),w(),h(),color());
draw_clip(this, X, Y, W, H);
} else {
- if (d & FL_DAMAGE_SCROLL) {
+ if (d & fltk3::DAMAGE_SCROLL) {
// scroll the contents:
fl_scroll(X, Y, W, H, oldx-xposition_, oldy-yposition_, draw_clip, this);
@@ -275,7 +275,7 @@
if (T > Y) draw_clip(this, X, Y, W, T - Y);
if (B < (Y + H)) draw_clip(this, X, B, W, Y + H - B);
}
- if (d & FL_DAMAGE_CHILD) { // draw damaged children
+ if (d & fltk3::DAMAGE_CHILD) { // draw damaged children
fl_push_clip(X, Y, W, H);
fltk3::Widget*const* a = array();
for (int i=children()-2; i--;) update_child(**a++);
@@ -291,25 +291,25 @@
// Now that we know what's needed, make it so.
if (si.vneeded && !scrollbar.visible()) {
scrollbar.set_visible();
- d = FL_DAMAGE_ALL;
+ d = fltk3::DAMAGE_ALL;
}
else if (!si.vneeded && scrollbar.visible()) {
scrollbar.clear_visible();
draw_clip(this, si.vscroll_x, si.vscroll_y, si.vscroll_w, si.vscroll_h);
- d = FL_DAMAGE_ALL;
+ d = fltk3::DAMAGE_ALL;
}
if (si.hneeded && !hscrollbar.visible()) {
hscrollbar.set_visible();
- d = FL_DAMAGE_ALL;
+ d = fltk3::DAMAGE_ALL;
}
else if (!si.hneeded && hscrollbar.visible()) {
hscrollbar.clear_visible();
draw_clip(this, si.hscroll_x, si.hscroll_y, si.hscroll_w, si.hscroll_h);
- d = FL_DAMAGE_ALL;
+ d = fltk3::DAMAGE_ALL;
}
else if ( hscrollbar.h() != si.scrollsize || scrollbar.w() != si.scrollsize ) {
// scrollsize changed
- d = FL_DAMAGE_ALL;
+ d = fltk3::DAMAGE_ALL;
}
scrollbar.resize(si.vscroll_x, si.vscroll_y, si.vscroll_w, si.vscroll_h);
@@ -322,7 +322,7 @@
}
// draw the scrollbars:
- if (d & FL_DAMAGE_ALL) {
+ if (d & fltk3::DAMAGE_ALL) {
draw_child(scrollbar);
draw_child(hscrollbar);
if (scrollbar.visible() && hscrollbar.visible()) {
@@ -349,8 +349,8 @@
}
if (dw==0 && dh==0) {
char pad = ( scrollbar.visible() && hscrollbar.visible() );
- char al = ( (scrollbar.align() & FL_ALIGN_LEFT) != 0 );
- char at = ( (scrollbar.align() & FL_ALIGN_TOP) !=0 );
+ char al = ( (scrollbar.align() & fltk3::ALIGN_LEFT) != 0 );
+ char at = ( (scrollbar.align() & fltk3::ALIGN_TOP) !=0 );
scrollbar.position(al?X:X+W-scrollbar.w(), (at&&pad)?Y+hscrollbar.h():Y);
hscrollbar.position((al&&pad)?X+scrollbar.w():X, at?Y:Y+H-hscrollbar.h());
} else {
@@ -372,8 +372,8 @@
if (o == &hscrollbar || o == &scrollbar) continue;
o->position(o->x()+dx, o->y()+dy);
}
- if (parent() == (fltk3::Group *)window() && fltk3::scheme_bg_) damage(FL_DAMAGE_ALL);
- else damage(FL_DAMAGE_SCROLL);
+ if (parent() == (fltk3::Group *)window() && fltk3::scheme_bg_) damage(fltk3::DAMAGE_ALL);
+ else damage(fltk3::DAMAGE_SCROLL);
}
void Fl_Scroll::hscrollbar_cb(fltk3::Widget* o, void*) {
Modified: branches/branch-3.0-2011/src/Fl_Scrollbar.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Scrollbar.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Scrollbar.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -118,7 +118,7 @@
case FL_LEAVE:
return 1;
case FL_RELEASE:
- damage(FL_DAMAGE_ALL);
+ damage(fltk3::DAMAGE_ALL);
if (pushed_) {
fltk3::remove_timeout(timeout_cb, this);
pushed_ = 0;
@@ -132,7 +132,7 @@
handle_push();
fltk3::add_timeout(INITIALREPEAT, timeout_cb, this);
increment_cb();
- damage(FL_DAMAGE_ALL);
+ damage(fltk3::DAMAGE_ALL);
return 1;
}
return Fl_Slider::handle(event, X,Y,W,H);
@@ -207,7 +207,7 @@
}
void Fl_Scrollbar::draw() {
- if (damage()&FL_DAMAGE_ALL) draw_box();
+ if (damage()&fltk3::DAMAGE_ALL) draw_box();
int X = x()+fltk3::box_dx(box());
int Y = y()+fltk3::box_dy(box());
int W = w()-fltk3::box_dw(box());
@@ -215,7 +215,7 @@
if (horizontal()) {
if (W < 3*H) {Fl_Slider::draw(X,Y,W,H); return;}
Fl_Slider::draw(X+H,Y,W-2*H,H);
- if (damage()&FL_DAMAGE_ALL) {
+ if (damage()&fltk3::DAMAGE_ALL) {
draw_box((pushed_==1) ? fl_down(slider()) : slider(),
X, Y, H, H, selection_color());
draw_box((pushed_==2) ? fl_down(slider()) : slider(),
@@ -240,7 +240,7 @@
} else { // vertical
if (H < 3*W) {Fl_Slider::draw(X,Y,W,H); return;}
Fl_Slider::draw(X,Y+W,W,H-2*W);
- if (damage()&FL_DAMAGE_ALL) {
+ if (damage()&fltk3::DAMAGE_ALL) {
draw_box((pushed_==1) ? fl_down(slider()) : slider(),
X, Y, W, W, selection_color());
draw_box((pushed_==2) ? fl_down(slider()) : slider(),
Modified: branches/branch-3.0-2011/src/Fl_Shared_Image.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Shared_Image.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Shared_Image.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -301,7 +301,7 @@
//
void
-Fl_Shared_Image::color_average(Fl_Color c, // I - Color to blend with
+Fl_Shared_Image::color_average(fltk3::Color c, // I - Color to blend with
float i) { // I - Blend fraction
if (!image_) return;
Modified: branches/branch-3.0-2011/src/Fl_Slider.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Slider.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Slider.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -63,7 +63,7 @@
if (v > 1) v = 1;
if (slider_size_ != float(v)) {
slider_size_ = float(v);
- damage(FL_DAMAGE_EXPOSE);
+ damage(fltk3::DAMAGE_EXPOSE);
}
}
@@ -74,7 +74,7 @@
void Fl_Slider::bounds(double a, double b) {
if (minimum() != a || maximum() != b) {
Fl_Valuator::bounds(a, b);
- damage(FL_DAMAGE_EXPOSE);
+ damage(fltk3::DAMAGE_EXPOSE);
}
}
@@ -106,7 +106,7 @@
draw_box();
fl_pop_clip();
- Fl_Color black = active_r() ? FL_FOREGROUND_COLOR : FL_INACTIVE_COLOR;
+ fltk3::Color black = active_r() ? FL_FOREGROUND_COLOR : FL_INACTIVE_COLOR;
if (type() == FL_VERT_NICE_SLIDER) {
draw_box(fltk3::THIN_DOWN_BOX, X+W/2-2, Y, 4, H, black);
} else if (type() == FL_HOR_NICE_SLIDER) {
@@ -214,7 +214,7 @@
}
void Fl_Slider::draw() {
- if (damage()&FL_DAMAGE_ALL) draw_box();
+ if (damage()&fltk3::DAMAGE_ALL) draw_box();
draw(x()+fltk3::box_dx(box()),
y()+fltk3::box_dy(box()),
w()-fltk3::box_dw(box()),
Modified: branches/branch-3.0-2011/src/Fl_Table.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Table.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Table.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -124,7 +124,7 @@
rightcol = 0;
toprow_scrollpos = -1;
leftcol_scrollpos = -1;
- _last_cursor = FL_CURSOR_DEFAULT;
+ _last_cursor = fltk3::CURSOR_DEFAULT;
_resizing_col = -1;
_resizing_row = -1;
_dragging_x = -1;
@@ -186,7 +186,7 @@
redraw();
}
// ROW RESIZE CALLBACK
- if ( fltk3::Widget::callback() && when() & FL_WHEN_CHANGED ) {
+ if ( fltk3::Widget::callback() && when() & fltk3::WHEN_CHANGED ) {
do_callback(CONTEXT_RC_RESIZE, row, 0);
}
}
@@ -212,7 +212,7 @@
redraw();
}
// COLUMN RESIZE CALLBACK
- if ( fltk3::Widget::callback() && when() & FL_WHEN_CHANGED ) {
+ if ( fltk3::Widget::callback() && when() & fltk3::WHEN_CHANGED ) {
do_callback(CONTEXT_RC_RESIZE, 0, col);
}
}
@@ -632,7 +632,7 @@
}
// Change mouse cursor to different type
-void Fl_Table::change_cursor(Fl_Cursor newcursor) {
+void Fl_Table::change_cursor(fltk3::Cursor newcursor) {
if ( newcursor != _last_cursor ) {
fl_cursor(newcursor, FL_BLACK, FL_WHITE);
_last_cursor = newcursor;
@@ -678,7 +678,7 @@
damage_zone(current_row, current_col, select_row, select_col, R, C);
select_row = R;
select_col = C;
- if (!fltk3::event_state(FL_SHIFT)) {
+ if (!fltk3::event_state(fltk3::SHIFT)) {
current_row = R;
current_col = C;
}
@@ -819,7 +819,7 @@
//
// Let user drag even /outside/ the row/col widget.
// Don't allow column width smaller than 1.
- // Continue to show FL_CURSOR_WE at all times during drag.
+ // Continue to show fltk3::CURSOR_WE at all times during drag.
//
int offset = _dragging_x - fltk3::event_x();
int new_w = col_width(_resizing_col) - offset;
@@ -828,9 +828,9 @@
_dragging_x = fltk3::event_x();
table_resized();
redraw();
- change_cursor(FL_CURSOR_WE);
+ change_cursor(fltk3::CURSOR_WE);
ret = 1;
- if ( fltk3::Widget::callback() && when() & FL_WHEN_CHANGED ) {
+ if ( fltk3::Widget::callback() && when() & fltk3::WHEN_CHANGED ) {
do_callback(CONTEXT_RC_RESIZE, R, C);
}
}
@@ -839,7 +839,7 @@
//
// Let user drag even /outside/ the row/col widget.
// Don't allow row width smaller than 1.
- // Continue to show FL_CURSOR_NS at all times during drag.
+ // Continue to show fltk3::CURSOR_NS at all times during drag.
//
int offset = _dragging_y - fltk3::event_y();
int new_h = row_height(_resizing_row) - offset;
@@ -848,9 +848,9 @@
_dragging_y = fltk3::event_y();
table_resized();
redraw();
- change_cursor(FL_CURSOR_NS);
+ change_cursor(fltk3::CURSOR_NS);
ret = 1;
- if ( fltk3::Widget::callback() && when() & FL_WHEN_CHANGED ) {
+ if ( fltk3::Widget::callback() && when() & fltk3::WHEN_CHANGED ) {
do_callback(CONTEXT_RC_RESIZE, R, C);
}
} else {
@@ -904,7 +904,7 @@
if ( _resizing_col == -1 && // not resizing a column
_resizing_row == -1 && // not resizing a row
fltk3::Widget::callback() && // callback defined
- when() & FL_WHEN_RELEASE && // on button release
+ when() & fltk3::WHEN_RELEASE && // on button release
_last_row == R ) { // release on same row PUSHed?
// Need this for eg. left clicking on a cell to select it
do_callback(context, R, C);
@@ -915,7 +915,7 @@
break;
}
if ( fltk3::event_button() == 1 ) {
- change_cursor(FL_CURSOR_DEFAULT);
+ change_cursor(fltk3::CURSOR_DEFAULT);
_resizing_col = -1;
_resizing_row = -1;
ret = 1;
@@ -925,13 +925,13 @@
case FL_MOVE:
if ( context == CONTEXT_COL_HEADER && // in column header?
resizeflag ) { // resize + near boundary?
- change_cursor(FL_CURSOR_WE); // show resize cursor
+ change_cursor(fltk3::CURSOR_WE); // show resize cursor
}
else if ( context == CONTEXT_ROW_HEADER && // in row header?
resizeflag ) { // resize + near boundary?
- change_cursor(FL_CURSOR_NS); // show resize cursor
+ change_cursor(fltk3::CURSOR_NS); // show resize cursor
} else {
- change_cursor(FL_CURSOR_DEFAULT); // normal cursor
+ change_cursor(fltk3::CURSOR_DEFAULT); // normal cursor
}
ret = 1;
break;
@@ -947,7 +947,7 @@
}
if ( event == FL_LEAVE ) {
_stop_auto_drag();
- change_cursor(FL_CURSOR_DEFAULT);
+ change_cursor(fltk3::CURSOR_DEFAULT);
}
break;
@@ -990,7 +990,7 @@
ret = move_cursor(1, 0);
break;
case FL_Tab:
- if ( fltk3::event_state() & FL_SHIFT ) {
+ if ( fltk3::event_state() & fltk3::SHIFT ) {
ret = move_cursor(0, -1); // shift-tab -> left
} else {
ret = move_cursor(0, 1); // tab -> right
@@ -1001,10 +1001,10 @@
do_callback(CONTEXT_TABLE, -1, -1);
take_focus();
}
- //if (!ret && fltk3::Widget::callback() && when() & FL_WHEN_NOT_CHANGED )
+ //if (!ret && fltk3::Widget::callback() && when() & fltk3::WHEN_NOT_CHANGED )
if ( fltk3::Widget::callback() &&
(
- ( !ret && when() & FL_WHEN_NOT_CHANGED ) ||
+ ( !ret && when() & fltk3::WHEN_NOT_CHANGED ) ||
( is_row!= select_row || is_col!= select_col )
)
) {
@@ -1016,7 +1016,7 @@
}
default:
- change_cursor(FL_CURSOR_DEFAULT);
+ change_cursor(fltk3::CURSOR_DEFAULT);
break;
}
return(ret);
@@ -1139,7 +1139,7 @@
// that leak around the border.
//
if ( ! table->visible() ) {
- if ( damage() & FL_DAMAGE_ALL || damage() & FL_DAMAGE_CHILD ) {
+ if ( damage() & fltk3::DAMAGE_ALL || damage() & fltk3::DAMAGE_CHILD ) {
draw_box(table->box(), tox, toy, tow, toh, table->color());
}
}
@@ -1147,7 +1147,7 @@
fl_push_clip(wix, wiy, wiw, wih);
{
// Only redraw a few cells?
- if ( ! ( damage() & FL_DAMAGE_ALL ) && _redraw_leftcol != -1 ) {
+ if ( ! ( damage() & fltk3::DAMAGE_ALL ) && _redraw_leftcol != -1 ) {
fl_push_clip(tix, tiy, tiw, tih);
for ( int c = _redraw_leftcol; c <= _redraw_rightcol; c++ ) {
for ( int r = _redraw_toprow; r <= _redraw_botrow; r++ ) {
@@ -1156,7 +1156,7 @@
}
fl_pop_clip();
}
- if ( damage() & FL_DAMAGE_ALL ) {
+ if ( damage() & fltk3::DAMAGE_ALL ) {
int X,Y,W,H;
// Draw row headers, if any
if ( row_header() ) {
Modified: branches/branch-3.0-2011/src/Fl_Table_Row.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Table_Row.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Table_Row.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -176,8 +176,8 @@
// The following code disables cell selection.. why was it added? -erco 05/18/03
// if ( ret ) { _last_y = fltk3::event_y(); return(1); } // base class 'handled' it (eg. column resize)
- int shiftstate = (fltk3::event_state() & FL_CTRL) ? FL_CTRL :
- (fltk3::event_state() & FL_SHIFT) ? FL_SHIFT : 0;
+ int shiftstate = (fltk3::event_state() & fltk3::CTRL) ? fltk3::CTRL :
+ (fltk3::event_state() & fltk3::SHIFT) ? fltk3::SHIFT : 0;
// Which row/column are we over?
int R, C; // row/column being worked on
@@ -195,11 +195,11 @@
if ( context == CONTEXT_CELL ) {
// Ctrl key? Toggle selection state
switch ( shiftstate ) {
- case FL_CTRL:
+ case fltk3::CTRL:
select_row(R, 2); // toggle
break;
- case FL_SHIFT: {
+ case fltk3::SHIFT: {
select_row(R, 1);
if ( _last_row > -1 ) {
int srow = R, erow = _last_row;
@@ -258,13 +258,13 @@
}
if ( context == CONTEXT_CELL ) {
switch ( shiftstate ) {
- case FL_CTRL:
+ case fltk3::CTRL:
if ( R != _last_row ) { // toggle if dragged to new row
select_row(R, 2); // 2=toggle
}
break;
- case FL_SHIFT:
+ case fltk3::SHIFT:
default:
select_row(R, 1);
if ( _last_row > -1 ) {
Modified: branches/branch-3.0-2011/src/Fl_Tabs.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tabs.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tabs.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -151,10 +151,10 @@
int H = tab_height();
if (H >= 0) {
H += fltk3::box_dy(box());
- damage(FL_DAMAGE_SCROLL, x(), y(), w(), H);
+ damage(fltk3::DAMAGE_SCROLL, x(), y(), w(), H);
} else {
H = fltk3::box_dy(box()) - H;
- damage(FL_DAMAGE_SCROLL, x(), y() + h() - H, w(), H);
+ damage(fltk3::DAMAGE_SCROLL, x(), y() + h() - H, w(), H);
}
}
@@ -318,8 +318,8 @@
fltk3::Widget *v = value();
int H = tab_height();
- if (damage() & FL_DAMAGE_ALL) { // redraw the entire thing:
- Fl_Color c = v ? v->color() : color();
+ if (damage() & fltk3::DAMAGE_ALL) { // redraw the entire thing:
+ fltk3::Color c = v ? v->color() : color();
draw_box(box(), x(), y()+(H>=0?H:0), w(), h()-(H>=0?H:-H), c);
@@ -335,7 +335,7 @@
} else { // redraw the child
if (v) update_child(*v);
}
- if (damage() & (FL_DAMAGE_SCROLL|FL_DAMAGE_ALL)) {
+ if (damage() & (fltk3::DAMAGE_SCROLL|fltk3::DAMAGE_ALL)) {
int nc = children();
int selected = tab_positions();
int i;
@@ -374,16 +374,16 @@
H += dh;
- Fl_Color c = sel ? selection_color() : o->selection_color();
+ fltk3::Color c = sel ? selection_color() : o->selection_color();
draw_box(bt, x1, y() + yofs, W, H + 10 - yofs, c);
// Save the previous label color
- Fl_Color oc = o->labelcolor();
+ fltk3::Color oc = o->labelcolor();
// Draw the label using the current color...
o->labelcolor(sel ? labelcolor() : o->labelcolor());
- o->draw_label(x1, y() + yofs, W, H - yofs, FL_ALIGN_CENTER);
+ o->draw_label(x1, y() + yofs, W, H - yofs, fltk3::ALIGN_CENTER);
// Restore the original label color...
o->labelcolor(oc);
@@ -400,16 +400,16 @@
H += dh;
- Fl_Color c = sel ? selection_color() : o->selection_color();
+ fltk3::Color c = sel ? selection_color() : o->selection_color();
draw_box(bt, x1, y() + h() - H - 10, W, H + 10 - yofs, c);
// Save the previous label color
- Fl_Color oc = o->labelcolor();
+ fltk3::Color oc = o->labelcolor();
// Draw the label using the current color...
o->labelcolor(sel ? labelcolor() : o->labelcolor());
- o->draw_label(x1, y() + h() - H, W, H - yofs, FL_ALIGN_CENTER);
+ o->draw_label(x1, y() + h() - H, W, H - yofs, fltk3::ALIGN_CENTER);
// Restore the original label color...
o->labelcolor(oc);
Modified: branches/branch-3.0-2011/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Text_Display.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Text_Display.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -102,7 +102,7 @@
color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
box(fltk3::DOWN_FRAME);
- textsize(FL_NORMAL_SIZE);
+ textsize(fltk3::NORMAL_SIZE);
textcolor(FL_FOREGROUND_COLOR);
textfont(fltk3::HELVETICA);
set_flag(SHORTCUT_LABEL);
@@ -121,7 +121,7 @@
end();
scrollbar_width(fltk3::scrollbar_size());
- scrollbar_align(FL_ALIGN_BOTTOM_RIGHT);
+ scrollbar_align(fltk3::ALIGN_BOTTOM_RIGHT);
mCursorOn = 0;
mCursorPos = 0;
@@ -260,7 +260,7 @@
mColumnScale = 0;
mStyleBuffer->canUndo(0);
- damage(FL_DAMAGE_EXPOSE);
+ damage(fltk3::DAMAGE_EXPOSE);
}
@@ -349,11 +349,11 @@
// figure the scrollbars
if (scrollbar_width()) {
/* Decide if the vertical scrollbar needs to be visible */
- if (scrollbar_align() & (FL_ALIGN_LEFT|FL_ALIGN_RIGHT) &&
+ if (scrollbar_align() & (fltk3::ALIGN_LEFT|fltk3::ALIGN_RIGHT) &&
mNBufferLines >= mNVisibleLines - 1)
{
mVScrollBar->set_visible();
- if (scrollbar_align() & FL_ALIGN_LEFT) {
+ if (scrollbar_align() & fltk3::ALIGN_LEFT) {
text_area.x = X+scrollbar_width()+LEFT_MARGIN;
text_area.w = W-scrollbar_width()-LEFT_MARGIN-RIGHT_MARGIN;
mVScrollBar->resize(X, text_area.y-TOP_MARGIN, scrollbar_width(),
@@ -387,14 +387,14 @@
/* WAS: Suggestion: Try turning the horizontal scrollbar on when
you first see a line that is too wide in the window, but then
don't turn it off (ie mix both of your solutions). */
- if (scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM) &&
+ if (scrollbar_align() & (fltk3::ALIGN_TOP|fltk3::ALIGN_BOTTOM) &&
(mVScrollBar->visible() || longest_vline() > text_area.w))
{
if (!mHScrollBar->visible()) {
mHScrollBar->set_visible();
again = 1; // loop again to see if we now need vert. & recalc sizes
}
- if (scrollbar_align() & FL_ALIGN_TOP) {
+ if (scrollbar_align() & fltk3::ALIGN_TOP) {
text_area.y = Y + scrollbar_width()+TOP_MARGIN;
text_area.h = H - scrollbar_width()-TOP_MARGIN-BOTTOM_MARGIN;
mHScrollBar->resize(text_area.x-LEFT_MARGIN, Y,
@@ -501,7 +501,7 @@
damage_range2_start = min(damage_range2_start, startpos);
damage_range2_end = max(damage_range2_end, endpos);
}
- damage(FL_DAMAGE_SCROLL);
+ damage(fltk3::DAMAGE_SCROLL);
}
@@ -1482,7 +1482,7 @@
/* If the changes caused scrolling, re-paint everything and we're done. */
if ( scrolled ) {
- textD->damage(FL_DAMAGE_EXPOSE);
+ textD->damage(fltk3::DAMAGE_EXPOSE);
if ( textD->mStyleBuffer ) /* See comments in extendRangeForStyleMods */
textD->mStyleBuffer->primary_selection()->selected(0);
return;
@@ -1925,8 +1925,8 @@
fltk3::Font font = textfont();
int fsize = textsize();
- Fl_Color foreground;
- Fl_Color background;
+ fltk3::Color foreground;
+ fltk3::Color background;
if ( style & STYLE_LOOKUP_MASK ) {
int si = (style & STYLE_LOOKUP_MASK) - 'A';
@@ -2561,7 +2561,7 @@
mHorizOffset = horizOffset;
// redraw all text
- damage(FL_DAMAGE_EXPOSE);
+ damage(fltk3::DAMAGE_EXPOSE);
return 1;
}
@@ -3357,7 +3357,7 @@
fl_push_clip(x(),y(),w(),h()); // prevent drawing outside widget area
// draw the non-text, non-scrollbar areas.
- if (damage() & FL_DAMAGE_ALL) {
+ if (damage() & fltk3::DAMAGE_ALL) {
// printf("drawing all (box = %d)\n", box());
// draw the box()
int W = w(), H = h();
@@ -3394,7 +3394,7 @@
// blank the previous cursor protrusions
}
- else if (damage() & (FL_DAMAGE_SCROLL | FL_DAMAGE_EXPOSE)) {
+ else if (damage() & (fltk3::DAMAGE_SCROLL | fltk3::DAMAGE_EXPOSE)) {
// printf("blanking previous cursor extrusions at Y: %d\n", mCursorOldY);
// CET - FIXME - save old cursor position instead and just draw side needed?
fl_push_clip(text_area.x-LEFT_MARGIN,
@@ -3409,15 +3409,15 @@
}
// draw the scrollbars
- if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_CHILD)) {
- mVScrollBar->damage(FL_DAMAGE_ALL);
- mHScrollBar->damage(FL_DAMAGE_ALL);
+ if (damage() & (fltk3::DAMAGE_ALL | fltk3::DAMAGE_CHILD)) {
+ mVScrollBar->damage(fltk3::DAMAGE_ALL);
+ mHScrollBar->damage(fltk3::DAMAGE_ALL);
}
update_child(*mVScrollBar);
update_child(*mHScrollBar);
// draw all of the text
- if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_EXPOSE)) {
+ if (damage() & (fltk3::DAMAGE_ALL | fltk3::DAMAGE_EXPOSE)) {
//printf("drawing all text\n");
int X, Y, W, H;
if (fl_clip_box(text_area.x, text_area.y, text_area.w, text_area.h,
@@ -3430,7 +3430,7 @@
draw_text(text_area.x, text_area.y, text_area.w, text_area.h);
}
}
- else if (damage() & FL_DAMAGE_SCROLL) {
+ else if (damage() & fltk3::DAMAGE_SCROLL) {
// draw some lines of text
fl_push_clip(text_area.x, text_area.y,
text_area.w, text_area.h);
@@ -3446,7 +3446,7 @@
}
// draw the text cursor
- if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_SCROLL | FL_DAMAGE_EXPOSE)
+ if (damage() & (fltk3::DAMAGE_ALL | fltk3::DAMAGE_SCROLL | fltk3::DAMAGE_EXPOSE)
&& !buffer()->primary_selection()->selected() &&
mCursorOn && fltk3::focus() == this ) {
fl_push_clip(text_area.x-LEFT_MARGIN,
@@ -3554,8 +3554,8 @@
case FL_MOVE:
if (active_r()) {
if (fltk3::event_inside(text_area.x, text_area.y, text_area.w,
- text_area.h)) window()->cursor(FL_CURSOR_INSERT);
- else window()->cursor(FL_CURSOR_DEFAULT);
+ text_area.h)) window()->cursor(fltk3::CURSOR_INSERT);
+ else window()->cursor(fltk3::CURSOR_DEFAULT);
return 1;
} else {
return 0;
@@ -3564,7 +3564,7 @@
case FL_LEAVE:
case FL_HIDE:
if (active_r() && window()) {
- window()->cursor(FL_CURSOR_DEFAULT);
+ window()->cursor(fltk3::CURSOR_DEFAULT);
return 1;
} else {
@@ -3574,8 +3574,8 @@
case FL_PUSH: {
if (active_r() && window()) {
if (fltk3::event_inside(text_area.x, text_area.y, text_area.w,
- text_area.h)) window()->cursor(FL_CURSOR_INSERT);
- else window()->cursor(FL_CURSOR_DEFAULT);
+ text_area.h)) window()->cursor(fltk3::CURSOR_INSERT);
+ else window()->cursor(fltk3::CURSOR_DEFAULT);
}
if (fltk3::focus() != this) {
@@ -3583,7 +3583,7 @@
handle(FL_FOCUS);
}
if (fltk3::Group::handle(event)) return 1;
- if (fltk3::event_state()&FL_SHIFT) return handle(FL_DRAG);
+ if (fltk3::event_state()&fltk3::SHIFT) return handle(FL_DRAG);
dragging = 1;
int pos = xy_to_position(fltk3::event_x(), fltk3::event_y(), CURSOR_POS);
dragPos = pos;
@@ -3665,7 +3665,7 @@
case FL_RELEASE: {
if (fltk3::event_is_click() && (! fltk3::event_clicks()) &&
- buffer()->primary_selection()->includes(dragPos) && !(fltk3::event_state()&FL_SHIFT) ) {
+ buffer()->primary_selection()->includes(dragPos) && !(fltk3::event_state()&fltk3::SHIFT) ) {
buffer()->unselect(); // clicking in the selection: unselect and move cursor
insert_position(dragPos);
return 1;
@@ -3699,7 +3699,7 @@
else return mHScrollBar->handle(event);
case FL_UNFOCUS:
- if (active_r() && window()) window()->cursor(FL_CURSOR_DEFAULT);
+ if (active_r() && window()) window()->cursor(fltk3::CURSOR_DEFAULT);
case FL_FOCUS:
if (buffer()->selected()) {
int start, end;
@@ -3720,7 +3720,7 @@
case FL_KEYBOARD:
// Copy?
- if ((fltk3::event_state()&(FL_CTRL|FL_COMMAND)) && fltk3::event_key()=='c') {
+ if ((fltk3::event_state()&(fltk3::CTRL|fltk3::COMMAND)) && fltk3::event_key()=='c') {
if (!buffer()->selected()) return 1;
const char *copy = buffer()->selection_text();
if (*copy) fltk3::copy(copy, strlen(copy), 1);
@@ -3729,7 +3729,7 @@
}
// Select all ?
- if ((fltk3::event_state()&(FL_CTRL|FL_COMMAND)) && fltk3::event_key()=='a') {
+ if ((fltk3::event_state()&(fltk3::CTRL|fltk3::COMMAND)) && fltk3::event_key()=='a') {
buffer()->select(0,buffer()->length());
const char *copy = buffer()->selection_text();
if (*copy) fltk3::copy(copy, strlen(copy), 0);
Modified: branches/branch-3.0-2011/src/Fl_Text_Editor.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Text_Editor.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Text_Editor.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -114,56 +114,56 @@
{ FL_Down, 0, Fl_Text_Editor::kf_move },
{ FL_Page_Up, 0, Fl_Text_Editor::kf_move },
{ FL_Page_Down, 0, Fl_Text_Editor::kf_move },
- { FL_Home, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_End, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Left, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Up, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Right, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Down, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Page_Up, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Page_Down, FL_SHIFT, Fl_Text_Editor::kf_shift_move },
- { FL_Home, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_End, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Left, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Up, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Right, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Down, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Page_Up, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Page_Down, FL_CTRL, Fl_Text_Editor::kf_ctrl_move },
- { FL_Home, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_End, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_Left, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_Up, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_Right, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_Down, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_Page_Up, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
- { FL_Page_Down, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Home, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_End, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Left, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Up, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Right, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Down, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Page_Up, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Page_Down, fltk3::SHIFT, Fl_Text_Editor::kf_shift_move },
+ { FL_Home, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_End, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Left, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Up, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Right, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Down, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Page_Up, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Page_Down, fltk3::CTRL, Fl_Text_Editor::kf_ctrl_move },
+ { FL_Home, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_End, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Left, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Up, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Right, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Down, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Page_Up, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
+ { FL_Page_Down, fltk3::CTRL|fltk3::SHIFT, Fl_Text_Editor::kf_c_s_move },
//{ FL_Clear, 0, Fl_Text_Editor::delete_to_eol },
- { 'z', FL_CTRL, Fl_Text_Editor::kf_undo },
- { '/', FL_CTRL, Fl_Text_Editor::kf_undo },
- { 'x', FL_CTRL, Fl_Text_Editor::kf_cut },
- { FL_Delete, FL_SHIFT, Fl_Text_Editor::kf_cut },
- { 'c', FL_CTRL, Fl_Text_Editor::kf_copy },
- { FL_Insert, FL_CTRL, Fl_Text_Editor::kf_copy },
- { 'v', FL_CTRL, Fl_Text_Editor::kf_paste },
- { FL_Insert, FL_SHIFT, Fl_Text_Editor::kf_paste },
- { 'a', FL_CTRL, Fl_Text_Editor::kf_select_all },
+ { 'z', fltk3::CTRL, Fl_Text_Editor::kf_undo },
+ { '/', fltk3::CTRL, Fl_Text_Editor::kf_undo },
+ { 'x', fltk3::CTRL, Fl_Text_Editor::kf_cut },
+ { FL_Delete, fltk3::SHIFT, Fl_Text_Editor::kf_cut },
+ { 'c', fltk3::CTRL, Fl_Text_Editor::kf_copy },
+ { FL_Insert, fltk3::CTRL, Fl_Text_Editor::kf_copy },
+ { 'v', fltk3::CTRL, Fl_Text_Editor::kf_paste },
+ { FL_Insert, fltk3::SHIFT, Fl_Text_Editor::kf_paste },
+ { 'a', fltk3::CTRL, Fl_Text_Editor::kf_select_all },
#ifdef __APPLE__
// Define CMD+key accelerators...
- { 'z', FL_COMMAND, Fl_Text_Editor::kf_undo },
- { 'x', FL_COMMAND, Fl_Text_Editor::kf_cut },
- { 'c', FL_COMMAND, Fl_Text_Editor::kf_copy },
- { 'v', FL_COMMAND, Fl_Text_Editor::kf_paste },
- { 'a', FL_COMMAND, Fl_Text_Editor::kf_select_all },
- { FL_Left, FL_COMMAND, Fl_Text_Editor::kf_meta_move },
- { FL_Right, FL_COMMAND, Fl_Text_Editor::kf_meta_move },
- { FL_Up, FL_COMMAND, Fl_Text_Editor::kf_meta_move },
- { FL_Down, FL_COMMAND, Fl_Text_Editor::kf_meta_move },
- { FL_Left, FL_COMMAND|FL_SHIFT, Fl_Text_Editor::kf_m_s_move },
- { FL_Right, FL_COMMAND|FL_SHIFT, Fl_Text_Editor::kf_m_s_move },
- { FL_Up, FL_COMMAND|FL_SHIFT, Fl_Text_Editor::kf_m_s_move },
- { FL_Down, FL_COMMAND|FL_SHIFT, Fl_Text_Editor::kf_m_s_move },
+ { 'z', fltk3::COMMAND, Fl_Text_Editor::kf_undo },
+ { 'x', fltk3::COMMAND, Fl_Text_Editor::kf_cut },
+ { 'c', fltk3::COMMAND, Fl_Text_Editor::kf_copy },
+ { 'v', fltk3::COMMAND, Fl_Text_Editor::kf_paste },
+ { 'a', fltk3::COMMAND, Fl_Text_Editor::kf_select_all },
+ { FL_Left, fltk3::COMMAND, Fl_Text_Editor::kf_meta_move },
+ { FL_Right, fltk3::COMMAND, Fl_Text_Editor::kf_meta_move },
+ { FL_Up, fltk3::COMMAND, Fl_Text_Editor::kf_meta_move },
+ { FL_Down, fltk3::COMMAND, Fl_Text_Editor::kf_meta_move },
+ { FL_Left, fltk3::COMMAND|fltk3::SHIFT, Fl_Text_Editor::kf_m_s_move },
+ { FL_Right, fltk3::COMMAND|fltk3::SHIFT, Fl_Text_Editor::kf_m_s_move },
+ { FL_Up, fltk3::COMMAND|fltk3::SHIFT, Fl_Text_Editor::kf_m_s_move },
+ { FL_Down, fltk3::COMMAND|fltk3::SHIFT, Fl_Text_Editor::kf_m_s_move },
#endif // __APPLE__
{ 0, 0, 0 }
@@ -241,7 +241,7 @@
else e->overstrike(s);
e->show_insert_position();
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return 1;
}
@@ -259,7 +259,7 @@
kill_selection(e);
e->show_insert_position();
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return 1;
}
@@ -269,7 +269,7 @@
e->insert("\n");
e->show_insert_position();
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return 1;
}
@@ -460,7 +460,7 @@
kill_selection(e);
e->show_insert_position();
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return 1;
}
@@ -479,7 +479,7 @@
kf_copy(c, e);
kill_selection(e);
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return 1;
}
@@ -489,7 +489,7 @@
fltk3::paste(*e, 1);
e->show_insert_position();
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return 1;
}
@@ -510,7 +510,7 @@
e->insert_position(crsr);
e->show_insert_position();
e->set_changed();
- if (e->when()&FL_WHEN_CHANGED) e->do_callback();
+ if (e->when()&fltk3::WHEN_CHANGED) e->do_callback();
return ret;
}
@@ -534,12 +534,12 @@
}
show_insert_position();
set_changed();
- if (when()&FL_WHEN_CHANGED) do_callback();
+ if (when()&fltk3::WHEN_CHANGED) do_callback();
return 1;
}
int key = fltk3::event_key(), state = fltk3::event_state(), c = fltk3::event_text()[0];
- state &= FL_SHIFT|FL_CTRL|FL_ALT|FL_META; // only care about these states
+ state &= fltk3::SHIFT|fltk3::CTRL|fltk3::ALT|fltk3::META; // only care about these states
Key_Func f;
f = bound_key_function(key, state, global_key_bindings);
if (!f) f = bound_key_function(key, state, key_bindings);
@@ -552,7 +552,7 @@
void Fl_Text_Editor::maybe_do_callback() {
// printf("Fl_Text_Editor::maybe_do_callback()\n");
// printf("changed()=%d, when()=%x\n", changed(), when());
- if (changed() || (when()&FL_WHEN_NOT_CHANGED)) do_callback();
+ if (changed() || (when()&fltk3::WHEN_NOT_CHANGED)) do_callback();
}
int Fl_Text_Editor::handle(int event) {
@@ -571,12 +571,12 @@
show_cursor(mCursorOn); // redraws the cursor
if (buffer()->selected()) redraw(); // Redraw selections...
case FL_HIDE:
- if (when() & FL_WHEN_RELEASE) maybe_do_callback();
+ if (when() & fltk3::WHEN_RELEASE) maybe_do_callback();
return 1;
case FL_KEYBOARD:
if (active_r() && window() && this == fltk3::belowmouse())
- window()->cursor(FL_CURSOR_NONE);
+ window()->cursor(fltk3::CURSOR_NONE);
return handle_key();
case FL_PASTE:
@@ -589,7 +589,7 @@
else overstrike(fltk3::event_text());
show_insert_position();
set_changed();
- if (when()&FL_WHEN_CHANGED) do_callback();
+ if (when()&fltk3::WHEN_CHANGED) do_callback();
return 1;
case FL_ENTER:
@@ -611,7 +611,7 @@
fltk3::paste(*this, 0);
fltk3::focus(this);
set_changed();
- if (when()&FL_WHEN_CHANGED) do_callback();
+ if (when()&fltk3::WHEN_CHANGED) do_callback();
return 1;
}
break;
Modified: branches/branch-3.0-2011/src/Fl_Tile.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tile.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tile.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -104,8 +104,8 @@
}
}
-static void set_cursor(Fl_Tile*t, Fl_Cursor c) {
- static Fl_Cursor cursor;
+static void set_cursor(Fl_Tile*t, fltk3::Cursor c) {
+ static fltk3::Cursor cursor;
if (cursor == c || !t->window()) return;
cursor = c;
#ifdef __sgi
@@ -115,11 +115,11 @@
#endif
}
-static Fl_Cursor cursors[4] = {
- FL_CURSOR_DEFAULT,
- FL_CURSOR_WE,
- FL_CURSOR_NS,
- FL_CURSOR_MOVE};
+static fltk3::Cursor cursors[4] = {
+ fltk3::CURSOR_DEFAULT,
+ fltk3::CURSOR_WE,
+ fltk3::CURSOR_NS,
+ fltk3::CURSOR_MOVE};
int Fl_Tile::handle(int event) {
static int sdrag;
@@ -176,7 +176,7 @@
}
case FL_LEAVE:
- set_cursor(this, FL_CURSOR_DEFAULT);
+ set_cursor(this, fltk3::CURSOR_DEFAULT);
break;
case FL_DRAG:
Modified: branches/branch-3.0-2011/src/Fl_Tiled_Image.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tiled_Image.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tiled_Image.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -70,7 +70,7 @@
//
void
-Fl_Tiled_Image::color_average(Fl_Color c, // I - Color to blend with
+Fl_Tiled_Image::color_average(fltk3::Color c, // I - Color to blend with
float i) { // I - Blend fraction
if (!alloc_image_) {
image_ = image_->copy();
Modified: branches/branch-3.0-2011/src/Fl_Tooltip.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tooltip.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tooltip.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -34,12 +34,12 @@
float Fl_Tooltip::delay_ = 1.0f;
float Fl_Tooltip::hoverdelay_ = 0.2f;
-Fl_Color Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1,
+fltk3::Color Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1,
FL_NUM_GREEN - 1,
FL_NUM_BLUE - 2);
-Fl_Color Fl_Tooltip::textcolor_ = FL_BLACK;
+fltk3::Color Fl_Tooltip::textcolor_ = FL_BLACK;
fltk3::Font Fl_Tooltip::font_ = fltk3::HELVETICA;
-fltk3::Fontsize Fl_Tooltip::size_ = FL_NORMAL_SIZE;
+fltk3::Fontsize Fl_Tooltip::size_ = fltk3::NORMAL_SIZE;
#define MAX_WIDTH 400
@@ -79,7 +79,7 @@
fl_font(Fl_Tooltip::font(), Fl_Tooltip::size());
int ww, hh;
ww = MAX_WIDTH;
- fl_measure(tip, ww, hh, FL_ALIGN_LEFT|FL_ALIGN_WRAP|FL_ALIGN_INSIDE);
+ fl_measure(tip, ww, hh, fltk3::ALIGN_LEFT|fltk3::ALIGN_WRAP|fltk3::ALIGN_INSIDE);
ww += 6; hh += 6;
// find position on the screen of the widget:
@@ -107,7 +107,7 @@
draw_box(fltk3::BORDER_BOX, 0, 0, w(), h(), Fl_Tooltip::color());
fl_color(Fl_Tooltip::textcolor());
fl_font(Fl_Tooltip::font(), Fl_Tooltip::size());
- fl_draw(tip, 3, 3, w()-6, h()-6, Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_WRAP));
+ fl_draw(tip, 3, 3, w()-6, h()-6, fltk3::Align(fltk3::ALIGN_LEFT|fltk3::ALIGN_WRAP));
}
static char recent_tooltip;
@@ -211,7 +211,7 @@
fltk3::remove_timeout(recent_timeout);
if (window && window->visible()) window->hide();
if (recent_tooltip) {
- if (fltk3::event_state() & FL_BUTTONS) recent_tooltip = 0;
+ if (fltk3::event_state() & fltk3::BUTTONS) recent_tooltip = 0;
else fltk3::add_timeout(Fl_Tooltip::hoverdelay(), recent_timeout);
}
}
Modified: branches/branch-3.0-2011/src/Fl_Tree.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tree.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tree.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -94,7 +94,7 @@
_scrollbar_size = 0; // 0: uses fltk3::scrollbar_size()
box(fltk3::DOWN_BOX);
color(FL_WHITE);
- when(FL_WHEN_CHANGED);
+ when(fltk3::WHEN_CHANGED);
_vscroll = new Fl_Scrollbar(0,0,0,0); // will be resized by draw()
_vscroll->hide();
_vscroll->type(FL_VERTICAL);
@@ -480,7 +480,7 @@
if ( ! _item_focus ) { // no focus established yet?
switch (fltk3::event_key()) { // determine if focus was navigated..
case FL_Tab: { // received focus via TAB?
- if ( fltk3::event_state(FL_SHIFT) ) { // SHIFT-TAB similar to FL_Up
+ if ( fltk3::event_state(fltk3::SHIFT) ) { // SHIFT-TAB similar to FL_Up
set_item_focus(next_visible_item(0, FL_Up));
} else { // TAB similar to FL_Down
set_item_focus(next_visible_item(0, FL_Down));
@@ -518,7 +518,7 @@
switch (ekey) {
case FL_Enter: // ENTER: selects current item only
case FL_KP_Enter:
- if ( when() & ~FL_WHEN_ENTER_KEY) {
+ if ( when() & ~fltk3::WHEN_ENTER_KEY) {
select_only(_item_focus);
show_item(_item_focus); // STR #2426
return(1);
@@ -568,7 +568,7 @@
if ( itembot > y()+h() ) { show_item_bottom(_item_focus); }
// Extend selection
if ( _prefs.selectmode() == FL_TREE_SELECT_MULTI && // multiselect on?
- (fltk3::event_state() & FL_SHIFT) && // shift key?
+ (fltk3::event_state() & fltk3::SHIFT) && // shift key?
! _item_focus->is_selected() ) { // not already selected?
select(_item_focus); // extend selection..
}
@@ -617,9 +617,9 @@
select_only(o);
break;
case FL_TREE_SELECT_MULTI: {
- if ( fltk3::event_state() & FL_SHIFT ) { // SHIFT+PUSH?
+ if ( fltk3::event_state() & fltk3::SHIFT ) { // SHIFT+PUSH?
select(o); // add to selection
- } else if ( fltk3::event_state() & FL_CTRL ) { // CTRL+PUSH?
+ } else if ( fltk3::event_state() & fltk3::CTRL ) { // CTRL+PUSH?
select_toggle(o); // toggle selection state
lastselect = o; // save toggled item (prevent oscillation)
} else {
@@ -661,7 +661,7 @@
select_only(o);
break;
case FL_TREE_SELECT_MULTI:
- if ( fltk3::event_state() & FL_CTRL && // CTRL-DRAG: toggle?
+ if ( fltk3::event_state() & fltk3::CTRL && // CTRL-DRAG: toggle?
lastselect != o ) { // not already toggled from last microdrag?
select_toggle(o); // toggle selection
lastselect = o; // save we toggled it (prevents oscillation)
Modified: branches/branch-3.0-2011/src/Fl_Tree_Item.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tree_Item.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tree_Item.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -507,7 +507,7 @@
return(0);
}
-static void draw_item_focus(fltk3::Boxtype B, Fl_Color C, int X, int Y, int W, int H) {
+static void draw_item_focus(fltk3::Boxtype B, fltk3::Color C, int X, int Y, int W, int H) {
if (!fltk3::visible_focus()) return;
switch (B) {
case fltk3::DOWN_BOX:
@@ -562,8 +562,8 @@
W += prefs.openicon()->w();
}
// Colors, fonts
- Fl_Color fg = _selected ? prefs.bgcolor() : _labelfgcolor;
- Fl_Color bg = _selected ? prefs.selectcolor() : _labelbgcolor;
+ fltk3::Color fg = _selected ? prefs.bgcolor() : _labelfgcolor;
+ fltk3::Color bg = _selected ? prefs.selectcolor() : _labelbgcolor;
if ( ! _active ) {
fg = fl_inactive(fg);
if ( _selected ) bg = fl_inactive(bg);
Modified: branches/branch-3.0-2011/src/Fl_Tree_Prefs.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Tree_Prefs.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Tree_Prefs.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -127,7 +127,7 @@
/// Fl_Tree_Prefs constructor
Fl_Tree_Prefs::Fl_Tree_Prefs() {
_labelfont = fltk3::HELVETICA;
- _labelsize = FL_NORMAL_SIZE;
+ _labelsize = fltk3::NORMAL_SIZE;
_marginleft = 6;
_margintop = 3;
//_marginright = 3;
@@ -140,7 +140,7 @@
_bgcolor = FL_WHITE;
_selectcolor = FL_DARK_BLUE;
_inactivecolor = FL_GRAY;
- _connectorcolor = Fl_Color(43);
+ _connectorcolor = fltk3::Color(43);
#ifdef __APPLE__
_connectorstyle = FL_TREE_CONNECTOR_NONE;
#else
Modified: branches/branch-3.0-2011/src/Fl_Valuator.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Valuator.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Valuator.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -40,8 +40,8 @@
size, and label string. The default boxtype is fltk3::NO_BOX.
*/
: fltk3::Widget(X,Y,W,H,L) {
- align(FL_ALIGN_BOTTOM);
- when(FL_WHEN_CHANGED);
+ align(fltk3::ALIGN_BOTTOM);
+ when(fltk3::WHEN_CHANGED);
value_ = 0;
previous_value_ = 1;
min = 0;
@@ -66,7 +66,7 @@
for (B = 1; p--;) B *= 10;
}
/** Asks for partial redraw */
-void Fl_Valuator::value_damage() {damage(FL_DAMAGE_EXPOSE);} // by default do partial-redraw
+void Fl_Valuator::value_damage() {damage(fltk3::DAMAGE_EXPOSE);} // by default do partial-redraw
/**
Sets the current value. The new value is <I>not</I>
@@ -95,24 +95,24 @@
}
// inline void Fl_Valuator::handle_push() {previous_value_ = value_;}
-/** Called during a drag operation, after an FL_WHEN_CHANGED event is received and before the callback. */
+/** Called during a drag operation, after an fltk3::WHEN_CHANGED event is received and before the callback. */
void Fl_Valuator::handle_drag(double v) {
if (v != value_) {
value_ = v;
value_damage();
set_changed();
- if (when() & FL_WHEN_CHANGED) do_callback();
+ if (when() & fltk3::WHEN_CHANGED) do_callback();
}
}
-/** Called after an FL_WHEN_RELEASE event is received and before the callback. */
+/** Called after an fltk3::WHEN_RELEASE event is received and before the callback. */
void Fl_Valuator::handle_release() {
- if (when()&FL_WHEN_RELEASE) {
+ if (when()&fltk3::WHEN_RELEASE) {
// insure changed() is off even if no callback is done. It may have
// been turned on by the drag, and then the slider returned to it's
// initial position:
clear_changed();
// now do the callback only if slider in new position or always is on:
- if (value_ != previous_value_ || when() & FL_WHEN_NOT_CHANGED) {
+ if (value_ != previous_value_ || when() & fltk3::WHEN_NOT_CHANGED) {
do_callback();
}
}
Modified: branches/branch-3.0-2011/src/Fl_Value_Input.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Value_Input.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Value_Input.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -41,7 +41,7 @@
double nv;
if ((t.step() - floor(t.step()))>0.0 || t.step() == 0.0) nv = strtod(t.input.value(), 0);
else nv = strtol(t.input.value(), 0, 0);
- if (nv != t.value() || t.when() & FL_WHEN_NOT_CHANGED) {
+ if (nv != t.value() || t.when() & fltk3::WHEN_NOT_CHANGED) {
t.set_value(nv);
t.set_changed();
if (t.when()) t.do_callback();
@@ -49,7 +49,7 @@
}
void Fl_Value_Input::draw() {
- if (damage()&~FL_DAMAGE_CHILD) input.clear_damage(FL_DAMAGE_ALL);
+ if (damage()&~fltk3::DAMAGE_CHILD) input.clear_damage(fltk3::DAMAGE_ALL);
input.box(box());
input.color(color(), selection_color());
fltk3::Widget *i = &input; i->draw(); // calls protected input.draw()
@@ -129,11 +129,11 @@
input.parent()->remove(input);
input.parent((fltk3::Group *)this); // kludge!
input.callback(input_cb, this);
- input.when(FL_WHEN_CHANGED);
+ input.when(fltk3::WHEN_CHANGED);
box(input.box());
color(input.color());
selection_color(input.selection_color());
- align(FL_ALIGN_LEFT);
+ align(fltk3::ALIGN_LEFT);
value_damage();
set_flag(SHORTCUT_LABEL);
}
Modified: branches/branch-3.0-2011/src/Fl_Value_Output.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Value_Output.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Value_Output.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -39,7 +39,7 @@
int Y = y()+fltk3::box_dy(b);
int W = w()-fltk3::box_dw(b);
int H = h()-fltk3::box_dh(b);
- if (damage()&~FL_DAMAGE_CHILD)
+ if (damage()&~fltk3::DAMAGE_CHILD)
draw_box(b, color());
else {
fl_color(color());
@@ -49,7 +49,7 @@
format(buf);
fl_color(active_r() ? textcolor() : fl_inactive(textcolor()));
fl_font(textfont(), textsize());
- fl_draw(buf,X,Y,W,H,FL_ALIGN_LEFT);
+ fl_draw(buf,X,Y,W,H,fltk3::ALIGN_LEFT);
}
int Fl_Value_Output::handle(int event) {
@@ -96,9 +96,9 @@
Fl_Value_Output::Fl_Value_Output(int X, int Y, int W, int H,const char *l)
: Fl_Valuator(X,Y,W,H,l) {
box(fltk3::NO_BOX);
- align(FL_ALIGN_LEFT);
+ align(fltk3::ALIGN_LEFT);
textfont_ = fltk3::HELVETICA;
- textsize_ = FL_NORMAL_SIZE;
+ textsize_ = fltk3::NORMAL_SIZE;
textcolor_ = FL_FOREGROUND_COLOR;
soft_ = 0;
}
Modified: branches/branch-3.0-2011/src/Fl_Value_Slider.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Value_Slider.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Value_Slider.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -50,7 +50,7 @@
} else {
syy += 25; bhh = 25; shh -= 25;
}
- if (damage()&FL_DAMAGE_ALL) draw_box(box(),sxx,syy,sww,shh,color());
+ if (damage()&fltk3::DAMAGE_ALL) draw_box(box(),sxx,syy,sww,shh,color());
Fl_Slider::draw(sxx+fltk3::box_dx(box()),
syy+fltk3::box_dy(box()),
sww-fltk3::box_dw(box()),
@@ -60,7 +60,7 @@
format(buf);
fl_font(textfont(), textsize());
fl_color(active_r() ? textcolor() : fl_inactive(textcolor()));
- fl_draw(buf, bxx, byy, bww, bhh, FL_ALIGN_CLIP);
+ fl_draw(buf, bxx, byy, bww, bhh, fltk3::ALIGN_CLIP);
}
int Fl_Value_Slider::handle(int event) {
Modified: branches/branch-3.0-2011/src/Fl_Widget.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Widget.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Widget.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -108,7 +108,7 @@
}
/** Default font size for widgets */
-fltk3::Fontsize FL_NORMAL_SIZE = 14;
+fltk3::Fontsize fltk3::NORMAL_SIZE = 14;
fltk3::Widget::Widget(int X, int Y, int W, int H, const char* L) {
@@ -119,9 +119,9 @@
label_.deimage = 0;
label_.type = fltk3::NORMAL_LABEL;
label_.font = fltk3::HELVETICA;
- label_.size = FL_NORMAL_SIZE;
+ label_.size = fltk3::NORMAL_SIZE;
label_.color = FL_FOREGROUND_COLOR;
- label_.align_ = FL_ALIGN_CENTER;
+ label_.align_ = fltk3::ALIGN_CENTER;
tooltip_ = 0;
callback_ = default_callback;
user_data_ = 0;
@@ -131,7 +131,7 @@
box_ = fltk3::NO_BOX;
color_ = FL_GRAY;
color2_ = FL_GRAY;
- when_ = FL_WHEN_RELEASE;
+ when_ = fltk3::WHEN_RELEASE;
parent_ = 0;
if (fltk3::Group::current()) fltk3::Group::current()->add(this);
Modified: branches/branch-3.0-2011/src/Fl_Window.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Window.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Window.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -47,7 +47,7 @@
box(fltk3::FLAT_BOX);
if (fltk3::scheme_bg_) {
labeltype(fltk3::NORMAL_LABEL);
- align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
+ align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
image(fltk3::scheme_bg_);
} else {
labeltype(fltk3::NO_LABEL);
@@ -64,7 +64,7 @@
fltk3::Window::Window(int X,int Y,int W, int H, const char *l)
: fltk3::Group(X, Y, W, H, l) {
- cursor_default = FL_CURSOR_DEFAULT;
+ cursor_default = fltk3::CURSOR_DEFAULT;
cursor_fg = FL_BLACK;
cursor_bg = FL_WHITE;
@@ -75,7 +75,7 @@
fltk3::Window::Window(int W, int H, const char *l)
// fix common user error of a missing end() with current(0):
: fltk3::Group((fltk3::Group::current(0),0), 0, W, H, l) {
- cursor_default = FL_CURSOR_DEFAULT;
+ cursor_default = fltk3::CURSOR_DEFAULT;
cursor_fg = FL_BLACK;
cursor_bg = FL_WHITE;
@@ -107,7 +107,7 @@
// - we draw the box with x=0 and y=0 instead of x() and y()
// - we don't draw a label
- if (damage() & ~FL_DAMAGE_CHILD) { // draw the entire thing
+ if (damage() & ~fltk3::DAMAGE_CHILD) { // draw the entire thing
draw_box(box(),0,0,w(),h(),color()); // draw box with x/y = 0
}
draw_children();
@@ -122,7 +122,7 @@
if (dx<=0) dx = 1;
if (dy<=0) dy = 1;
int x1 = w()-dx-1, x2 = x1, y1 = h()-dx-1, y2 = y1;
- Fl_Color c[4] = {
+ fltk3::Color c[4] = {
color(),
fl_color_average(color(), FL_WHITE, 0.7f),
fl_color_average(color(), FL_BLACK, 0.6f),
Modified: branches/branch-3.0-2011/src/Fl_Wizard.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Wizard.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_Wizard.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -74,7 +74,7 @@
kid = value();
- if (damage() & FL_DAMAGE_ALL)
+ if (damage() & fltk3::DAMAGE_ALL)
{
// Redraw everything...
if (kid)
@@ -185,7 +185,7 @@
// This will restore the mouse pointer to the window's default cursor
// whenever the wizard pane is changed. Otherwise text widgets that
// show the next pane may leave the cursor set to the I beam, etc...
- if (window()) window()->cursor(FL_CURSOR_DEFAULT);
+ if (window()) window()->cursor(fltk3::CURSOR_DEFAULT);
}
Modified: branches/branch-3.0-2011/src/Fl_cocoa.mm
===================================================================
--- branches/branch-3.0-2011/src/Fl_cocoa.mm 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_cocoa.mm 2011-01-09 22:48:30 UTC (rev 8233)
@@ -178,12 +178,12 @@
static unsigned int mods_to_e_state( NSUInteger mods )
{
long state = 0;
- if ( mods & NSNumericPadKeyMask ) state |= FL_NUM_LOCK;
- if ( mods & NSCommandKeyMask ) state |= FL_META;
- if ( mods & NSAlternateKeyMask ) state |= FL_ALT;
- if ( mods & NSControlKeyMask ) state |= FL_CTRL;
- if ( mods & NSShiftKeyMask ) state |= FL_SHIFT;
- if ( mods & NSAlphaShiftKeyMask ) state |= FL_CAPS_LOCK;
+ if ( mods & NSNumericPadKeyMask ) state |= fltk3::NUM_LOCK;
+ if ( mods & NSCommandKeyMask ) state |= fltk3::META;
+ if ( mods & NSAlternateKeyMask ) state |= fltk3::ALT;
+ if ( mods & NSControlKeyMask ) state |= fltk3::CTRL;
+ if ( mods & NSShiftKeyMask ) state |= fltk3::SHIFT;
+ if ( mods & NSAlphaShiftKeyMask ) state |= fltk3::CAPS_LOCK;
unsigned int ret = ( fltk3::e_state & 0xff000000 ) | state;
fltk3::e_state = ret;
//printf( "State 0x%08x (%04x)\n", fltk3::e_state, mods );
@@ -769,14 +769,14 @@
NSEventType etype = [theEvent type];
if (etype == NSLeftMouseDown || etype == NSRightMouseDown || etype == NSOtherMouseDown) {
- if (btn == 1) fltk3::e_state |= FL_BUTTON1;
- else if (btn == 3) fltk3::e_state |= FL_BUTTON2;
- else if (btn == 2) fltk3::e_state |= FL_BUTTON3;
+ if (btn == 1) fltk3::e_state |= fltk3::BUTTON1;
+ else if (btn == 3) fltk3::e_state |= fltk3::BUTTON2;
+ else if (btn == 2) fltk3::e_state |= fltk3::BUTTON3;
}
else if (etype == NSLeftMouseUp || etype == NSRightMouseUp || etype == NSOtherMouseUp) {
- if (btn == 1) fltk3::e_state &= ~FL_BUTTON1;
- else if (btn == 3) fltk3::e_state &= ~FL_BUTTON2;
- else if (btn == 2) fltk3::e_state &= ~FL_BUTTON3;
+ if (btn == 1) fltk3::e_state &= ~fltk3::BUTTON1;
+ else if (btn == 3) fltk3::e_state &= ~fltk3::BUTTON2;
+ else if (btn == 2) fltk3::e_state &= ~fltk3::BUTTON3;
}
switch ( etype ) {
@@ -1436,11 +1436,11 @@
XDestroyRegion(cx->region);
cx->region = 0;
}
- cx->w->clear_damage(FL_DAMAGE_ALL);
+ cx->w->clear_damage(fltk3::DAMAGE_ALL);
cx->flush();
cx->w->clear_damage();
}
- window->clear_damage(FL_DAMAGE_ALL);
+ window->clear_damage(fltk3::DAMAGE_ALL);
i->flush();
window->clear_damage();
}
@@ -2093,7 +2093,7 @@
image(fltk3::scheme_bg_);
if (fltk3::scheme_bg_) {
labeltype(fltk3::NORMAL_LABEL);
- align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
+ align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
labeltype(fltk3::NO_LABEL);
}
@@ -2228,7 +2228,7 @@
}
// helper function to manage the current CGContext fl_gc
-extern Fl_Color fl_color_;
+extern fltk3::Color fl_color_;
extern class Fl_Font_Descriptor *fl_fontsize;
extern void fl_font(class Fl_Font_Descriptor*);
extern void fl_quartz_restore_line_style_();
@@ -2663,51 +2663,51 @@
return cursor;
}
-void Fl_X::set_cursor(Fl_Cursor c)
+void Fl_X::set_cursor(fltk3::Cursor c)
{
NSCursor *icrsr;
switch (c) {
- case FL_CURSOR_CROSS: icrsr = [NSCursor crosshairCursor]; break;
- case FL_CURSOR_WAIT:
+ case fltk3::CURSOR_CROSS: icrsr = [NSCursor crosshairCursor]; break;
+ case fltk3::CURSOR_WAIT:
static NSCursor *watch = nil;
watch = PrepareCursor(watch, &Fl_X::watch_cursor_image);
icrsr = watch;
break;
- case FL_CURSOR_INSERT: icrsr = [NSCursor IBeamCursor]; break;
- case FL_CURSOR_N: icrsr = [NSCursor resizeUpCursor]; break;
- case FL_CURSOR_S: icrsr = [NSCursor resizeDownCursor]; break;
- case FL_CURSOR_NS: icrsr = [NSCursor resizeUpDownCursor]; break;
- case FL_CURSOR_HELP:
+ case fltk3::CURSOR_INSERT: icrsr = [NSCursor IBeamCursor]; break;
+ case fltk3::CURSOR_N: icrsr = [NSCursor resizeUpCursor]; break;
+ case fltk3::CURSOR_S: icrsr = [NSCursor resizeDownCursor]; break;
+ case fltk3::CURSOR_NS: icrsr = [NSCursor resizeUpDownCursor]; break;
+ case fltk3::CURSOR_HELP:
static NSCursor *help = nil;
help = PrepareCursor(help, &Fl_X::help_cursor_image);
icrsr = help;
break;
- case FL_CURSOR_HAND: icrsr = [NSCursor pointingHandCursor]; break;
- case FL_CURSOR_MOVE: icrsr = [NSCursor openHandCursor]; break;
- case FL_CURSOR_NE:
- case FL_CURSOR_SW:
- case FL_CURSOR_NESW:
+ case fltk3::CURSOR_HAND: icrsr = [NSCursor pointingHandCursor]; break;
+ case fltk3::CURSOR_MOVE: icrsr = [NSCursor openHandCursor]; break;
+ case fltk3::CURSOR_NE:
+ case fltk3::CURSOR_SW:
+ case fltk3::CURSOR_NESW:
static NSCursor *nesw = nil;
nesw = PrepareCursor(nesw, &Fl_X::nesw_cursor_image);
icrsr = nesw;
break;
- case FL_CURSOR_E: icrsr = [NSCursor resizeRightCursor]; break;
- case FL_CURSOR_W: icrsr = [NSCursor resizeLeftCursor]; break;
- case FL_CURSOR_WE: icrsr = [NSCursor resizeLeftRightCursor]; break;
- case FL_CURSOR_SE:
- case FL_CURSOR_NW:
- case FL_CURSOR_NWSE:
+ case fltk3::CURSOR_E: icrsr = [NSCursor resizeRightCursor]; break;
+ case fltk3::CURSOR_W: icrsr = [NSCursor resizeLeftCursor]; break;
+ case fltk3::CURSOR_WE: icrsr = [NSCursor resizeLeftRightCursor]; break;
+ case fltk3::CURSOR_SE:
+ case fltk3::CURSOR_NW:
+ case fltk3::CURSOR_NWSE:
static NSCursor *nwse = nil;
nwse = PrepareCursor(nwse, &Fl_X::nwse_cursor_image);
icrsr = nwse;
break;
- case FL_CURSOR_NONE:
+ case fltk3::CURSOR_NONE:
static NSCursor *none = nil;
none = PrepareCursor(none, &Fl_X::none_cursor_image);
icrsr = none;
break;
- case FL_CURSOR_ARROW:
- case FL_CURSOR_DEFAULT:
+ case fltk3::CURSOR_ARROW:
+ case fltk3::CURSOR_DEFAULT:
default: icrsr = [NSCursor arrowCursor];
break;
}
@@ -2980,10 +2980,10 @@
item = va_arg(ap, NSMenuItem*);
value = va_arg(ap, int);
NSUInteger macMod = 0;
- if ( value & FL_META ) macMod = NSCommandKeyMask;
- if ( value & FL_SHIFT || isupper(value) ) macMod |= NSShiftKeyMask;
- if ( value & FL_ALT ) macMod |= NSAlternateKeyMask;
- if ( value & FL_CTRL ) macMod |= NSControlKeyMask;
+ if ( value & fltk3::META ) macMod = NSCommandKeyMask;
+ if ( value & fltk3::SHIFT || isupper(value) ) macMod |= NSShiftKeyMask;
+ if ( value & fltk3::ALT ) macMod |= NSAlternateKeyMask;
+ if ( value & fltk3::CTRL ) macMod |= NSControlKeyMask;
[item setKeyEquivalentModifierMask:macMod];
}
else if (operation == Fl_Sys_Menu_Bar::setState) { // arguments: NSMenuItem*, int
Modified: branches/branch-3.0-2011/src/Fl_compose.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_compose.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_compose.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -57,12 +57,12 @@
#if defined(__APPLE__)
// this stuff is to be treated as a function key
if(fltk3::e_length == 0 || fltk3::e_keysym == FL_Enter || fltk3::e_keysym == FL_KP_Enter ||
- fltk3::e_keysym == FL_Tab || fltk3::e_keysym == FL_Escape || fltk3::e_state&(FL_META | FL_CTRL) ) {
+ fltk3::e_keysym == FL_Tab || fltk3::e_keysym == FL_Escape || fltk3::e_state&(fltk3::META | fltk3::CTRL) ) {
return 0;
}
#else
unsigned char ascii = (unsigned)e_text[0];
- if ((e_state & (FL_ALT | FL_META)) && !(ascii & 128)) return 0;
+ if ((e_state & (fltk3::ALT | fltk3::META)) && !(ascii & 128)) return 0;
#endif
if(fltk3::compose_state) {
del = fltk3::compose_state;
Modified: branches/branch-3.0-2011/src/Fl_get_system_colors.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_get_system_colors.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_get_system_colors.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -247,17 +247,17 @@
#define D1 BORDER_WIDTH
#define D2 (BORDER_WIDTH+BORDER_WIDTH)
-extern void fl_up_box(int, int, int, int, Fl_Color);
-extern void fl_down_box(int, int, int, int, Fl_Color);
-extern void fl_thin_up_box(int, int, int, int, Fl_Color);
-extern void fl_thin_down_box(int, int, int, int, Fl_Color);
-extern void fl_round_up_box(int, int, int, int, Fl_Color);
-extern void fl_round_down_box(int, int, int, int, Fl_Color);
+extern void fl_up_box(int, int, int, int, fltk3::Color);
+extern void fl_down_box(int, int, int, int, fltk3::Color);
+extern void fl_thin_up_box(int, int, int, int, fltk3::Color);
+extern void fl_thin_down_box(int, int, int, int, fltk3::Color);
+extern void fl_round_up_box(int, int, int, int, fltk3::Color);
+extern void fl_round_down_box(int, int, int, int, fltk3::Color);
-extern void fl_up_frame(int, int, int, int, Fl_Color);
-extern void fl_down_frame(int, int, int, int, Fl_Color);
-extern void fl_thin_up_frame(int, int, int, int, Fl_Color);
-extern void fl_thin_down_frame(int, int, int, int, Fl_Color);
+extern void fl_up_frame(int, int, int, int, fltk3::Color);
+extern void fl_down_frame(int, int, int, int, fltk3::Color);
+extern void fl_thin_up_frame(int, int, int, int, fltk3::Color);
+extern void fl_thin_down_frame(int, int, int, int, fltk3::Color);
#ifndef FL_DOXYGEN
const char *fltk3::scheme_ = (const char *)0; // current scheme
@@ -412,7 +412,7 @@
// Set (or clear) the background tile for all windows...
for (win = first_window(); win; win = next_window(win)) {
win->labeltype(scheme_bg_ ? fltk3::NORMAL_LABEL : fltk3::NO_LABEL);
- win->align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
+ win->align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
win->image(scheme_bg_);
win->redraw();
}
Modified: branches/branch-3.0-2011/src/Fl_lock.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_lock.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_lock.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -345,7 +345,7 @@
// Monitor the read side of the pipe so that messages sent via
// fltk3::awake() from a thread will "wake up" the main thread in
// fltk3::wait().
- fltk3::add_fd(thread_filedes[0], FL_READ, thread_awake_cb);
+ fltk3::add_fd(thread_filedes[0], fltk3::READ, thread_awake_cb);
// Set lock/unlock functions for this system, using a system-supplied
// recursive mutex if supported...
Modified: branches/branch-3.0-2011/src/Fl_mac.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_mac.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_mac.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -175,11 +175,11 @@
static unsigned int mods_to_e_state( UInt32 mods )
{
long state = 0;
- if ( mods & kEventKeyModifierNumLockMask ) state |= FL_NUM_LOCK;
- if ( mods & cmdKey ) state |= FL_META;
- if ( mods & (optionKey|rightOptionKey) ) state |= FL_ALT;
- if ( mods & (controlKey|rightControlKey) ) state |= FL_CTRL;
- if ( mods & (shiftKey|rightShiftKey) ) state |= FL_SHIFT;
+ if ( mods & kEventKeyModifierNumLockMask ) state |= fltk3::NUM_LOCK;
+ if ( mods & cmdKey ) state |= fltk3::META;
+ if ( mods & (optionKey|rightOptionKey) ) state |= fltk3::ALT;
+ if ( mods & (controlKey|rightControlKey) ) state |= fltk3::CTRL;
+ if ( mods & (shiftKey|rightShiftKey) ) state |= fltk3::SHIFT;
if ( mods & alphaLock ) state |= FL_CAPS_LOCK;
unsigned int ret = ( fltk3::e_state & 0xff000000 ) | state;
fltk3::e_state = ret;
@@ -965,9 +965,9 @@
{
static ulong state[] =
{
- 0, FL_BUTTON1, FL_BUTTON3, FL_BUTTON1|FL_BUTTON3, FL_BUTTON2,
- FL_BUTTON2|FL_BUTTON1, FL_BUTTON2|FL_BUTTON3,
- FL_BUTTON2|FL_BUTTON1|FL_BUTTON3
+ 0, fltk3::BUTTON1, fltk3::BUTTON3, fltk3::BUTTON1|fltk3::BUTTON3, fltk3::BUTTON2,
+ fltk3::BUTTON2|fltk3::BUTTON1, fltk3::BUTTON2|fltk3::BUTTON3,
+ fltk3::BUTTON2|fltk3::BUTTON1|fltk3::BUTTON3
};
fltk3::e_state = ( fltk3::e_state & 0xff0000 ) | state[ chord & 0x07 ];
}
@@ -1348,9 +1348,9 @@
sym = macKeyLookUp[maskedKeyCode];
if ( isalpha(key) )
sym = tolower(key);
- else if ( fltk3::e_state&FL_CTRL && key<32 && sym<0xff00)
+ else if ( fltk3::e_state&fltk3::CTRL && key<32 && sym<0xff00)
sym = key+96;
- else if ( fltk3::e_state&FL_ALT && sym<0xff00) // find the keycap of this key
+ else if ( fltk3::e_state&fltk3::ALT && sym<0xff00) // find the keycap of this key
sym = keycode_to_sym( maskedKeyCode, 0, macKeyLookUp[ maskedKeyCode ] );
fltk3::e_keysym = fltk3::e_original_keysym = sym;
// Handle FL_KP_Enter on regular keyboards and on Powerbooks
@@ -1677,11 +1677,11 @@
}
for ( Fl_X *cx = i->xidChildren; cx; cx = cx->xidNext )
{
- cx->w->clear_damage(window->damage()|FL_DAMAGE_EXPOSE);
+ cx->w->clear_damage(window->damage()|fltk3::DAMAGE_EXPOSE);
cx->flush();
cx->w->clear_damage();
}
- window->clear_damage(window->damage()|FL_DAMAGE_EXPOSE);
+ window->clear_damage(window->damage()|fltk3::DAMAGE_EXPOSE);
i->flush();
window->clear_damage();
SetPort( oldPort );
@@ -1999,9 +1999,9 @@
fltk3::e_y = py - target->y();
fl_dnd_target_window = target;
if ( fltk3::handle( FL_DND_ENTER, target ) )
- fl_cursor( FL_CURSOR_HAND ); //ShowDragHilite( ); // modify the mouse cursor?!
+ fl_cursor( fltk3::CURSOR_HAND ); //ShowDragHilite( ); // modify the mouse cursor?!
else
- fl_cursor( FL_CURSOR_DEFAULT ); //HideDragHilite( dragRef );
+ fl_cursor( fltk3::CURSOR_DEFAULT ); //HideDragHilite( dragRef );
breakMacEventLoop();
return noErr;
case kDragTrackingInWindow:
@@ -2014,15 +2014,15 @@
fltk3::e_y = py - target->y();
fl_dnd_target_window = target;
if ( fltk3::handle( FL_DND_DRAG, target ) )
- fl_cursor( FL_CURSOR_HAND ); //ShowDragHilite( ); // modify the mouse cursor?!
+ fl_cursor( fltk3::CURSOR_HAND ); //ShowDragHilite( ); // modify the mouse cursor?!
else
- fl_cursor( FL_CURSOR_DEFAULT ); //HideDragHilite( dragRef );
+ fl_cursor( fltk3::CURSOR_DEFAULT ); //HideDragHilite( dragRef );
breakMacEventLoop();
return noErr;
break;
case kDragTrackingLeaveWindow:
// HideDragHilite()
- fl_cursor( FL_CURSOR_DEFAULT ); //HideDragHilite( dragRef );
+ fl_cursor( fltk3::CURSOR_DEFAULT ); //HideDragHilite( dragRef );
if ( fl_dnd_target_window )
{
fltk3::handle( FL_DND_LEAVE, fl_dnd_target_window );
@@ -2375,7 +2375,7 @@
image(fltk3::scheme_bg_);
if (fltk3::scheme_bg_) {
labeltype(FL_NORMAL_LABEL);
- align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
+ align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
labeltype(FL_NO_LABEL);
}
@@ -2497,7 +2497,7 @@
}
// helper function to manage the current CGContext fl_gc
-extern Fl_Color fl_color_;
+extern fltk3::Color fl_color_;
extern class Fl_Font_Descriptor *fl_fontsize;
extern void fl_font(class Fl_Font_Descriptor*);
extern void fl_quartz_restore_line_style_();
Modified: branches/branch-3.0-2011/src/Fl_win32.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_win32.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_win32.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -232,8 +232,8 @@
// A.S. Dec 2009: We got reports that current winsock2.h files define
// POLLIN, POLLOUT, and POLLERR with conflicting values WRT what we
// used before (STR #2301). Therefore we must not use these values
-// for our internal purposes, but use FL_READ, FL_WRITE, and
-// FL_EXCEPT, as defined for use in fltk3::add_fd().
+// for our internal purposes, but use fltk3::READ, fltk3::WRITE, and
+// fltk3::EXCEPT, as defined for use in fltk3::add_fd().
//
static int maxfd = 0;
static fd_set fdsets[3];
@@ -291,14 +291,14 @@
fd[i].cb = cb;
fd[i].arg = v;
- if (events & FL_READ) FD_SET((unsigned)n, &fdsets[0]);
- if (events & FL_WRITE) FD_SET((unsigned)n, &fdsets[1]);
- if (events & FL_EXCEPT) FD_SET((unsigned)n, &fdsets[2]);
+ if (events & fltk3::READ) FD_SET((unsigned)n, &fdsets[0]);
+ if (events & fltk3::WRITE) FD_SET((unsigned)n, &fdsets[1]);
+ if (events & fltk3::EXCEPT) FD_SET((unsigned)n, &fdsets[2]);
if (n > maxfd) maxfd = n;
}
void fltk3::add_fd(int fd, void (*cb)(int, void*), void* v) {
- fltk3::add_fd(fd, FL_READ, cb, v);
+ fltk3::add_fd(fd, fltk3::READ, cb, v);
}
void fltk3::remove_fd(int n, int events) {
@@ -317,9 +317,9 @@
}
nfds = j;
- if (events & FL_READ) FD_CLR(unsigned(n), &fdsets[0]);
- if (events & FL_WRITE) FD_CLR(unsigned(n), &fdsets[1]);
- if (events & FL_EXCEPT) FD_CLR(unsigned(n), &fdsets[2]);
+ if (events & fltk3::READ) FD_CLR(unsigned(n), &fdsets[0]);
+ if (events & fltk3::WRITE) FD_CLR(unsigned(n), &fdsets[1]);
+ if (events & fltk3::EXCEPT) FD_CLR(unsigned(n), &fdsets[2]);
}
void fltk3::remove_fd(int n) {
@@ -373,9 +373,9 @@
for (int i = 0; i < nfds; i ++) {
SOCKET f = fd[i].fd;
short revents = 0;
- if (fl_wsk_fd_is_set(f, &fdt[0])) revents |= FL_READ;
- if (fl_wsk_fd_is_set(f, &fdt[1])) revents |= FL_WRITE;
- if (fl_wsk_fd_is_set(f, &fdt[2])) revents |= FL_EXCEPT;
+ if (fl_wsk_fd_is_set(f, &fdt[0])) revents |= fltk3::READ;
+ if (fl_wsk_fd_is_set(f, &fdt[1])) revents |= fltk3::WRITE;
+ if (fl_wsk_fd_is_set(f, &fdt[2])) revents |= fltk3::EXCEPT;
if (fd[i].events & revents) fd[i].cb(f, fd[i].arg);
}
time_to_wait = 0.0; // just peek for any messages
@@ -665,12 +665,12 @@
ulong state = fltk3::e_state & 0xff0000; // keep shift key states
#if 0
// mouse event reports some shift flags, perhaps save them?
- if (wParam & MK_SHIFT) state |= FL_SHIFT;
- if (wParam & MK_CONTROL) state |= FL_CTRL;
+ if (wParam & MK_SHIFT) state |= fltk3::SHIFT;
+ if (wParam & MK_CONTROL) state |= fltk3::CTRL;
#endif
- if (wParam & MK_LBUTTON) state |= FL_BUTTON1;
- if (wParam & MK_MBUTTON) state |= FL_BUTTON2;
- if (wParam & MK_RBUTTON) state |= FL_BUTTON3;
+ if (wParam & MK_LBUTTON) state |= fltk3::BUTTON1;
+ if (wParam & MK_MBUTTON) state |= fltk3::BUTTON2;
+ if (wParam & MK_RBUTTON) state |= fltk3::BUTTON3;
fltk3::e_state = state;
switch (what) {
@@ -879,7 +879,7 @@
if (window->type() == FL_DOUBLE_WINDOW) ValidateRgn(hWnd,0);
else ValidateRgn(hWnd,i->region);
- window->clear_damage((uchar)(window->damage()|FL_DAMAGE_EXPOSE));
+ window->clear_damage((uchar)(window->damage()|fltk3::DAMAGE_EXPOSE));
// These next two statements should not be here, so that all update
// is deferred until fltk3::flush() is called during idle. However WIN32
// apparently is very unhappy if we don't obey it and draw right now.
@@ -950,12 +950,12 @@
{
ulong state = 0;
if (GetAsyncKeyState(VK_CAPITAL)) state |= FL_CAPS_LOCK;
- if (GetAsyncKeyState(VK_NUMLOCK)) state |= FL_NUM_LOCK;
- if (GetAsyncKeyState(VK_SCROLL)) state |= FL_SCROLL_LOCK;
- if (GetAsyncKeyState(VK_CONTROL)&~1) state |= FL_CTRL;
- if (GetAsyncKeyState(VK_SHIFT)&~1) state |= FL_SHIFT;
- if (GetAsyncKeyState(VK_MENU)) state |= FL_ALT;
- if ((GetAsyncKeyState(VK_LWIN)|GetAsyncKeyState(VK_RWIN))&~1) state |= FL_META;
+ if (GetAsyncKeyState(VK_NUMLOCK)) state |= fltk3::NUM_LOCK;
+ if (GetAsyncKeyState(VK_SCROLL)) state |= fltk3::SCROLL_LOCK;
+ if (GetAsyncKeyState(VK_CONTROL)&~1) state |= fltk3::CTRL;
+ if (GetAsyncKeyState(VK_SHIFT)&~1) state |= fltk3::SHIFT;
+ if (GetAsyncKeyState(VK_MENU)) state |= fltk3::ALT;
+ if ((GetAsyncKeyState(VK_LWIN)|GetAsyncKeyState(VK_RWIN))&~1) state |= fltk3::META;
fltk3::e_state = state;
return 0;
}
@@ -993,21 +993,21 @@
case WM_SYSCHAR: {
ulong state = fltk3::e_state & 0xff000000; // keep the mouse button state
// if GetKeyState is expensive we might want to comment some of these out:
- if (GetKeyState(VK_SHIFT)&~1) state |= FL_SHIFT;
+ if (GetKeyState(VK_SHIFT)&~1) state |= fltk3::SHIFT;
if (GetKeyState(VK_CAPITAL)) state |= FL_CAPS_LOCK;
- if (GetKeyState(VK_CONTROL)&~1) state |= FL_CTRL;
+ if (GetKeyState(VK_CONTROL)&~1) state |= fltk3::CTRL;
// Alt gets reported for the Alt-GR switch on foreign keyboards.
// so we need to check the event as well to get it right:
if ((lParam&(1<<29)) //same as GetKeyState(VK_MENU)
- && uMsg != WM_CHAR) state |= FL_ALT;
- if (GetKeyState(VK_NUMLOCK)) state |= FL_NUM_LOCK;
+ && uMsg != WM_CHAR) state |= fltk3::ALT;
+ if (GetKeyState(VK_NUMLOCK)) state |= fltk3::NUM_LOCK;
if ((GetKeyState(VK_LWIN)|GetKeyState(VK_RWIN))&~1) {
// WIN32 bug? GetKeyState returns garbage if the user hit the
// meta key to pop up start menu. Sigh.
if ((GetAsyncKeyState(VK_LWIN)|GetAsyncKeyState(VK_RWIN))&~1)
- state |= FL_META;
+ state |= fltk3::META;
}
- if (GetKeyState(VK_SCROLL)) state |= FL_SCROLL_LOCK;
+ if (GetKeyState(VK_SCROLL)) state |= fltk3::SCROLL_LOCK;
fltk3::e_state = state;
static char buffer[1024];
if (uMsg == WM_CHAR || uMsg == WM_SYSCHAR) {
@@ -1019,7 +1019,7 @@
} else if (fltk3::e_keysym >= FL_KP && fltk3::e_keysym <= FL_KP_Last) {
- if (state & FL_NUM_LOCK) {
+ if (state & fltk3::NUM_LOCK) {
// Convert to regular keypress...
buffer[0] = fltk3::e_keysym-FL_KP;
fltk3::e_length = 1;
@@ -1761,7 +1761,7 @@
image(fltk3::scheme_bg_);
if (fltk3::scheme_bg_) {
labeltype(FL_NORMAL_LABEL);
- align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
+ align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
labeltype(FL_NO_LABEL);
}
Modified: branches/branch-3.0-2011/src/Fl_x.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_x.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/Fl_x.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -798,7 +798,7 @@
fl_event_time = fl_xevent->xbutton.time;
# ifdef __sgi
// get the meta key off PC keyboards:
- if (fl_key_vector[18]&0x18) fltk3::e_state |= FL_META;
+ if (fl_key_vector[18]&0x18) fltk3::e_state |= fltk3::META;
# endif
// turn off is_click if enough time or mouse movement has passed:
if (abs(fltk3::e_x_root-px)+abs(fltk3::e_y_root-py) > 3 ||
@@ -1189,7 +1189,7 @@
# endif
case GraphicsExpose:
- window->damage(FL_DAMAGE_EXPOSE, xevent.xexpose.x, xevent.xexpose.y,
+ window->damage(fltk3::DAMAGE_EXPOSE, xevent.xexpose.x, xevent.xexpose.y,
xevent.xexpose.width, xevent.xexpose.height);
return 1;
@@ -1246,7 +1246,7 @@
keysym = XKeycodeToKeysym(fl_display, keycode, 0);
}
}
- // MRS: Can't use fltk3::event_state(FL_CTRL) since the state is not
+ // MRS: Can't use fltk3::event_state(fltk3::CTRL) since the state is not
// set until set_event_xy() is called later...
if ((xevent.xkey.state & ControlMask) && keysym == '-') buffer[0] = 0x1f; // ^_
buffer[len] = 0;
@@ -1357,7 +1357,7 @@
fltk3::e_dy = +1; // Down
event = FL_MOUSEWHEEL;
} else {
- fltk3::e_state |= (FL_BUTTON1 << (xevent.xbutton.button-1));
+ fltk3::e_state |= (fltk3::BUTTON1 << (xevent.xbutton.button-1));
event = FL_PUSH;
checkdouble();
}
@@ -1382,7 +1382,7 @@
case ButtonRelease:
fltk3::e_keysym = FL_Button + xevent.xbutton.button;
set_event_xy();
- fltk3::e_state &= ~(FL_BUTTON1 << (xevent.xbutton.button-1));
+ fltk3::e_state &= ~(fltk3::BUTTON1 << (xevent.xbutton.button-1));
if (xevent.xbutton.button == Button4 ||
xevent.xbutton.button == Button5) return 0;
event = FL_RELEASE;
@@ -1835,7 +1835,7 @@
image(fltk3::scheme_bg_);
if (fltk3::scheme_bg_) {
labeltype(FL_NORMAL_LABEL);
- align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
+ align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
labeltype(FL_NO_LABEL);
}
Modified: branches/branch-3.0-2011/src/fl_ask.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_ask.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_ask.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -88,7 +88,7 @@
// w->clear_border();
// w->box(fltk3::UP_BOX);
(message = new fltk3::Box(60, 25, 340, 20))
- ->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_WRAP);
+ ->align(fltk3::ALIGN_LEFT|fltk3::ALIGN_INSIDE|fltk3::ALIGN_WRAP);
(input = new Fl_Input(60, 37, 340, 23))->hide();
{fltk3::Box* o = icon = new fltk3::Box(10, 10, 50, 50);
o->box(fltk3::THIN_UP_BOX);
@@ -103,7 +103,7 @@
button[b] = new Fl_Return_Button(x, 70, 90, 23);
else
button[b] = new Fl_Button(x, 70, 90, 23);
- button[b]->align(FL_ALIGN_INSIDE|FL_ALIGN_WRAP);
+ button[b]->align(fltk3::ALIGN_INSIDE|fltk3::ALIGN_WRAP);
button[b]->callback(button_cb,(void *)b);
}
button[0]->shortcut(FL_Escape);
Modified: branches/branch-3.0-2011/src/fl_boxtype.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_boxtype.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_boxtype.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -134,34 +134,34 @@
}
/** Draws a box of type fltk3::NO_BOX */
-void fl_no_box(int, int, int, int, Fl_Color) {}
+void fl_no_box(int, int, int, int, fltk3::Color) {}
/** Draws a frame of type fltk3::THIN_DOWN_FRAME */
-void fl_thin_down_frame(int x, int y, int w, int h, Fl_Color) {
+void fl_thin_down_frame(int x, int y, int w, int h, fltk3::Color) {
fl_frame2("WWHH",x,y,w,h);
}
/** Draws a box of type FL_THIN_DOWN_BOX */
-void fl_thin_down_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_thin_down_box(int x, int y, int w, int h, fltk3::Color c) {
fl_thin_down_frame(x,y,w,h,c);
fl_color(draw_it_active ? c : fl_inactive(c));
fl_rectf(x+1, y+1, w-2, h-2);
}
/** Draws a frame of type fltk3::THIN_UP_FRAME */
-void fl_thin_up_frame(int x, int y, int w, int h, Fl_Color) {
+void fl_thin_up_frame(int x, int y, int w, int h, fltk3::Color) {
fl_frame2("HHWW",x,y,w,h);
}
/** Draws a box of type FL_THIN_UP_BOX */
-void fl_thin_up_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
fl_thin_up_frame(x,y,w,h,c);
fl_color(draw_it_active ? c : fl_inactive(c));
fl_rectf(x+1, y+1, w-2, h-2);
}
/** Draws a frame of type fltk3::UP_FRAME */
-void fl_up_frame(int x, int y, int w, int h, Fl_Color) {
+void fl_up_frame(int x, int y, int w, int h, fltk3::Color) {
#if BORDER_WIDTH == 1
fl_frame2("HHWW",x,y,w,h);
#else
@@ -177,14 +177,14 @@
#define D2 (BORDER_WIDTH+BORDER_WIDTH)
/** Draws a box of type fltk3::UP_BOX */
-void fl_up_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_up_box(int x, int y, int w, int h, fltk3::Color c) {
fl_up_frame(x,y,w,h,c);
fl_color(draw_it_active ? c : fl_inactive(c));
fl_rectf(x+D1, y+D1, w-D2, h-D2);
}
/** Draws a frame of type fltk3::DOWN_FRAME */
-void fl_down_frame(int x, int y, int w, int h, Fl_Color) {
+void fl_down_frame(int x, int y, int w, int h, fltk3::Color) {
#if BORDER_WIDTH == 1
fl_frame2("WWHH",x,y,w,h);
#else
@@ -197,30 +197,30 @@
}
/** Draws a box of type fltk3::DOWN_BOX */
-void fl_down_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_down_box(int x, int y, int w, int h, fltk3::Color c) {
fl_down_frame(x,y,w,h,c);
fl_color(c); fl_rectf(x+D1, y+D1, w-D2, h-D2);
}
/** Draws a frame of type FL_ENGRAVED_FRAME */
-void fl_engraved_frame(int x, int y, int w, int h, Fl_Color) {
+void fl_engraved_frame(int x, int y, int w, int h, fltk3::Color) {
fl_frame("HHWWWWHH",x,y,w,h);
}
/** Draws a box of type FL_ENGRAVED_BOX */
-void fl_engraved_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_engraved_box(int x, int y, int w, int h, fltk3::Color c) {
fl_engraved_frame(x,y,w,h,c);
fl_color(draw_it_active ? c : fl_inactive(c));
fl_rectf(x+2, y+2, w-4, h-4);
}
/** Draws a frame of type FL_EMBOSSED_FRAME */
-void fl_embossed_frame(int x, int y, int w, int h, Fl_Color) {
+void fl_embossed_frame(int x, int y, int w, int h, fltk3::Color) {
fl_frame("WWHHHHWW",x,y,w,h);
}
/** Draws a box of type FL_EMBOSSED_BOX */
-void fl_embossed_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_embossed_box(int x, int y, int w, int h, fltk3::Color c) {
fl_embossed_frame(x,y,w,h,c);
fl_color(draw_it_active ? c : fl_inactive(c));
fl_rectf(x+2, y+2, w-4, h-4);
@@ -230,7 +230,7 @@
Draws a bounded rectangle with a given position, size and color.
Equivalent to drawing a box of type FL_BORDER_BOX.
*/
-void fl_rectbound(int x, int y, int w, int h, Fl_Color bgcolor) {
+void fl_rectbound(int x, int y, int w, int h, fltk3::Color bgcolor) {
fl_color(draw_it_active ? FL_BLACK : fl_inactive(FL_BLACK));
fl_rect(x, y, w, h);
fl_color(draw_it_active ? bgcolor : fl_inactive(bgcolor));
@@ -241,7 +241,7 @@
/**
Draws a frame of type FL_BORDER_FRAME.
*/
-void fl_border_frame(int x, int y, int w, int h, Fl_Color c) {
+void fl_border_frame(int x, int y, int w, int h, fltk3::Color c) {
fl_color(draw_it_active ? c : fl_inactive(c));
fl_rect(x, y, w, h);
}
@@ -398,7 +398,7 @@
\param[in] x, y, w, h position and size
\param[in] c color
*/
-void fl_draw_box(fltk3::Boxtype t, int x, int y, int w, int h, Fl_Color c) {
+void fl_draw_box(fltk3::Boxtype t, int x, int y, int w, int h, fltk3::Color c) {
if (t && fl_box_table[t].f) fl_box_table[t].f(x,y,w,h,c);
}
@@ -408,9 +408,9 @@
if (box_) draw_box((fltk3::Boxtype)box_, x_, y_, w_, h_, color_);
draw_backdrop();
}
-/** If FL_ALIGN_IMAGE_BACKDROP is set, the image or deimage will be drawn */
+/** If fltk3::ALIGN_IMAGE_BACKDROP is set, the image or deimage will be drawn */
void fltk3::Widget::draw_backdrop() const {
- if (align() & FL_ALIGN_IMAGE_BACKDROP) {
+ if (align() & fltk3::ALIGN_IMAGE_BACKDROP) {
const Fl_Image *img = image();
// if there is no image, we will not draw the deimage either
if (img && deimage() && !active_r())
@@ -420,11 +420,11 @@
}
}
/** Draws a box of type t, of color c at the widget's position and size. */
-void fltk3::Widget::draw_box(fltk3::Boxtype t, Fl_Color c) const {
+void fltk3::Widget::draw_box(fltk3::Boxtype t, fltk3::Color c) const {
draw_box(t, x_, y_, w_, h_, c);
}
/** Draws a box of type t, of color c at the position X,Y and size W,H. */
-void fltk3::Widget::draw_box(fltk3::Boxtype t, int X, int Y, int W, int H, Fl_Color c) const {
+void fltk3::Widget::draw_box(fltk3::Boxtype t, int X, int Y, int W, int H, fltk3::Color c) const {
draw_it_active = active_r();
fl_box_table[t].f(X, Y, W, H, c);
draw_it_active = 1;
Modified: branches/branch-3.0-2011/src/fl_color.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_color.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_color.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -125,9 +125,9 @@
# endif
/** Current color for drawing operations */
-Fl_Color fl_color_;
+fltk3::Color fl_color_;
-void Fl_Xlib_Graphics_Driver::color(Fl_Color i) {
+void Fl_Xlib_Graphics_Driver::color(fltk3::Color i) {
if (i & 0xffffff00) {
unsigned rgb = (unsigned)i;
fl_color((uchar)(rgb >> 24), (uchar)(rgb >> 16), (uchar)(rgb >> 8));
@@ -164,7 +164,7 @@
# if USE_COLORMAP
if (!fl_redmask) {
// find closest entry in the colormap:
- Fl_Color i =
+ fltk3::Color i =
fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
Fl_XColor &xmap = fl_xmap[fl_overlay][i];
if (xmap.mapped) return xmap.pixel;
@@ -212,7 +212,7 @@
\param[in] i color index
\return X pixel number
*/
-ulong fl_xpixel(Fl_Color i) {
+ulong fl_xpixel(fltk3::Color i) {
if (i & 0xffffff00) {
return fl_xpixel((i >> 24) & 255, (i >> 16) & 255, (i >> 8) & 255);
}
@@ -325,7 +325,7 @@
\param[in] i color index
\param[in] overlay 0 for normal, 1 for overlay color
*/
-void fltk3::free_color(Fl_Color i, int overlay) {
+void fltk3::free_color(fltk3::Color i, int overlay) {
# if HAVE_OVERLAY
# else
if (overlay) return;
@@ -349,7 +349,7 @@
\param[in] i color index
\param[in] c color
*/
-void fltk3::set_color(Fl_Color i, unsigned c) {
+void fltk3::set_color(fltk3::Color i, unsigned c) {
if (fl_cmap[i] != c) {
free_color(i,0);
# if HAVE_OVERLAY
@@ -368,7 +368,7 @@
in the next 8 bits, and the blue value in bits 8-15. The lower
8 bits will always be 0.
*/
-unsigned fltk3::get_color(Fl_Color i) {
+unsigned fltk3::get_color(fltk3::Color i) {
if (i & 0xffffff00) return (i);
else return fl_cmap[i];
}
@@ -377,8 +377,8 @@
any 8-bit RGB color. The color is not allocated until fl_color(i)
is used.
*/
-void fltk3::set_color(Fl_Color i, uchar red, uchar green, uchar blue) {
- fltk3::set_color((Fl_Color)(i & 255),
+void fltk3::set_color(fltk3::Color i, uchar red, uchar green, uchar blue) {
+ fltk3::set_color((fltk3::Color)(i & 255),
((unsigned)red<<24)+((unsigned)green<<16)+((unsigned)blue<<8));
}
/**
@@ -387,9 +387,9 @@
This form returns the red, green, and blue values
separately in referenced variables.
- See also unsigned get_color(Fl_Color c)
+ See also unsigned get_color(fltk3::Color c)
*/
-void fltk3::get_color(Fl_Color i, uchar &red, uchar &green, uchar &blue) {
+void fltk3::get_color(fltk3::Color i, uchar &red, uchar &green, uchar &blue) {
unsigned c;
if (i & 0xffffff00) c = (unsigned)i;
@@ -411,7 +411,7 @@
\param[in] color1, color2 boundary colors
\param[in] weight weighting factor
*/
-Fl_Color fl_color_average(Fl_Color color1, Fl_Color color2, float weight) {
+fltk3::Color fl_color_average(fltk3::Color color1, fltk3::Color color2, float weight) {
unsigned rgb1;
unsigned rgb2;
uchar r, g, b;
@@ -432,7 +432,7 @@
/**
Returns the inactive, dimmed version of the given color
*/
-Fl_Color fl_inactive(Fl_Color c) {
+fltk3::Color fl_inactive(fltk3::Color c) {
return fl_color_average(c, FL_GRAY, .33f);
}
@@ -444,7 +444,7 @@
\param[in] fg,bg foreground and background colors
\return contrasting color
*/
-Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) {
+fltk3::Color fl_contrast(fltk3::Color fg, fltk3::Color bg) {
unsigned c1, c2; // RGB colors
int l1, l2; // Luminosities
Modified: branches/branch-3.0-2011/src/fl_color_mac.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_color_mac.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_color_mac.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -47,9 +47,9 @@
Fl_XMap* fl_current_xmap;
-Fl_Color fl_color_;
+fltk3::Color fl_color_;
-void Fl_Quartz_Graphics_Driver::color(Fl_Color i) {
+void Fl_Quartz_Graphics_Driver::color(fltk3::Color i) {
fl_color_ = i;
int index;
uchar r, g, b;
@@ -83,7 +83,7 @@
CGContextSetRGBStrokeColor(fl_gc, fr, fg, fb, 1.0f);
}
-void fltk3::set_color(Fl_Color i, unsigned c) {
+void fltk3::set_color(fltk3::Color i, unsigned c) {
if (fl_cmap[i] != c) {
fl_cmap[i] = c;
}
Modified: branches/branch-3.0-2011/src/fl_color_win32.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_color_win32.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_color_win32.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -92,9 +92,9 @@
xmap.brush = -1;
}
-Fl_Color fl_color_;
+fltk3::Color fl_color_;
-void Fl_GDI_Graphics_Driver::color(Fl_Color i) {
+void Fl_GDI_Graphics_Driver::color(fltk3::Color i) {
if (i & 0xffffff00) {
unsigned rgb = (unsigned)i;
fl_color((uchar)(rgb >> 24), (uchar)(rgb >> 16), (uchar)(rgb >> 8));
@@ -191,12 +191,12 @@
return brushes[i].brush;
}
-void fltk3::free_color(Fl_Color i, int overlay) {
+void fltk3::free_color(fltk3::Color i, int overlay) {
if (overlay) return; // do something about GL overlay?
clear_xmap(fl_xmap[i]);
}
-void fltk3::set_color(Fl_Color i, unsigned c) {
+void fltk3::set_color(fltk3::Color i, unsigned c) {
if (fl_cmap[i] != c) {
clear_xmap(fl_xmap[i]);
fl_cmap[i] = c;
Modified: branches/branch-3.0-2011/src/fl_cursor.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_cursor.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_cursor.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -43,7 +43,7 @@
Sets the cursor for the current window to the specified shape and colors.
The cursors are defined in the <fltk3/Enumerations.H> header file.
*/
-void fl_cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
+void fl_cursor(fltk3::Cursor c, fltk3::Color fg, fltk3::Color bg) {
if (fltk3::first_window()) fltk3::first_window()->cursor(c,fg,bg);
}
/**
@@ -51,8 +51,8 @@
For back compatibility only.
*/
-void fltk3::Window::default_cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
-// if (c == FL_CURSOR_DEFAULT) c = FL_CURSOR_ARROW;
+void fltk3::Window::default_cursor(fltk3::Cursor c, fltk3::Color fg, fltk3::Color bg) {
+// if (c == fltk3::CURSOR_DEFAULT) c = fltk3::CURSOR_ARROW;
cursor_default = c;
cursor_fg = fg;
@@ -67,29 +67,29 @@
# define IDC_HAND MAKEINTRESOURCE(32649)
# endif // !IDC_HAND
-void fltk3::Window::cursor(Fl_Cursor c, Fl_Color c1, Fl_Color c2) {
+void fltk3::Window::cursor(fltk3::Cursor c, fltk3::Color c1, fltk3::Color c2) {
if (!shown()) return;
// the cursor must be set for the top level window, not for subwindows
fltk3::Window *w = window(), *toplevel = this;
while (w) { toplevel = w; w = w->window(); }
if (toplevel != this) { toplevel->cursor(c, c1, c2); return; }
// now set the actual cursor
- if (c == FL_CURSOR_DEFAULT) {
+ if (c == fltk3::CURSOR_DEFAULT) {
c = cursor_default;
}
- if (c > FL_CURSOR_NESW) {
+ if (c > fltk3::CURSOR_NESW) {
i->cursor = 0;
- } else if (c == FL_CURSOR_DEFAULT) {
+ } else if (c == fltk3::CURSOR_DEFAULT) {
i->cursor = fl_default_cursor;
} else {
LPSTR n;
switch (c) {
- case FL_CURSOR_ARROW: n = IDC_ARROW; break;
- case FL_CURSOR_CROSS: n = IDC_CROSS; break;
- case FL_CURSOR_WAIT: n = IDC_WAIT; break;
- case FL_CURSOR_INSERT: n = IDC_IBEAM; break;
- case FL_CURSOR_HELP: n = IDC_HELP; break;
- case FL_CURSOR_HAND: {
+ case fltk3::CURSOR_ARROW: n = IDC_ARROW; break;
+ case fltk3::CURSOR_CROSS: n = IDC_CROSS; break;
+ case fltk3::CURSOR_WAIT: n = IDC_WAIT; break;
+ case fltk3::CURSOR_INSERT: n = IDC_IBEAM; break;
+ case fltk3::CURSOR_HELP: n = IDC_HELP; break;
+ case fltk3::CURSOR_HAND: {
OSVERSIONINFO osvi;
// Get the OS version: Windows 98 and 2000 have a standard
@@ -103,19 +103,19 @@
osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)) n = IDC_HAND;
else n = IDC_UPARROW;
} break;
- case FL_CURSOR_MOVE: n = IDC_SIZEALL; break;
- case FL_CURSOR_N:
- case FL_CURSOR_S:
- case FL_CURSOR_NS: n = IDC_SIZENS; break;
- case FL_CURSOR_NE:
- case FL_CURSOR_SW:
- case FL_CURSOR_NESW: n = IDC_SIZENESW; break;
- case FL_CURSOR_E:
- case FL_CURSOR_W:
- case FL_CURSOR_WE: n = IDC_SIZEWE; break;
- case FL_CURSOR_SE:
- case FL_CURSOR_NW:
- case FL_CURSOR_NWSE: n = IDC_SIZENWSE; break;
+ case fltk3::CURSOR_MOVE: n = IDC_SIZEALL; break;
+ case fltk3::CURSOR_N:
+ case fltk3::CURSOR_S:
+ case fltk3::CURSOR_NS: n = IDC_SIZENS; break;
+ case fltk3::CURSOR_NE:
+ case fltk3::CURSOR_SW:
+ case fltk3::CURSOR_NESW: n = IDC_SIZENESW; break;
+ case fltk3::CURSOR_E:
+ case fltk3::CURSOR_W:
+ case fltk3::CURSOR_WE: n = IDC_SIZEWE; break;
+ case fltk3::CURSOR_SE:
+ case fltk3::CURSOR_NW:
+ case fltk3::CURSOR_NWSE: n = IDC_SIZENWSE; break;
default: n = IDC_NO; break;
}
i->cursor = LoadCursor(NULL, n);
@@ -227,8 +227,8 @@
return (CGContextRef)off;
}
-void fltk3::Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
- if (c == FL_CURSOR_DEFAULT) {
+void fltk3::Window::cursor(fltk3::Cursor c, fltk3::Color, fltk3::Color) {
+ if (c == fltk3::CURSOR_DEFAULT) {
c = cursor_default;
}
if (i) i->set_cursor(c);
@@ -245,7 +245,7 @@
uchar mask[CURSORSIZE*CURSORSIZE/8];
Cursor cursor;
} table[] = {
- {{ // FL_CURSOR_NS
+ {{ // fltk3::CURSOR_NS
0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0x80, 0x01, 0x80, 0x01,
0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00},
@@ -253,7 +253,7 @@
0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03,
0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f,
0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01}},
- {{ // FL_CURSOR_EW
+ {{ // fltk3::CURSOR_EW
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
0x0c, 0x30, 0xfe, 0x7f, 0xfe, 0x7f, 0x0c, 0x30, 0x08, 0x10, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
@@ -261,7 +261,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x1c, 0x38,
0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x1c, 0x38, 0x18, 0x18,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
- {{ // FL_CURSOR_NWSE
+ {{ // fltk3::CURSOR_NWSE
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x38, 0x00, 0x78, 0x00,
0xe8, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x17, 0x00, 0x1e, 0x00, 0x1c,
0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
@@ -269,7 +269,7 @@
0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x7c, 0x00, 0xfc, 0x00,
0xfc, 0x01, 0xec, 0x03, 0xc0, 0x37, 0x80, 0x3f, 0x00, 0x3f, 0x00, 0x3e,
0x00, 0x3f, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00}},
- {{ // FL_CURSOR_NESW
+ {{ // fltk3::CURSOR_NESW
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1c, 0x00, 0x1e,
0x00, 0x17, 0x80, 0x03, 0xc0, 0x01, 0xe8, 0x00, 0x78, 0x00, 0x38, 0x00,
0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
@@ -277,14 +277,14 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3e, 0x00, 0x3f,
0x80, 0x3f, 0xc0, 0x37, 0xec, 0x03, 0xfc, 0x01, 0xfc, 0x00, 0x7c, 0x00,
0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00}},
- {{0}, {0}} // FL_CURSOR_NONE & unknown
+ {{0}, {0}} // fltk3::CURSOR_NONE & unknown
};
-void fltk3::Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
+void fltk3::Window::cursor(fltk3::Cursor c, fltk3::Color fg, fltk3::Color bg) {
if (!shown()) return;
Cursor xc;
int deleteit = 0;
- if (c == FL_CURSOR_DEFAULT) {
+ if (c == fltk3::CURSOR_DEFAULT) {
c = cursor_default;
fg = cursor_fg;
bg = cursor_bg;
@@ -293,8 +293,8 @@
if (!c) {
xc = None;
} else {
- if (c >= FL_CURSOR_NS) {
- TableEntry *q = (c > FL_CURSOR_NESW) ? table+4 : table+(c-FL_CURSOR_NS);
+ if (c >= fltk3::CURSOR_NS) {
+ TableEntry *q = (c > fltk3::CURSOR_NESW) ? table+4 : table+(c-fltk3::CURSOR_NS);
if (!(q->cursor)) {
XColor dummy = { 0 };
Pixmap p = XCreateBitmapFromData(fl_display,
Modified: branches/branch-3.0-2011/src/fl_diamond_box.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_diamond_box.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_diamond_box.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -36,7 +36,7 @@
extern uchar* fl_gray_ramp();
-static void fl_diamond_up_box(int x,int y,int w,int h,Fl_Color bgcolor) {
+static void fl_diamond_up_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
w &= -2;
h &= -2;
int x1 = x+w/2;
@@ -52,7 +52,7 @@
fl_color(g['A']); fl_loop(x, y1, x1, y, x+w, y1, x1, y+h);
}
-static void fl_diamond_down_box(int x,int y,int w,int h,Fl_Color bgcolor) {
+static void fl_diamond_down_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
w &= -2;
h &= -2;
int x1 = x+w/2;
Modified: branches/branch-3.0-2011/src/fl_dnd_x.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_dnd_x.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_dnd_x.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -88,7 +88,7 @@
int fltk3::dnd() {
fltk3::Window *source_fl_win = fltk3::first_window();
- fltk3::first_window()->cursor(FL_CURSOR_MOVE);
+ fltk3::first_window()->cursor(fltk3::CURSOR_MOVE);
Window source_window = fl_xid(fltk3::first_window());
fl_local_grab = grabfunc;
Window target_window = 0;
@@ -192,7 +192,7 @@
}
fl_local_grab = 0;
- source_fl_win->cursor(FL_CURSOR_DEFAULT);
+ source_fl_win->cursor(fltk3::CURSOR_DEFAULT);
return 1;
}
Modified: branches/branch-3.0-2011/src/fl_draw.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_draw.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_draw.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
-// Implementation of fl_draw(const char*,int,int,int,int,Fl_Align)
+// Implementation of fl_draw(const char*,int,int,int,int,fltk3::Align)
// Used to draw all the labels and text, this routine:
// Word wraps the labels to fit into their bounding box.
// Breaks them into lines at the newlines.
@@ -177,14 +177,14 @@
}
/**
- The same as fl_draw(const char*,int,int,int,int,Fl_Align,Fl_Image*,int) with
+ The same as fl_draw(const char*,int,int,int,int,fltk3::Align,Fl_Image*,int) with
the addition of the \p callthis parameter, which is a pointer to a text drawing
function such as fl_draw(const char*, int, int, int) to do the real work
*/
void fl_draw(
const char* str, // the (multi-line) string
int x, int y, int w, int h, // bounding box
- Fl_Align align,
+ fltk3::Align align,
void (*callthis)(const char*,int,int,int),
Fl_Image* img, int draw_symbols)
{
@@ -200,7 +200,7 @@
double width;
// if the image is set as a backdrop, ignore it here
- if (img && (align & FL_ALIGN_IMAGE_BACKDROP)) img = 0;
+ if (img && (align & fltk3::ALIGN_IMAGE_BACKDROP)) img = 0;
symbol[0][0] = '\0';
symwidth[0] = 0;
@@ -226,7 +226,7 @@
}
symtotal = symwidth[0] + symwidth[1];
- imgtotal = (img && (align&FL_ALIGN_IMAGE_NEXT_TO_TEXT)) ? img->w() : 0;
+ imgtotal = (img && (align&fltk3::ALIGN_IMAGE_NEXT_TO_TEXT)) ? img->w() : 0;
int strw = 0;
int strh;
@@ -234,7 +234,7 @@
if (str) {
for (p = str, lines=0; p;) {
e = fl_expand_text(p, buf, MAXBUF, w - symtotal - imgtotal, buflen, width,
- align&FL_ALIGN_WRAP, draw_symbols);
+ align&fltk3::ALIGN_WRAP, draw_symbols);
if (strw<width) strw = (int)width;
lines++;
if (!*e || (*e == '@' && e[1] != '@' && draw_symbols)) break;
@@ -254,22 +254,22 @@
int xpos;
int ypos;
int height = fl_height();
- int imgvert = ((align&FL_ALIGN_IMAGE_NEXT_TO_TEXT)==0);
+ int imgvert = ((align&fltk3::ALIGN_IMAGE_NEXT_TO_TEXT)==0);
int imgh = img && imgvert ? img->h() : 0;
int imgw[2] = {0, 0};
symoffset = 0;
- if (align & FL_ALIGN_BOTTOM) ypos = y+h-(lines-1)*height-imgh;
- else if (align & FL_ALIGN_TOP) ypos = y+height;
+ if (align & fltk3::ALIGN_BOTTOM) ypos = y+h-(lines-1)*height-imgh;
+ else if (align & fltk3::ALIGN_TOP) ypos = y+height;
else ypos = y+(h-lines*height-imgh)/2+height;
// draw the image unless the "text over image" alignment flag is set...
- if (img && imgvert && !(align & FL_ALIGN_TEXT_OVER_IMAGE)) {
+ if (img && imgvert && !(align & fltk3::ALIGN_TEXT_OVER_IMAGE)) {
if (img->w() > symoffset) symoffset = img->w();
- if (align & FL_ALIGN_LEFT) xpos = x + symwidth[0];
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - img->w() - symwidth[1];
+ if (align & fltk3::ALIGN_LEFT) xpos = x + symwidth[0];
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - img->w() - symwidth[1];
else xpos = x + (w - img->w() - symtotal) / 2 + symwidth[0];
img->draw(xpos, ypos - height);
@@ -277,21 +277,21 @@
}
// draw the image to the side of the text
- if (img && !imgvert /* && (align & !FL_ALIGN_TEXT_NEXT_TO_IMAGE)*/ ) {
- if (align & FL_ALIGN_TEXT_OVER_IMAGE) { // image is right of text
+ if (img && !imgvert /* && (align & !fltk3::ALIGN_TEXT_NEXT_TO_IMAGE)*/ ) {
+ if (align & fltk3::ALIGN_TEXT_OVER_IMAGE) { // image is right of text
imgw[1] = img->w();
- if (align & FL_ALIGN_LEFT) xpos = x + symwidth[0] + strw + 1;
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - symwidth[1] - imgw[1] + 1;
+ if (align & fltk3::ALIGN_LEFT) xpos = x + symwidth[0] + strw + 1;
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - symwidth[1] - imgw[1] + 1;
else xpos = x + (w - strw - symtotal - imgw[1]) / 2 + symwidth[0] + strw + 1;
} else { // image is to the left of the text
imgw[0] = img->w();
- if (align & FL_ALIGN_LEFT) xpos = x + symwidth[0] - 1;
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - symwidth[1] - strw - imgw[0] - 1;
+ if (align & fltk3::ALIGN_LEFT) xpos = x + symwidth[0] - 1;
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - symwidth[1] - strw - imgw[0] - 1;
else xpos = x + (w - strw - symtotal - imgw[0]) / 2 - 1;
}
int yimg = ypos - height;
- if (align & FL_ALIGN_TOP) ;
- else if (align & FL_ALIGN_BOTTOM) yimg += strh - img->h() - 1;
+ if (align & fltk3::ALIGN_TOP) ;
+ else if (align & fltk3::ALIGN_BOTTOM) yimg += strh - img->h() - 1;
else yimg += (strh - img->h() - 1) / 2;
img->draw(xpos, yimg);
}
@@ -301,13 +301,13 @@
int desc = fl_descent();
for (p=str; ; ypos += height) {
if (lines>1) e = fl_expand_text(p, buf, MAXBUF, w - symtotal - imgtotal, buflen,
- width, align&FL_ALIGN_WRAP, draw_symbols);
+ width, align&fltk3::ALIGN_WRAP, draw_symbols);
else e = "";
if (width > symoffset) symoffset = (int)(width + 0.5);
- if (align & FL_ALIGN_LEFT) xpos = x + symwidth[0] + imgw[0];
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - (int)(width + .5) - symwidth[1] - imgw[1];
+ if (align & fltk3::ALIGN_LEFT) xpos = x + symwidth[0] + imgw[0];
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - (int)(width + .5) - symwidth[1] - imgw[1];
else xpos = x + (w - (int)(width + .5) - symtotal - imgw[0] - imgw[1]) / 2 + symwidth[0] + imgw[0];
callthis(buf,buflen,xpos,ypos-desc);
@@ -321,11 +321,11 @@
}
// draw the image if the "text over image" alignment flag is set...
- if (img && imgvert && (align & FL_ALIGN_TEXT_OVER_IMAGE)) {
+ if (img && imgvert && (align & fltk3::ALIGN_TEXT_OVER_IMAGE)) {
if (img->w() > symoffset) symoffset = img->w();
- if (align & FL_ALIGN_LEFT) xpos = x + symwidth[0];
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - img->w() - symwidth[1];
+ if (align & fltk3::ALIGN_LEFT) xpos = x + symwidth[0];
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - img->w() - symwidth[1];
else xpos = x + (w - img->w() - symtotal) / 2 + symwidth[0];
img->draw(xpos, ypos);
@@ -334,12 +334,12 @@
// draw the symbols, if any...
if (symwidth[0]) {
// draw to the left
- if (align & FL_ALIGN_LEFT) xpos = x;
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - symtotal - symoffset;
+ if (align & fltk3::ALIGN_LEFT) xpos = x;
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - symtotal - symoffset;
else xpos = x + (w - symoffset - symtotal) / 2;
- if (align & FL_ALIGN_BOTTOM) ypos = y + h - symwidth[0];
- else if (align & FL_ALIGN_TOP) ypos = y;
+ if (align & fltk3::ALIGN_BOTTOM) ypos = y + h - symwidth[0];
+ else if (align & fltk3::ALIGN_TOP) ypos = y;
else ypos = y + (h - symwidth[0]) / 2;
fl_draw_symbol(symbol[0], xpos, ypos, symwidth[0], symwidth[0], fl_color());
@@ -347,12 +347,12 @@
if (symwidth[1]) {
// draw to the right
- if (align & FL_ALIGN_LEFT) xpos = x + symoffset + symwidth[0];
- else if (align & FL_ALIGN_RIGHT) xpos = x + w - symwidth[1];
+ if (align & fltk3::ALIGN_LEFT) xpos = x + symoffset + symwidth[0];
+ else if (align & fltk3::ALIGN_RIGHT) xpos = x + w - symwidth[1];
else xpos = x + (w - symoffset - symtotal) / 2 + symoffset + symwidth[0];
- if (align & FL_ALIGN_BOTTOM) ypos = y + h - symwidth[1];
- else if (align & FL_ALIGN_TOP) ypos = y;
+ if (align & fltk3::ALIGN_BOTTOM) ypos = y + h - symwidth[1];
+ else if (align & fltk3::ALIGN_TOP) ypos = y;
else ypos = y + (h - symwidth[1]) / 2;
fl_draw_symbol(symbol[1], xpos, ypos, symwidth[1], symwidth[1], fl_color());
@@ -365,7 +365,7 @@
The string is formatted and aligned inside the passed box.
Handles '\\t' and '\\n', expands all other control characters to '^X',
and aligns inside or against the edges of the box.
- See fltk3::Widget::align() for values of \p align. The value FL_ALIGN_INSIDE
+ See fltk3::Widget::align() for values of \p align. The value fltk3::ALIGN_INSIDE
is ignored, as this function always prints inside the box.
If \p img is provided and is not \p NULL, the image is drawn above or
below the text as specified by the \p align value.
@@ -376,16 +376,16 @@
void fl_draw(
const char* str,
int x, int y, int w, int h,
- Fl_Align align,
+ fltk3::Align align,
Fl_Image* img,
int draw_symbols)
{
if ((!str || !*str) && !img) return;
- if (w && h && !fl_not_clipped(x, y, w, h) && (align & FL_ALIGN_INSIDE)) return;
- if (align & FL_ALIGN_CLIP)
+ if (w && h && !fl_not_clipped(x, y, w, h) && (align & fltk3::ALIGN_INSIDE)) return;
+ if (align & fltk3::ALIGN_CLIP)
fl_push_clip(x, y, w, h);
fl_draw(str, x, y, w, h, align, fl_draw, img, draw_symbols);
- if (align & FL_ALIGN_CLIP)
+ if (align & fltk3::ALIGN_CLIP)
fl_pop_clip();
}
Modified: branches/branch-3.0-2011/src/fl_draw_image.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_draw_image.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_draw_image.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -98,7 +98,7 @@
r += from[0]; if (r < 0) r = 0; else if (r>255) r = 255;
g += from[1]; if (g < 0) g = 0; else if (g>255) g = 255;
b += from[2]; if (b < 0) b = 0; else if (b>255) b = 255;
- Fl_Color i = fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
+ fltk3::Color i = fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
Fl_XColor& xmap = fl_xmap[0][i];
if (!xmap.mapped) {if (!fl_redmask) fl_xpixel(r,g,b); else fl_xpixel(i);}
r -= xmap.r;
@@ -127,7 +127,7 @@
r += from[0]; if (r < 0) r = 0; else if (r>255) r = 255;
g += from[0]; if (g < 0) g = 0; else if (g>255) g = 255;
b += from[0]; if (b < 0) b = 0; else if (b>255) b = 255;
- Fl_Color i = fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
+ fltk3::Color i = fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
Fl_XColor& xmap = fl_xmap[0][i];
if (!xmap.mapped) {if (!fl_redmask) fl_xpixel(r,g,b); else fl_xpixel(i);}
r -= xmap.r;
Modified: branches/branch-3.0-2011/src/fl_draw_pixmap.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_draw_pixmap.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_draw_pixmap.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -171,7 +171,7 @@
\param[in] bg background color
\returns 0 if there was any error decoding the XPM data.
*/
-int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,Fl_Color bg) {
+int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,fltk3::Color bg) {
return fl_draw_pixmap((const char*const*)data,x,y,bg);
}
@@ -211,9 +211,9 @@
/**
Draw XPM image data, with the top-left corner at the given position.
- \see fl_draw_pixmap(char* const* data, int x, int y, Fl_Color bg)
+ \see fl_draw_pixmap(char* const* data, int x, int y, fltk3::Color bg)
*/
-int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
+int fl_draw_pixmap(const char*const* cdata, int x, int y, fltk3::Color bg) {
pixmap_data d;
if (!fl_measure_pixmap(cdata, d.w, d.h)) return 0;
const uchar*const* data = (const uchar*const*)(cdata+1);
Modified: branches/branch-3.0-2011/src/fl_engraved_label.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_engraved_label.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_engraved_label.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -34,29 +34,29 @@
// data[] is dx, dy, color triples
static void innards(
- const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align,
+ const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align,
int data[][3], int n)
{
- Fl_Align a1 = align;
- if (a1 & FL_ALIGN_CLIP) {
- fl_push_clip(X, Y, W, H); a1 = (Fl_Align)(a1&~FL_ALIGN_CLIP);}
+ fltk3::Align a1 = align;
+ if (a1 & fltk3::ALIGN_CLIP) {
+ fl_push_clip(X, Y, W, H); a1 = (fltk3::Align)(a1&~fltk3::ALIGN_CLIP);}
fl_font((fltk3::Font)o->font, o->size);
for (int i = 0; i < n; i++) {
- fl_color((Fl_Color)(i < n-1 ? data[i][2] : o->color));
+ fl_color((fltk3::Color)(i < n-1 ? data[i][2] : o->color));
fl_draw(o->value, X+data[i][0], Y+data[i][1], W, H, a1);
}
- if (align & FL_ALIGN_CLIP) fl_pop_clip();
+ if (align & fltk3::ALIGN_CLIP) fl_pop_clip();
}
static void fl_shadow_label(
- const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
+ const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
static int data[2][3] = {{2,2,FL_DARK3},{0,0,0}};
innards(o, X, Y, W, H, align, data, 2);
}
static void fl_engraved_label(
- const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
+ const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
static int data[7][3] = {
{1,0,FL_LIGHT3},{1,1,FL_LIGHT3},{0,1,FL_LIGHT3},
@@ -66,7 +66,7 @@
}
static void fl_embossed_label(
- const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
+ const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
static int data[7][3] = {
{-1,0,FL_LIGHT3},{-1,-1,FL_LIGHT3},{0,-1,FL_LIGHT3},
Modified: branches/branch-3.0-2011/src/fl_font_mac.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_font_mac.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_font_mac.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -406,7 +406,7 @@
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-static CGColorRef flcolortocgcolor(Fl_Color i)
+static CGColorRef flcolortocgcolor(fltk3::Color i)
{
uchar r, g, b;
fltk3::get_color(i, r, g, b);
Modified: branches/branch-3.0-2011/src/fl_gtk.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_gtk.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_gtk.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -38,13 +38,13 @@
extern void fl_internal_boxtype(fltk3::Boxtype, Fl_Box_Draw_F*);
-static void gtk_color(Fl_Color c) {
+static void gtk_color(fltk3::Color c) {
if (fltk3::draw_box_active()) fl_color(c);
else fl_color(fl_inactive(c));
}
-static void gtk_up_frame(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_up_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fl_color_average(FL_WHITE, c, 0.5));
fl_xyline(x + 2, y + 1, x + w - 3);
fl_yxline(x + 1, y + 2, y + h - 3);
@@ -63,7 +63,7 @@
}
-static void gtk_up_box(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_up_frame(x, y, w, h, c);
gtk_color(fl_color_average(FL_WHITE, c, 0.4f));
@@ -84,7 +84,7 @@
}
-static void gtk_down_frame(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_down_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fl_color_average(FL_BLACK, c, 0.5));
fl_begin_loop();
fl_vertex(x, y + 2);
@@ -106,7 +106,7 @@
}
-static void gtk_down_box(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_down_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_down_frame(x, y, w, h, c);
gtk_color(c);
@@ -115,7 +115,7 @@
}
-static void gtk_thin_up_frame(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_thin_up_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fl_color_average(FL_WHITE, c, 0.6f));
fl_xyline(x + 1, y, x + w - 2);
fl_yxline(x, y + 1, y + h - 2);
@@ -126,7 +126,7 @@
}
-static void gtk_thin_up_box(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_thin_up_frame(x, y, w, h, c);
gtk_color(fl_color_average(FL_WHITE, c, 0.4f));
@@ -146,7 +146,7 @@
}
-static void gtk_thin_down_frame(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_thin_down_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fl_color_average(FL_BLACK, c, 0.4f));
fl_xyline(x + 1, y, x + w - 2);
fl_yxline(x, y + 1, y + h - 2);
@@ -157,7 +157,7 @@
}
-static void gtk_thin_down_box(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_thin_down_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_thin_down_frame(x, y, w, h, c);
gtk_color(c);
@@ -212,7 +212,7 @@
}
}
-void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) {
+void gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c);
draw(FILL, x, y, w, h, 2);
@@ -243,7 +243,7 @@
draw(CLOSED, x, y, w, h, 0);
}
-void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) {
+void gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c);
draw(FILL, x, y, w, h, 2);
@@ -260,7 +260,7 @@
#else
-static void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(c);
fl_pie(x, y, w, h, 0.0, 360.0);
gtk_color(fl_color_average(FL_WHITE, c, 0.5f));
@@ -272,7 +272,7 @@
}
-static void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) {
+static void gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(c);
fl_pie(x, y, w, h, 0.0, 360.0);
gtk_color(fl_color_average(FL_BLACK, c, 0.2));
Modified: branches/branch-3.0-2011/src/fl_labeltype.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_labeltype.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_labeltype.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -36,13 +36,13 @@
#include <fltk3/Fl_Image.H>
void
-fl_no_label(const Fl_Label*,int,int,int,int,Fl_Align) {}
+fl_no_label(const Fl_Label*,int,int,int,int,fltk3::Align) {}
void
-fl_normal_label(const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
+fl_normal_label(const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
fl_font(o->font, o->size);
- fl_color((Fl_Color)o->color);
+ fl_color((fltk3::Color)o->color);
fl_draw(o->value, X, Y, W, H, align, o->image);
}
@@ -84,7 +84,7 @@
////////////////////////////////////////////////////////////////
/** Draws a label with arbitrary alignment in an arbitrary box. */
-void Fl_Label::draw(int X, int Y, int W, int H, Fl_Align align) const {
+void Fl_Label::draw(int X, int Y, int W, int H, fltk3::Align align) const {
if (!value && !image) return;
table[type](this, X, Y, W, H, align);
}
@@ -109,7 +109,7 @@
void fltk3::Widget::draw_label() const {
int X = x_+fltk3::box_dx(box());
int W = w_-fltk3::box_dw(box());
- if (W > 11 && align()&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT)) {X += 3; W -= 6;}
+ if (W > 11 && align()&(fltk3::ALIGN_LEFT|fltk3::ALIGN_RIGHT)) {X += 3; W -= 6;}
draw_label(X, y_+fltk3::box_dy(box()), W, h_-fltk3::box_dh(box()));
}
@@ -118,18 +118,18 @@
*/
void fltk3::Widget::draw_label(int X, int Y, int W, int H) const {
// quit if we are not drawing a label inside the widget:
- if ((align()&15) && !(align() & FL_ALIGN_INSIDE)) return;
+ if ((align()&15) && !(align() & fltk3::ALIGN_INSIDE)) return;
draw_label(X,Y,W,H,align());
}
/** Draws the label in an arbitrary bounding box with an arbitrary alignment.
Anybody can call this to force the label to draw anywhere.
*/
-void fltk3::Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const {
+void fltk3::Widget::draw_label(int X, int Y, int W, int H, fltk3::Align a) const {
if (flags()&SHORTCUT_LABEL) fl_draw_shortcut = 1;
Fl_Label l1 = label_;
if (!active_r()) {
- l1.color = fl_inactive((Fl_Color)l1.color);
+ l1.color = fl_inactive((fltk3::Color)l1.color);
if (l1.deimage) l1.image = l1.deimage;
}
l1.draw(X,Y,W,H,a);
Modified: branches/branch-3.0-2011/src/fl_oval_box.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_oval_box.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_oval_box.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -32,22 +32,22 @@
#include <fltk3/run.h>
#include <fltk3/fl_draw.H>
-static void fl_oval_flat_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_oval_flat_box(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c);
fl_pie(x, y, w, h, 0, 360);
}
-static void fl_oval_frame(int x, int y, int w, int h, Fl_Color c) {
+static void fl_oval_frame(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c);
fl_arc(x, y, w, h, 0, 360);
}
-static void fl_oval_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_oval_box(int x, int y, int w, int h, fltk3::Color c) {
fl_oval_flat_box(x,y,w,h,c);
fl_oval_frame(x,y,w,h,FL_BLACK);
}
-static void fl_oval_shadow_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_oval_shadow_box(int x, int y, int w, int h, fltk3::Color c) {
fl_oval_flat_box(x+3,y+3,w,h,FL_DARK3);
fl_oval_box(x,y,w,h,c);
}
Modified: branches/branch-3.0-2011/src/fl_plastic.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_plastic.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_plastic.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -46,11 +46,11 @@
extern uchar *fl_gray_ramp();
-inline Fl_Color shade_color(uchar gc, Fl_Color bc) {
+inline fltk3::Color shade_color(uchar gc, fltk3::Color bc) {
#ifdef USE_OLD_PLASTIC_COLOR
- return fl_color_average((Fl_Color)gc, bc, 0.75f);
+ return fl_color_average((fltk3::Color)gc, bc, 0.75f);
#else
- unsigned grgb = fltk3::get_color((Fl_Color)gc),
+ unsigned grgb = fltk3::get_color((fltk3::Color)gc),
brgb = fltk3::get_color(bc);
int red, green, blue, gray;
@@ -79,7 +79,7 @@
}
-static void frame_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) {
+static void frame_rect(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
uchar *g = fl_gray_ramp();
int b = strlen(c) / 4 + 1;
@@ -99,7 +99,7 @@
}
-static void frame_round(int x, int y, int w, int h, const char *c, Fl_Color bc) {
+static void frame_round(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
uchar *g = fl_gray_ramp();
int b = strlen(c) / 4 + 1;
@@ -153,7 +153,7 @@
}
-static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) {
+static void shade_rect(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
uchar *g = fl_gray_ramp();
int i, j;
int clen = strlen(c) - 1;
@@ -225,7 +225,7 @@
}
}
-static void shade_round(int x, int y, int w, int h, const char *c, Fl_Color bc) {
+static void shade_round(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
uchar *g = fl_gray_ramp();
int i;
int clen = strlen(c) - 1;
@@ -279,12 +279,12 @@
}
-static void up_frame(int x, int y, int w, int h, Fl_Color c) {
+static void up_frame(int x, int y, int w, int h, fltk3::Color c) {
frame_rect(x, y, w, h - 1, "KLDIIJLM", c);
}
-static void narrow_thin_box(int x, int y, int w, int h, Fl_Color c) {
+static void narrow_thin_box(int x, int y, int w, int h, fltk3::Color c) {
if (h<=0 || w<=0) return;
uchar *g = fl_gray_ramp();
fl_color(shade_color(g['R'], c));
@@ -301,7 +301,7 @@
}
-static void thin_up_box(int x, int y, int w, int h, Fl_Color c) {
+static void thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
#ifdef USE_OLD_PLASTIC_BOX
shade_rect(x + 2, y + 2, w - 4, h - 5, "RVQNOPQRSTUVWVQ", c);
up_frame(x, y, w, h, c);
@@ -316,7 +316,7 @@
}
-static void up_box(int x, int y, int w, int h, Fl_Color c) {
+static void up_box(int x, int y, int w, int h, fltk3::Color c) {
#ifdef USE_OLD_PLASTIC_BOX
shade_rect(x + 2, y + 2, w - 4, h - 5, "RVQNOPQRSTUVWVQ", c);
up_frame(x, y, w, h, c);
@@ -331,18 +331,18 @@
}
-static void up_round(int x, int y, int w, int h, Fl_Color c) {
+static void up_round(int x, int y, int w, int h, fltk3::Color c) {
shade_round(x, y, w, h, "RVQNOPQRSTUVWVQ", c);
frame_round(x, y, w, h, "IJLM", c);
}
-static void down_frame(int x, int y, int w, int h, Fl_Color c) {
+static void down_frame(int x, int y, int w, int h, fltk3::Color c) {
frame_rect(x, y, w, h - 1, "LLLLTTRR", c);
}
-static void down_box(int x, int y, int w, int h, Fl_Color c) {
+static void down_box(int x, int y, int w, int h, fltk3::Color c) {
if (w > 6 && h > 6) {
shade_rect(x + 2, y + 2, w - 4, h - 5, "STUVWWWVT", c);
down_frame(x, y, w, h, c);
@@ -353,7 +353,7 @@
}
-static void down_round(int x, int y, int w, int h, Fl_Color c) {
+static void down_round(int x, int y, int w, int h, fltk3::Color c) {
shade_round(x, y, w, h, "STUVWWWVT", c);
frame_round(x, y, w, h, "IJLM", c);
}
Modified: branches/branch-3.0-2011/src/fl_round_box.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_round_box.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_round_box.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -41,7 +41,7 @@
enum {UPPER_LEFT, LOWER_RIGHT, CLOSED, FILL};
-static void draw(int which, int x,int y,int w,int h, int inset, Fl_Color color)
+static void draw(int which, int x,int y,int w,int h, int inset, fltk3::Color color)
{
if (inset*2 >= w) inset = (w-1)/2;
if (inset*2 >= h) inset = (h-1)/2;
@@ -82,32 +82,32 @@
extern uchar* fl_gray_ramp();
-void fl_round_down_box(int x, int y, int w, int h, Fl_Color bgcolor) {
+void fl_round_down_box(int x, int y, int w, int h, fltk3::Color bgcolor) {
uchar *g = fl_gray_ramp();
draw(FILL, x, y, w, h, 2, bgcolor);
- draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g['N']);
- draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g['H']);
- draw(UPPER_LEFT, x, y, w, h, 0, (Fl_Color)g['N']);
- draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g['H']);
- draw(LOWER_RIGHT, x, y, w, h, 0, (Fl_Color)g['S']);
- draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g['U']);
- draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g['U']);
- draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g['W']);
- draw(CLOSED, x, y, w, h, 2, (Fl_Color)g['A']);
+ draw(UPPER_LEFT, x+1, y, w-2, h, 0, (fltk3::Color)g['N']);
+ draw(UPPER_LEFT, x+1, y, w-2, h, 1, (fltk3::Color)g['H']);
+ draw(UPPER_LEFT, x, y, w, h, 0, (fltk3::Color)g['N']);
+ draw(UPPER_LEFT, x, y, w, h, 1, (fltk3::Color)g['H']);
+ draw(LOWER_RIGHT, x, y, w, h, 0, (fltk3::Color)g['S']);
+ draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (fltk3::Color)g['U']);
+ draw(LOWER_RIGHT, x, y, w, h, 1, (fltk3::Color)g['U']);
+ draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (fltk3::Color)g['W']);
+ draw(CLOSED, x, y, w, h, 2, (fltk3::Color)g['A']);
}
-void fl_round_up_box(int x, int y, int w, int h, Fl_Color bgcolor) {
+void fl_round_up_box(int x, int y, int w, int h, fltk3::Color bgcolor) {
uchar *g = fl_gray_ramp();
draw(FILL, x, y, w, h, 2, bgcolor);
- draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g['H']);
- draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g['N']);
- draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g['H']);
- draw(LOWER_RIGHT, x, y, w, h, 2, (Fl_Color)g['N']);
- draw(UPPER_LEFT, x, y, w, h, 2, (Fl_Color)g['U']);
- draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g['S']);
- draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g['W']);
- draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g['U']);
- draw(CLOSED, x, y, w, h, 0, (Fl_Color)g['A']);
+ draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (fltk3::Color)g['H']);
+ draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (fltk3::Color)g['N']);
+ draw(LOWER_RIGHT, x, y, w, h, 1, (fltk3::Color)g['H']);
+ draw(LOWER_RIGHT, x, y, w, h, 2, (fltk3::Color)g['N']);
+ draw(UPPER_LEFT, x, y, w, h, 2, (fltk3::Color)g['U']);
+ draw(UPPER_LEFT, x+1, y, w-2, h, 1, (fltk3::Color)g['S']);
+ draw(UPPER_LEFT, x, y, w, h, 1, (fltk3::Color)g['W']);
+ draw(UPPER_LEFT, x+1, y, w-2, h, 0, (fltk3::Color)g['U']);
+ draw(CLOSED, x, y, w, h, 0, (fltk3::Color)g['A']);
}
extern void fl_internal_boxtype(fltk3::Boxtype, Fl_Box_Draw_F*);
Modified: branches/branch-3.0-2011/src/fl_rounded_box.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_rounded_box.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_rounded_box.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -54,20 +54,20 @@
if (fill) fl_end_polygon(); else fl_end_loop();
}
-static void fl_rflat_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_rflat_box(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c); rbox(1, x, y, w, h); rbox(0, x, y, w, h);
}
-static void fl_rounded_frame(int x, int y, int w, int h, Fl_Color c) {
+static void fl_rounded_frame(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c); rbox(0, x, y, w, h);
}
-static void fl_rounded_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_rounded_box(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c); rbox(1, x, y, w, h);
fl_color(FL_BLACK); rbox(0, x, y, w, h);
}
-static void fl_rshadow_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_rshadow_box(int x, int y, int w, int h, fltk3::Color c) {
// draw shadow:
fl_color(FL_DARK3);
rbox(1, x+BW, y+BW, w, h);
Modified: branches/branch-3.0-2011/src/fl_shadow_box.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_shadow_box.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_shadow_box.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -30,7 +30,7 @@
#define BW 3
-static void fl_shadow_frame(int x, int y, int w, int h, Fl_Color c) {
+static void fl_shadow_frame(int x, int y, int w, int h, fltk3::Color c) {
fl_color(FL_DARK3);
fl_rectf(x+BW, y+h-BW, w - BW, BW);
fl_rectf(x+w-BW, y+BW, BW, h - BW);
@@ -38,7 +38,7 @@
fl_rect(x,y,w-BW,h-BW);
}
-static void fl_shadow_box(int x, int y, int w, int h, Fl_Color c) {
+static void fl_shadow_box(int x, int y, int w, int h, fltk3::Color c) {
fl_color(c);
fl_rectf(x+1,y+1,w-2-BW,h-2-BW);
fl_shadow_frame(x,y,w,h,FL_GRAY0);
Modified: branches/branch-3.0-2011/src/fl_shortcut.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_shortcut.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_shortcut.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -33,11 +33,11 @@
//
// To make it easier to match some things it is more complex:
//
-// Only FL_META, FL_ALT, FL_SHIFT, and FL_CTRL must be "off". A
+// Only fltk3::META, fltk3::ALT, fltk3::SHIFT, and fltk3::CTRL must be "off". A
// zero in the other shift flags indicates "dont care".
//
// It also checks against the first character of fltk3::event_text(),
-// and zero for FL_SHIFT means "don't care".
+// and zero for fltk3::SHIFT means "don't care".
// This allows punctuation shortcuts like "#" to work (rather than
// calling it "shift+3" on a US keyboard)
@@ -63,9 +63,9 @@
int fltk3::test_shortcut(unsigned int shortcut) {
if (!shortcut) return 0;
- unsigned int v = shortcut & FL_KEY_MASK;
+ unsigned int v = shortcut & fltk3::KEY_MASK;
if (((unsigned)fl_tolower(v))!=v) {
- shortcut |= FL_SHIFT;
+ shortcut |= fltk3::SHIFT;
}
int shift = fltk3::event_state();
@@ -74,19 +74,19 @@
// record shift flags that are wrong:
int mismatch = (shortcut^shift)&0x7fff0000;
// these three must always be correct:
- if (mismatch&(FL_META|FL_ALT|FL_CTRL)) return 0;
+ if (mismatch&(fltk3::META|fltk3::ALT|fltk3::CTRL)) return 0;
- unsigned int key = shortcut & FL_KEY_MASK;
+ unsigned int key = shortcut & fltk3::KEY_MASK;
// if shift is also correct, check for exactly equal keysyms:
- if (!(mismatch&(FL_SHIFT)) && key == (unsigned)fltk3::event_key()) return 1;
+ if (!(mismatch&(fltk3::SHIFT)) && key == (unsigned)fltk3::event_key()) return 1;
// try matching utf8, ignore shift:
unsigned int firstChar = fl_utf8decode(fltk3::event_text(), fltk3::event_text()+fltk3::event_length(), 0);
- if ( ! (FL_CAPS_LOCK&shift) && key==firstChar) return 1;
+ if ( ! (fltk3::CAPS_LOCK&shift) && key==firstChar) return 1;
// kludge so that Ctrl+'_' works (as opposed to Ctrl+'^_'):
- if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F
+ if ((shift&fltk3::CTRL) && key >= 0x3f && key <= 0x5F
&& firstChar==(key^0x40)) return 1; // firstChar should be within a-z
return 0;
}
@@ -194,24 +194,24 @@
if (eom) *eom = p;
if (!shortcut) {*p = 0; return buf;}
// fix upper case shortcuts
- unsigned int v = shortcut & FL_KEY_MASK;
+ unsigned int v = shortcut & fltk3::KEY_MASK;
if (((unsigned)fl_tolower(v))!=v) {
- shortcut |= FL_SHIFT;
+ shortcut |= fltk3::SHIFT;
}
#ifdef __APPLE__
// this column contains utf8 characters - v
- if (shortcut & FL_SHIFT) {strcpy(p,"\xe2\x87\xa7"); p += 3;} // upwards white arrow
- if (shortcut & FL_CTRL) {strcpy(p,"\xe2\x8c\x83"); p += 3;} // up arrowhead
- if (shortcut & FL_ALT) {strcpy(p,"\xe2\x8c\xa5"); p += 3;} // alternative key symbol
- if (shortcut & FL_META) {strcpy(p,"\xe2\x8c\x98"); p += 3;} // place of interest sign
+ if (shortcut & fltk3::SHIFT) {strcpy(p,"\xe2\x87\xa7"); p += 3;} // upwards white arrow
+ if (shortcut & fltk3::CTRL) {strcpy(p,"\xe2\x8c\x83"); p += 3;} // up arrowhead
+ if (shortcut & fltk3::ALT) {strcpy(p,"\xe2\x8c\xa5"); p += 3;} // alternative key symbol
+ if (shortcut & fltk3::META) {strcpy(p,"\xe2\x8c\x98"); p += 3;} // place of interest sign
#else
- if (shortcut & FL_META) {strcpy(p,"Meta+"); p += 5;}
- if (shortcut & FL_ALT) {strcpy(p,"Alt+"); p += 4;}
- if (shortcut & FL_SHIFT) {strcpy(p,"Shift+"); p += 6;}
- if (shortcut & FL_CTRL) {strcpy(p,"Ctrl+"); p += 5;}
+ if (shortcut & fltk3::META) {strcpy(p,"Meta+"); p += 5;}
+ if (shortcut & fltk3::ALT) {strcpy(p,"Alt+"); p += 4;}
+ if (shortcut & fltk3::SHIFT) {strcpy(p,"Shift+"); p += 6;}
+ if (shortcut & fltk3::CTRL) {strcpy(p,"Ctrl+"); p += 5;}
#endif // __APPLE__
if (eom) *eom = p;
- unsigned int key = shortcut & FL_KEY_MASK;
+ unsigned int key = shortcut & fltk3::KEY_MASK;
#if defined(WIN32) || defined(__APPLE__) // if not X
if (key >= FL_F && key <= FL_F_Last) {
*p++ = 'F';
@@ -273,7 +273,7 @@
Emulation of XForms named shortcuts.
Converts ascii shortcut specifications (eg. "^c")
- into the FLTK integer equivalent (eg. FL_CTRL+'c')
+ into the FLTK integer equivalent (eg. fltk3::CTRL+'c')
These ascii characters are used to specify the various keyboard modifier keys:
\verbatim
@@ -285,9 +285,9 @@
unsigned int fl_old_shortcut(const char* s) {
if (!s || !*s) return 0;
unsigned int n = 0;
- if (*s == '#') {n |= FL_ALT; s++;}
- if (*s == '+') {n |= FL_SHIFT; s++;}
- if (*s == '^') {n |= FL_CTRL; s++;}
+ if (*s == '#') {n |= fltk3::ALT; s++;}
+ if (*s == '+') {n |= fltk3::SHIFT; s++;}
+ if (*s == '^') {n |= fltk3::CTRL; s++;}
if (*s && s[1]) return n | (int)strtol(s,0,0); // allow 0xf00 to get any key
return n | *s;
}
@@ -342,7 +342,7 @@
int fltk3::Widget::test_shortcut(const char *t, const bool require_alt) {
if (!t) return 0;
// for menubars etc. shortcuts must work only if the Alt modifier is pressed
- if (require_alt && fltk3::event_state(FL_ALT)==0) return 0;
+ if (require_alt && fltk3::event_state(fltk3::ALT)==0) return 0;
unsigned int c = fl_utf8decode(fltk3::event_text(), fltk3::event_text()+fltk3::event_length(), 0);
if (!c) return 0;
if (c == label_shortcut(t))
Modified: branches/branch-3.0-2011/src/fl_show_colormap.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_show_colormap.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_show_colormap.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -39,25 +39,25 @@
Pretty much unchanged from Forms.
*/
class ColorMenu : public fltk3::Window {
- Fl_Color initial;
- Fl_Color which, previous;
+ fltk3::Color initial;
+ fltk3::Color which, previous;
int done;
- void drawbox(Fl_Color);
+ void drawbox(fltk3::Color);
void draw();
int handle(int);
public:
- ColorMenu(Fl_Color oldcol);
- Fl_Color run();
+ ColorMenu(fltk3::Color oldcol);
+ fltk3::Color run();
};
-ColorMenu::ColorMenu(Fl_Color oldcol) :
+ColorMenu::ColorMenu(fltk3::Color oldcol) :
fltk3::Window(BOXSIZE*8+1+2*BORDER, BOXSIZE*32+1+2*BORDER) {
clear_border();
set_modal();
initial = which = oldcol;
}
-void ColorMenu::drawbox(Fl_Color c) {
+void ColorMenu::drawbox(fltk3::Color c) {
if (c < 0 || c > 255) return;
int X = (c%8)*BOXSIZE+BORDER;
int Y = (c/8)*BOXSIZE+BORDER;
@@ -71,9 +71,9 @@
}
void ColorMenu::draw() {
- if (damage() != FL_DAMAGE_CHILD) {
+ if (damage() != fltk3::DAMAGE_CHILD) {
fl_draw_box(fltk3::UP_BOX,0,0,w(),h(),color());
- for (int c = 0; c < 256; c++) drawbox((Fl_Color)c);
+ for (int c = 0; c < 256; c++) drawbox((fltk3::Color)c);
} else {
drawbox(previous);
drawbox(which);
@@ -82,7 +82,7 @@
}
int ColorMenu::handle(int e) {
- Fl_Color c = which;
+ fltk3::Color c = which;
switch (e) {
case FL_PUSH:
case FL_DRAG: {
@@ -114,7 +114,7 @@
return 0;
}
if (c != which) {
- which = (Fl_Color)c; damage(FL_DAMAGE_CHILD);
+ which = (fltk3::Color)c; damage(fltk3::DAMAGE_CHILD);
int bx = (c%8)*BOXSIZE+BORDER;
int by = (c/8)*BOXSIZE+BORDER;
int px = x();
@@ -137,7 +137,7 @@
#ifdef _MSC_VER
#pragma optimize("a",off) // needed to get the done check to work
#endif
-Fl_Color ColorMenu::run() {
+fltk3::Color ColorMenu::run() {
if (which < 0 || which > 255) {
position(fltk3::event_x_root()-w()/2, fltk3::event_y_root()-y()/2);
} else {
@@ -152,7 +152,7 @@
return which;
}
-Fl_Color fl_show_colormap(Fl_Color oldcol) {
+fltk3::Color fl_show_colormap(fltk3::Color oldcol) {
ColorMenu m(oldcol);
return m.run();
}
Modified: branches/branch-3.0-2011/src/fl_symbols.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_symbols.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/fl_symbols.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -41,7 +41,7 @@
typedef struct {
const char *name;
- void (*drawit)(Fl_Color);
+ void (*drawit)(fltk3::Color);
char scalable;
char notempty;
} SYMBOL;
@@ -84,7 +84,7 @@
\param[in] scalable set to 1 if \p drawit uses scalable vector drawing
\returns 1 on success, 0 on failure
*/
-int fl_add_symbol(const char *name, void (*drawit)(Fl_Color), int scalable)
+int fl_add_symbol(const char *name, void (*drawit)(fltk3::Color), int scalable)
{
fl_init_symbols();
int pos;
@@ -109,7 +109,7 @@
\returns 1 on success, 0 on failure
*/
// provided for back compatibility:
-int fl_draw_symbol(const char *label,int x,int y,int w,int h,Fl_Color col) {
+int fl_draw_symbol(const char *label,int x,int y,int w,int h,fltk3::Color col) {
const char *p = label;
if (*p++ != '@') return 0;
fl_init_symbols();
@@ -188,11 +188,11 @@
#define vv(x,y) fl_vertex(x,y)
//for the outline color
-static void set_outline_color(Fl_Color c) {
+static void set_outline_color(fltk3::Color c) {
fl_color(fl_darker(c));
}
-static void rectangle(double x,double y,double x2,double y2,Fl_Color col) {
+static void rectangle(double x,double y,double x2,double y2,fltk3::Color col) {
fl_color(col);
BP; vv(x,y); vv(x2,y); vv(x2,y2); vv(x,y2); EP;
set_outline_color(col);
@@ -201,7 +201,7 @@
/* The drawing routines */
-static void draw_fltk(Fl_Color col)
+static void draw_fltk(fltk3::Color col)
{
fl_color(col);
// F fill
@@ -235,7 +235,7 @@
vv(1.3, 0.15); vv(1.3, 0.5); vv(1.1, 0.5); EC;
}
-static void draw_search(Fl_Color col)
+static void draw_search(fltk3::Color col)
{
fl_color(col);
BP; vv(-.4, .13); vv(-1.0, .73); vv(-.73, 1.0); vv(-.13, .4); EP;
@@ -246,7 +246,7 @@
BC; vv(-.4, .13); vv(-1.0, .73); vv(-.73, 1.0); vv(-.13, .4); EC;
}
-static void draw_arrow1(Fl_Color col)
+static void draw_arrow1(fltk3::Color col)
{
fl_color(col);
BP; vv(-0.8,-0.4); vv(-0.8,0.4); vv(0.0,0.4); vv(0.0,-0.4); EP;
@@ -256,13 +256,13 @@
vv(0.0,-0.8); vv(0.0,-0.4); EC;
}
-static void draw_arrow1bar(Fl_Color col)
+static void draw_arrow1bar(fltk3::Color col)
{
draw_arrow1(col);
rectangle(.6,-.8,.9,.8,col);
}
-static void draw_arrow2(Fl_Color col)
+static void draw_arrow2(fltk3::Color col)
{
fl_color(col);
BP; vv(-0.3,0.8); vv(0.50,0.0); vv(-0.3,-0.8); EP;
@@ -270,7 +270,7 @@
BC; vv(-0.3,0.8); vv(0.50,0.0); vv(-0.3,-0.8); EC;
}
-static void draw_arrow3(Fl_Color col)
+static void draw_arrow3(fltk3::Color col)
{
fl_color(col);
BP; vv(0.1,0.8); vv(0.9,0.0); vv(0.1,-0.8); EP;
@@ -280,7 +280,7 @@
BC; vv(-0.7,0.8); vv(0.1,0.0); vv(-0.7,-0.8); EC;
}
-static void draw_arrowbar(Fl_Color col)
+static void draw_arrowbar(fltk3::Color col)
{
fl_color(col);
BP; vv(0.2,0.8); vv(0.6,0.8); vv(0.6,-0.8); vv(0.2,-0.8); EP;
@@ -290,7 +290,7 @@
BC; vv(-0.6,0.8); vv(0.2,0.0); vv(-0.6,-0.8); EC;
}
-static void draw_arrowbox(Fl_Color col)
+static void draw_arrowbox(fltk3::Color col)
{
fl_color(col);
BP; vv(-0.6,0.8); vv(0.2,0.0); vv(-0.6,-0.8); EP;
@@ -300,7 +300,7 @@
BC; vv(-0.6,0.8); vv(0.2,0.0); vv(-0.6,-0.8); EC;
}
-static void draw_bararrow(Fl_Color col)
+static void draw_bararrow(fltk3::Color col)
{
fl_color(col);
BP; vv(0.1,0.8); vv(0.9,0.0); vv(0.1,-0.8); EP;
@@ -310,30 +310,30 @@
BC; vv(-0.5,0.8); vv(-0.1,0.8); vv(-0.1,-0.8); vv(-0.5,-0.8); EC;
}
-static void draw_doublebar(Fl_Color col) {
+static void draw_doublebar(fltk3::Color col) {
rectangle(-0.6,-0.8,-.1,.8,col);
rectangle(.1,-0.8,.6,.8,col);
}
-static void draw_arrow01(Fl_Color col)
+static void draw_arrow01(fltk3::Color col)
{ fl_rotate(180); draw_arrow1(col); }
-static void draw_arrow02(Fl_Color col)
+static void draw_arrow02(fltk3::Color col)
{ fl_rotate(180); draw_arrow2(col); }
-static void draw_arrow03(Fl_Color col)
+static void draw_arrow03(fltk3::Color col)
{ fl_rotate(180); draw_arrow3(col); }
-static void draw_0arrowbar(Fl_Color col)
+static void draw_0arrowbar(fltk3::Color col)
{ fl_rotate(180); draw_arrowbar(col); }
-static void draw_0arrowbox(Fl_Color col)
+static void draw_0arrowbox(fltk3::Color col)
{ fl_rotate(180); draw_arrowbox(col); }
-static void draw_0bararrow(Fl_Color col)
+static void draw_0bararrow(fltk3::Color col)
{ fl_rotate(180); draw_bararrow(col); }
-static void draw_doublearrow(Fl_Color col)
+static void draw_doublearrow(fltk3::Color col)
{
fl_color(col);
BP; vv(-0.35,-0.4); vv(-0.35,0.4); vv(0.35,0.4); vv(0.35,-0.4); EP;
@@ -345,7 +345,7 @@
vv(-0.95,0.0); vv(-0.15,0.8); EC;
}
-static void draw_arrow(Fl_Color col)
+static void draw_arrow(fltk3::Color col)
{
fl_color(col);
BP; vv(0.65,0.1); vv(1.0,0.0); vv(0.65,-0.1); EP;
@@ -355,19 +355,19 @@
BC; vv(0.65,0.1); vv(1.0,0.0); vv(0.65,-0.1); EC;
}
-static void draw_square(Fl_Color col)
+static void draw_square(fltk3::Color col)
{ rectangle(-1,-1,1,1,col); }
-static void draw_circle(Fl_Color col) {
+static void draw_circle(fltk3::Color col) {
fl_color(col); BP; fl_circle(0,0,1); EP;
set_outline_color(col);
BC; fl_circle(0,0,1); EC;
}
-static void draw_line(Fl_Color col)
+static void draw_line(fltk3::Color col)
{ fl_color(col); BL; vv(-1.0,0.0); vv(1.0,0.0); EL; }
-static void draw_plus(Fl_Color col)
+static void draw_plus(fltk3::Color col)
{
fl_color(col);
BP; vv(-0.9,-0.15); vv(-0.9,0.15); vv(0.9,0.15); vv(0.9,-0.15); EP;
@@ -380,28 +380,28 @@
EC;
}
-static void draw_uparrow(Fl_Color) {
+static void draw_uparrow(fltk3::Color) {
fl_color(FL_LIGHT3);
BL; vv(-.8,.8); vv(-.8,-.8); vv(.8,0); EL;
fl_color(FL_DARK3);
BL; vv(-.8,.8); vv(.8, 0); EL;
}
-static void draw_downarrow(Fl_Color) {
+static void draw_downarrow(fltk3::Color) {
fl_color(FL_DARK3);
BL; vv(-.8,.8); vv(-.8,-.8); vv(.8,0); EL;
fl_color(FL_LIGHT3);
BL; vv(-.8,.8); vv(.8, 0); EL;
}
-static void draw_menu(Fl_Color col)
+static void draw_menu(fltk3::Color col)
{
rectangle(-0.65, 0.85, 0.65, -0.25, col);
rectangle(-0.65, -0.6, 0.65, -1.0, col);
}
// Standard UI icons...
-static void draw_filenew(Fl_Color c) {
+static void draw_filenew(fltk3::Color c) {
fl_color(c);
BCP;
vv(-0.7, -1.0);
@@ -435,7 +435,7 @@
EL;
}
-static void draw_fileopen(Fl_Color c) {
+static void draw_fileopen(fltk3::Color c) {
fl_color(c);
BP;
vv(-1.0, -0.7);
@@ -475,7 +475,7 @@
EC;
}
-static void draw_filesave(Fl_Color c) {
+static void draw_filesave(fltk3::Color c) {
fl_color(c);
BP;
vv(-0.9, -1.0);
@@ -524,7 +524,7 @@
EC;
}
-static void draw_filesaveas(Fl_Color c) {
+static void draw_filesaveas(fltk3::Color c) {
draw_filesave(c);
fl_color(fl_color_average(c, FL_WHITE, 0.25f));
@@ -552,7 +552,7 @@
EP;
}
-static void draw_fileprint(Fl_Color c) {
+static void draw_fileprint(fltk3::Color c) {
fl_color(c);
BP;
vv(-0.8, 0.0);
@@ -601,7 +601,7 @@
EC;
}
-static void draw_round_arrow(Fl_Color c, float da=5.0) {
+static void draw_round_arrow(fltk3::Color c, float da=5.0) {
double a, r, dr1=0.005, dr2=0.015;
int i, j;
for (j=0; j<2; j++) {
@@ -632,20 +632,20 @@
}
}
-static void draw_refresh(Fl_Color c) {
+static void draw_refresh(fltk3::Color c) {
draw_round_arrow(c);
fl_rotate(180.0);
draw_round_arrow(c);
fl_rotate(-180.0);
}
-static void draw_reload(Fl_Color c) {
+static void draw_reload(fltk3::Color c) {
fl_rotate(-135.0);
draw_round_arrow(c, 10);
fl_rotate(135.0);
}
-static void draw_undo(Fl_Color c) {
+static void draw_undo(fltk3::Color c) {
fl_translate(0.0, 0.2);
fl_scale(1.0, -1.0);
draw_round_arrow(c, 6);
@@ -653,7 +653,7 @@
fl_translate(0.0, -0.2);
}
-static void draw_redo(Fl_Color c) {
+static void draw_redo(fltk3::Color c) {
fl_scale(-1.0, 1.0);
draw_undo(c);
fl_scale(-1.0, 1.0);
Modified: branches/branch-3.0-2011/src/forms_bitmap.cxx
===================================================================
--- branches/branch-3.0-2011/src/forms_bitmap.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/forms_bitmap.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -33,7 +33,7 @@
box(t);
b = 0;
color(FL_BLACK);
- align(FL_ALIGN_BOTTOM);
+ align(fltk3::ALIGN_BOTTOM);
}
/** Sets a new bitmap bits with size W,H. Deletes the previous one.*/
void Fl_FormsBitmap::set(int W, int H, const uchar *bits) {
Modified: branches/branch-3.0-2011/src/forms_compatability.cxx
===================================================================
--- branches/branch-3.0-2011/src/forms_compatability.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/forms_compatability.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -141,7 +141,7 @@
#ifndef FL_DOXYGEN // FIXME: suppress doxygen warning
void Fl_FormsText::draw() {
draw_box();
- align(align()|FL_ALIGN_INSIDE); // questionable method of compatibility
+ align(align()|fltk3::ALIGN_INSIDE); // questionable method of compatibility
draw_label();
}
#endif
@@ -174,7 +174,7 @@
b->type(FL_HIDDEN_BUTTON);
break;
case FL_INOUT_BUTTON:
- b->when(FL_WHEN_CHANGED);
+ b->when(fltk3::WHEN_CHANGED);
break;
}
return b;
Modified: branches/branch-3.0-2011/src/forms_pixmap.cxx
===================================================================
--- branches/branch-3.0-2011/src/forms_pixmap.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/forms_pixmap.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -40,7 +40,7 @@
box(t);
b = 0;
color(FL_BLACK);
- align(FL_ALIGN_BOTTOM);
+ align(fltk3::ALIGN_BOTTOM);
}
/**
Modified: branches/branch-3.0-2011/src/forms_timer.cxx
===================================================================
--- branches/branch-3.0-2011/src/forms_timer.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/forms_timer.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -71,7 +71,7 @@
void Fl_Timer::draw() {
int tt;
- Fl_Color col;
+ fltk3::Color col;
char str[32];
if (!on || delay>0.0)
col = color();
@@ -90,7 +90,7 @@
}
fl_font(labelfont(), labelsize());
fl_color(labelcolor());
- fl_draw(str, x(), y(), w(), h(), FL_ALIGN_CENTER);
+ fl_draw(str, x(), y(), w(), h(), fltk3::ALIGN_CENTER);
} else
draw_label();
}
@@ -155,7 +155,7 @@
direction_ = 0;
type(t);
if (t == FL_HIDDEN_TIMER) clear_visible();
- if (t == FL_VALUE_TIMER) align(FL_ALIGN_LEFT);
+ if (t == FL_VALUE_TIMER) align(fltk3::ALIGN_LEFT);
}
/** Sets the current timer value */
void Fl_Timer::value(double d) {
Modified: branches/branch-3.0-2011/src/gl_draw.cxx
===================================================================
--- branches/branch-3.0-2011/src/gl_draw.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/gl_draw.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -289,7 +289,7 @@
void gl_draw(
const char* str, // the (multi-line) string
int x, int y, int w, int h, // bounding box
- Fl_Align align) {
+ fltk3::Align align) {
fl_draw(str, x, -y-h, w, h, align, gl_draw_invert);
}
@@ -324,7 +324,7 @@
For color-index modes it will use fl_xpixel(c), which is only
right if the window uses the default colormap!
*/
-void gl_color(Fl_Color i) {
+void gl_color(fltk3::Color i) {
#if HAVE_GL_OVERLAY
#if defined(WIN32)
if (fl_overlay && fl_overlay_depth) {
Modified: branches/branch-3.0-2011/src/print_panel.cxx
===================================================================
--- branches/branch-3.0-2011/src/print_panel.cxx 2011-01-09 20:05:58 UTC (rev 8232)
+++ branches/branch-3.0-2011/src/print_panel.cxx 2011-01-09 22:48:30 UTC (rev 8233)
@@ -253,18 +253,18 @@
print_choice->down_box(FL_BORDER_BOX);
print_choice->labelfont(1);
print_choice->callback((Fl_Callback*)cb_print_choice);
- print_choice->when(FL_WHEN_CHANGED);
+ print_choice->when(fltk3::WHEN_CHANGED);
} // Fl_Choice* print_choice
{ print_properties = new Fl_Button(314, 10, 115, 25, Fl_Printer::dialog_properties);
print_properties->callback((Fl_Callback*)cb_print_properties);
} // Fl_Button* print_properties
{ print_status = new fltk3::Box(0, 41, print_panel_controls->w(), 17, "printer/job status");
- print_status->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE|FL_ALIGN_LEFT));
+ print_status->align(fltk3::Align(fltk3::ALIGN_CLIP|fltk3::ALIGN_INSIDE|fltk3::ALIGN_LEFT));
} // fltk3::Box* print_status
{ fltk3::Group* o = new fltk3::Group(10, 86, 227, 105, Fl_Printer::dialog_range);
o->box(FL_THIN_DOWN_BOX);
o->labelfont(1);
- o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
+ o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
{ print_all = new Fl_Round_Button(20, 96, 38, 25, Fl_Printer::dialog_all);
print_all->type(102);
print_all->down_box(FL_ROUND_DOWN_BOX);
@@ -296,15 +296,15 @@
{ fltk3::Group* o = new fltk3::Group(247, 86, 210, 105, Fl_Printer::dialog_copies);
o->box(FL_THIN_DOWN_BOX);
o->labelfont(1);
- o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
+ o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
{ print_copies = new Fl_Spinner(321, 96, 45, 25, Fl_Printer::dialog_copyNo);
print_copies->callback((Fl_Callback*)cb_print_copies);
- print_copies->when(FL_WHEN_CHANGED);
+ print_copies->when(fltk3::WHEN_CHANGED);
} // Fl_Spinner* print_copies
{ print_collate_button = new Fl_Check_Button(376, 96, 64, 25, "Collate");
print_collate_button->down_box(fltk3::DOWN_BOX);
print_collate_button->callback((Fl_Callback*)cb_print_collate_button);
- print_collate_button->when(FL_WHEN_CHANGED);
+ print_collate_button->when(fltk3::WHEN_CHANGED);
print_collate_button->deactivate();
} // Fl_Check_Button* print_collate_button
{ print_collate_group[0] = new fltk3::Group(257, 131, 191, 50);
@@ -313,63 +313,63 @@
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(272, 136, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(257, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(352, 141, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(337, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(322, 131, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(417, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(402, 136, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(387, 131, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
o->deactivate();
} // fltk3::Box* o
print_collate_group[0]->end();
@@ -381,55 +381,55 @@
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(272, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(257, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(352, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(337, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(322, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(417, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(402, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
{ fltk3::Box* o = new fltk3::Box(387, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
+ o->align(fltk3::Align(fltk3::ALIGN_BOTTOM_RIGHT|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
print_collate_group[1]->end();
} // fltk3::Group* print_collate_group[1]
@@ -444,7 +444,7 @@
print_panel_controls->end();
} // fltk3::Group* print_panel_controls
{ print_progress = new Fl_Progress(10, 203, 289, 21);
- print_progress->selection_color((Fl_Color)4);
+ print_progress->selection_color((fltk3::Color)4);
print_progress->hide();
} // Fl_Progress* print_progress
print_panel->set_modal();
@@ -459,7 +459,7 @@
} // Fl_Choice* print_page_size
{ fltk3::Group* o = new fltk3::Group(110, 45, 170, 40, Fl_Printer::property_mode);
o->labelfont(fltk3::HELVETICA);
- o->align(Fl_Align(FL_ALIGN_LEFT));
+ o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ print_output_mode[0] = new Fl_Button(110, 45, 30, 40);
print_output_mode[0]->type(102);
print_output_mode[0]->box(FL_BORDER_BOX);
[ Direct Link to Message ] | |
