| |
Author: matt
Date: 2011-05-17 08:45:34 -0700 (Tue, 17 May 2011)
New Revision: 8681
Log:
123: Widget.h complete.
Modified:
branches/branch-3.0/fltk3/Button.h
branches/branch-3.0/fltk3/Choice.h
branches/branch-3.0/fltk3/FileChooser.h
branches/branch-3.0/fltk3/FileIcon.h
branches/branch-3.0/fltk3/Group.h
branches/branch-3.0/fltk3/HelpDialog.h
branches/branch-3.0/fltk3/Image.h
branches/branch-3.0/fltk3/Input_.h
branches/branch-3.0/fltk3/LightButton.h
branches/branch-3.0/fltk3/MenuItem.h
branches/branch-3.0/fltk3/Menu_.h
branches/branch-3.0/fltk3/RadioButton.h
branches/branch-3.0/fltk3/RepeatButton.h
branches/branch-3.0/fltk3/ReturnButton.h
branches/branch-3.0/fltk3/Spinner.h
branches/branch-3.0/fltk3/SysMenuBar.h
branches/branch-3.0/fltk3/ToggleButton.h
branches/branch-3.0/fltk3/Widget.h
branches/branch-3.0/fltk3/enumerations.h
branches/branch-3.0/fltk3/forms.h
branches/branch-3.0/fltk3/osx.h
branches/branch-3.0/fltk3/run.h
branches/branch-3.0/fluid/Fl_Menu_Type.cxx
branches/branch-3.0/fluid/Fl_Widget_Type.cxx
branches/branch-3.0/fluid/Shortcut_Button.h
branches/branch-3.0/fluid/about_panel.cxx
branches/branch-3.0/fluid/alignment_panel.cxx
branches/branch-3.0/fluid/factory.cxx
branches/branch-3.0/fluid/file.cxx
branches/branch-3.0/fluid/fluid.cxx
branches/branch-3.0/fluid/function_panel.cxx
branches/branch-3.0/fluid/function_panel.h
branches/branch-3.0/fluid/print_panel.cxx
branches/branch-3.0/fluid/print_panel.h
branches/branch-3.0/fluid/template_panel.cxx
branches/branch-3.0/fluid/template_panel.h
branches/branch-3.0/fluid/widget_panel.cxx
branches/branch-3.0/fluid/widget_panel.h
branches/branch-3.0/make3.sh
branches/branch-3.0/src/Fl_Button.cxx
branches/branch-3.0/src/Fl_Check_Button.cxx
branches/branch-3.0/src/Fl_Choice.cxx
branches/branch-3.0/src/Fl_Color_Chooser.cxx
branches/branch-3.0/src/Fl_File_Chooser.cxx
branches/branch-3.0/src/Fl_File_Icon.cxx
branches/branch-3.0/src/Fl_Help_Dialog.cxx
branches/branch-3.0/src/Fl_Image.cxx
branches/branch-3.0/src/Fl_Light_Button.cxx
branches/branch-3.0/src/Fl_Menu.cxx
branches/branch-3.0/src/Fl_Menu_.cxx
branches/branch-3.0/src/Fl_Menu_add.cxx
branches/branch-3.0/src/Fl_Multi_Label.cxx
branches/branch-3.0/src/Fl_Repeat_Button.cxx
branches/branch-3.0/src/Fl_Return_Button.cxx
branches/branch-3.0/src/Fl_Round_Button.cxx
branches/branch-3.0/src/Fl_Sys_Menu_Bar.cxx
branches/branch-3.0/src/Fl_Text_Display.cxx
branches/branch-3.0/src/Fl_Window.cxx
branches/branch-3.0/src/Fl_cocoa.mm
branches/branch-3.0/src/Fl_win32.cxx
branches/branch-3.0/src/Fl_x.cxx
branches/branch-3.0/src/fl_ask.cxx
branches/branch-3.0/src/fl_engraved_label.cxx
branches/branch-3.0/src/fl_labeltype.cxx
branches/branch-3.0/src/fl_shortcut.cxx
branches/branch-3.0/src/forms_compatability.cxx
branches/branch-3.0/src/glut_compatability.cxx
branches/branch-3.0/src/print_panel.cxx
Modified: branches/branch-3.0/fltk3/Button.h
===================================================================
--- branches/branch-3.0/fltk3/Button.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Button.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -26,153 +26,155 @@
//
/* \file
- Fl_Button widget . */
+ fltk3::Button widget . */
-#ifndef Fl_Button_H
-#define Fl_Button_H
+#ifndef FLTK3_BUTTON_H
+#define FLTK3_BUTTON_H
-#ifndef Fl_Widget_H
#include "Widget.h"
-#endif
// values for type()
#define FL_NORMAL_BUTTON 0 /**< value() will be set to 1 during the press of the button and
- reverts back to 0 when the button is released */
+reverts back to 0 when the button is released */
#define FL_TOGGLE_BUTTON 1 ///< value() toggles between 0 and 1 at every click of the button
#define FL_RADIO_BUTTON (FL_RESERVED_TYPE+2) /**< is set to 1 at button press, and all other
- buttons in the same group with <tt>type() == FL_RADIO_BUTTON</tt>
- are set to zero.*/
+buttons in the same group with <tt>type() == FL_RADIO_BUTTON</tt>
+are set to zero.*/
#define FL_HIDDEN_BUTTON 3 ///< for Forms compatibility
extern FL_EXPORT Fl_Shortcut fl_old_shortcut(const char*);
-class fltk3::WidgetTracker;
-
-/**
- \class Fl_Button
- \brief Buttons generate callbacks when they are clicked by the user.
+namespace fltk3 {
- You control exactly when and how by changing the values for type() and
- when(). Buttons can also generate callbacks in response to \c fltk3::SHORTCUT
- events. The button can either have an explicit shortcut(int s) value or a
- letter shortcut can be indicated in the label() with an '\&' character
- before it. For the label shortcut it does not matter if \e Alt is held
- down, but if you have an input field in the same window, the user will have
- to hold down the \e Alt key so that the input field does not eat the event
- first as an \c fltk3::KEYBOARD event.
-
- \todo Refactor the doxygen comments for Fl_Button type() documentation.
-
- For an Fl_Button object, the type() call returns one of:
- \li \c FL_NORMAL_BUTTON (0): value() remains unchanged after button press.
- \li \c FL_TOGGLE_BUTTON: value() is inverted after button press.
- \li \c FL_RADIO_BUTTON: value() is set to 1 after button press, and all other
- buttons in the current group with <tt>type() == FL_RADIO_BUTTON</tt>
- are set to zero.
-
- \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 fltk3::WHEN_RELEASE:
- \li \c 0: The callback is not done, instead changed() is turned on.
- \li \c fltk3::WHEN_RELEASE: The callback is done after the user successfully
- clicks the button, or when a shortcut is typed.
- \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).
-*/
-class FL_EXPORT Fl_Button : public fltk3::Widget {
-
- int shortcut_;
- char value_;
- char oldval;
- uchar down_box_;
-
-protected:
-
- static fltk3::WidgetTracker *key_release_tracker;
- static void key_release_timeout(void*);
- void simulate_key_action();
+ class WidgetTracker;
- virtual void draw();
-
-public:
-
- virtual int handle(int);
-
- Fl_Button(int X, int Y, int W, int H, const char *L = 0);
-
- int value(int v);
-
/**
- Returns the current value of the button (0 or 1).
+ \class fltk3::Button
+ \brief Buttons generate callbacks when they are clicked by the user.
+
+ You control exactly when and how by changing the values for type() and
+ when(). Buttons can also generate callbacks in response to \c fltk3::SHORTCUT
+ events. The button can either have an explicit shortcut(int s) value or a
+ letter shortcut can be indicated in the label() with an '\&' character
+ before it. For the label shortcut it does not matter if \e Alt is held
+ down, but if you have an input field in the same window, the user will have
+ to hold down the \e Alt key so that the input field does not eat the event
+ first as an \c fltk3::KEYBOARD event.
+
+ \todo Refactor the doxygen comments for fltk3::Button type() documentation.
+
+ For an fltk3::Button object, the type() call returns one of:
+ \li \c FL_NORMAL_BUTTON (0): value() remains unchanged after button press.
+ \li \c FL_TOGGLE_BUTTON: value() is inverted after button press.
+ \li \c FL_RADIO_BUTTON: value() is set to 1 after button press, and all other
+ buttons in the current group with <tt>type() == FL_RADIO_BUTTON</tt>
+ are set to zero.
+
+ \todo Refactor the doxygen comments for fltk3::Button when() documentation.
+
+ For an fltk3::Button object, the following when() values are useful, the default
+ being \c fltk3::WHEN_RELEASE:
+ \li \c 0: The callback is not done, instead changed() is turned on.
+ \li \c fltk3::WHEN_RELEASE: The callback is done after the user successfully
+ clicks the button, or when a shortcut is typed.
+ \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).
*/
- char value() const {return value_;}
+ class FL_EXPORT Button : public fltk3::Widget {
+
+ int shortcut_;
+ char value_;
+ char oldval;
+ uchar down_box_;
+
+ protected:
+
+ static fltk3::WidgetTracker *key_release_tracker;
+ static void key_release_timeout(void*);
+ void simulate_key_action();
+
+ virtual void draw();
+
+ public:
+
+ virtual int handle(int);
+
+ Button(int X, int Y, int W, int H, const char *L = 0);
+
+ int value(int v);
+
+ /**
+ Returns the current value of the button (0 or 1).
+ */
+ char value() const {return value_;}
+
+ /**
+ Same as \c value(1).
+ \see value(int v)
+ */
+ int set() {return value(1);}
+
+ /**
+ Same as \c value(0).
+ \see value(int v)
+ */
+ int clear() {return value(0);}
+
+ void setonly(); // this should only be called on FL_RADIO_BUTTONs
+
+ /**
+ Returns the current shortcut key for the button.
+ \retval int
+ */
+ int shortcut() const {return shortcut_;}
+
+ /**
+ 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>fltk3::ALT | 'a'</tt>, or
+ <tt>fltk3::ALT | (fltk3::FKey + 10)</tt>, or just
+ <tt>'a'</tt>.
+ A value of 0 disables the shortcut.
+
+ The key can be any value returned by fltk3::event_key(), but will usually be
+ an ASCII letter. Use a lower-case letter unless you require the shift key
+ to be held down.
+
+ The shift flags can be any set of values accepted by fltk3::event_state().
+ If the bit is on, that shift key must be pushed. Meta, Alt, Ctrl, and
+ Shift must be off if they are not in the shift flags (zero for the other
+ bits indicates a "don't care" setting).
+ \param[in] s bitwise OR of key and shift flags
+ */
+ void shortcut(int s) {shortcut_ = s;}
+
+ /**
+ Returns the current down box type, which is drawn when value() is non-zero.
+ \retval fltk3::Boxtype
+ */
+ Boxtype down_box() const {return (fltk3::Boxtype)down_box_;}
+
+ /**
+ Sets the down box type. The default value of 0 causes FLTK to figure out
+ the correct matching down version of box().
+ \param[in] b down box type
+ */
+ void down_box(fltk3::Boxtype b) {down_box_ = b;}
+
+ /// (for backwards compatibility)
+ void shortcut(const char *s) {shortcut(fl_old_shortcut(s));}
+
+ /// (for backwards compatibility)
+ Color down_color() const {return selection_color();}
+
+ /// (for backwards compatibility)
+ void down_color(unsigned c) {selection_color(c);}
+ };
+
+} // namespace
- /**
- Same as \c value(1).
- \see value(int v)
- */
- int set() {return value(1);}
-
- /**
- Same as \c value(0).
- \see value(int v)
- */
- int clear() {return value(0);}
-
- void setonly(); // this should only be called on FL_RADIO_BUTTONs
-
- /**
- Returns the current shortcut key for the button.
- \retval int
- */
- int shortcut() const {return shortcut_;}
-
- /**
- 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>fltk3::ALT | 'a'</tt>, or
- <tt>fltk3::ALT | (fltk3::FKey + 10)</tt>, or just
- <tt>'a'</tt>.
- A value of 0 disables the shortcut.
-
- The key can be any value returned by fltk3::event_key(), but will usually be
- an ASCII letter. Use a lower-case letter unless you require the shift key
- to be held down.
-
- The shift flags can be any set of values accepted by fltk3::event_state().
- If the bit is on, that shift key must be pushed. Meta, Alt, Ctrl, and
- Shift must be off if they are not in the shift flags (zero for the other
- bits indicates a "don't care" setting).
- \param[in] s bitwise OR of key and shift flags
- */
- void shortcut(int s) {shortcut_ = s;}
-
- /**
- Returns the current down box type, which is drawn when value() is non-zero.
- \retval fltk3::Boxtype
- */
- fltk3::Boxtype down_box() const {return (fltk3::Boxtype)down_box_;}
-
- /**
- Sets the down box type. The default value of 0 causes FLTK to figure out
- the correct matching down version of box().
- \param[in] b down box type
- */
- void down_box(fltk3::Boxtype b) {down_box_ = b;}
-
- /// (for backwards compatibility)
- void shortcut(const char *s) {shortcut(fl_old_shortcut(s));}
-
- /// (for backwards compatibility)
- fltk3::Color down_color() const {return selection_color();}
-
- /// (for backwards compatibility)
- void down_color(unsigned c) {selection_color(c);}
-};
-
#endif
//
Modified: branches/branch-3.0/fltk3/Choice.h
===================================================================
--- branches/branch-3.0/fltk3/Choice.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Choice.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -57,7 +57,7 @@
could be added with a subclass, however.
The menu will also pop up in response to shortcuts indicated by putting
- a '\&' character in the label(). See Fl_Button::shortcut(int s) for a
+ a '\&' character in the label(). See fltk3::Button::shortcut(int s) for a
description of this.
Typing the shortcut() of any of the items will do exactly the same as when
Modified: branches/branch-3.0/fltk3/FileChooser.h
===================================================================
--- branches/branch-3.0/fltk3/FileChooser.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/FileChooser.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -80,10 +80,10 @@
void cb_favoritesButton_i(Fl_Menu_Button*, void*);
static void cb_favoritesButton(Fl_Menu_Button*, void*);
public:
- Fl_Button *newButton;
+ fltk3::Button *newButton;
private:
- void cb_newButton_i(Fl_Button*, void*);
- static void cb_newButton(Fl_Button*, void*);
+ void cb_newButton_i(fltk3::Button*, void*);
+ static void cb_newButton(fltk3::Button*, void*);
void cb__i(Fl_Tile*, void*);
static void cb_(Fl_Tile*, void*);
Fl_File_Browser *fileList;
@@ -101,25 +101,25 @@
Fl_Return_Button *okButton;
void cb_okButton_i(Fl_Return_Button*, void*);
static void cb_okButton(Fl_Return_Button*, void*);
- Fl_Button *cancelButton;
- void cb_cancelButton_i(Fl_Button*, void*);
- static void cb_cancelButton(Fl_Button*, void*);
+ fltk3::Button *cancelButton;
+ void cb_cancelButton_i(fltk3::Button*, void*);
+ static void cb_cancelButton(fltk3::Button*, void*);
Fl_Double_Window *favWindow;
Fl_File_Browser *favList;
void cb_favList_i(Fl_File_Browser*, void*);
static void cb_favList(Fl_File_Browser*, void*);
- Fl_Button *favUpButton;
- void cb_favUpButton_i(Fl_Button*, void*);
- static void cb_favUpButton(Fl_Button*, void*);
- Fl_Button *favDeleteButton;
- void cb_favDeleteButton_i(Fl_Button*, void*);
- static void cb_favDeleteButton(Fl_Button*, void*);
- Fl_Button *favDownButton;
- void cb_favDownButton_i(Fl_Button*, void*);
- static void cb_favDownButton(Fl_Button*, void*);
- Fl_Button *favCancelButton;
- void cb_favCancelButton_i(Fl_Button*, void*);
- static void cb_favCancelButton(Fl_Button*, void*);
+ fltk3::Button *favUpButton;
+ void cb_favUpButton_i(fltk3::Button*, void*);
+ static void cb_favUpButton(fltk3::Button*, void*);
+ fltk3::Button *favDeleteButton;
+ void cb_favDeleteButton_i(fltk3::Button*, void*);
+ static void cb_favDeleteButton(fltk3::Button*, void*);
+ fltk3::Button *favDownButton;
+ void cb_favDownButton_i(fltk3::Button*, void*);
+ static void cb_favDownButton(fltk3::Button*, void*);
+ fltk3::Button *favCancelButton;
+ void cb_favCancelButton_i(fltk3::Button*, void*);
+ static void cb_favCancelButton(fltk3::Button*, void*);
Fl_Return_Button *favOkButton;
void cb_favOkButton_i(Fl_Return_Button*, void*);
static void cb_favOkButton(Fl_Return_Button*, void*);
Modified: branches/branch-3.0/fltk3/FileIcon.h
===================================================================
--- branches/branch-3.0/fltk3/FileIcon.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/FileIcon.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -124,7 +124,7 @@
void label(fltk3::Widget *w);
- static void labeltype(const Fl_Label *o, int x, int y, int w, int h, fltk3::Align a);
+ static void labeltype(const fltk3::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/fltk3/Group.h
===================================================================
--- branches/branch-3.0/fltk3/Group.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Group.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -204,9 +204,9 @@
\code
class MyClass {
fltk3::Group group;
- Fl_Button button_in_group;
+ fltk3::Button button_in_group;
Fl_End end;
- Fl_Button button_outside_group;
+ fltk3::Button button_outside_group;
MyClass();
};
MyClass::MyClass() :
Modified: branches/branch-3.0/fltk3/HelpDialog.h
===================================================================
--- branches/branch-3.0/fltk3/HelpDialog.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/HelpDialog.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -50,18 +50,18 @@
Fl_Help_Dialog();
private:
Fl_Double_Window *window_;
- Fl_Button *back_;
- void cb_back__i(Fl_Button*, void*);
- static void cb_back_(Fl_Button*, void*);
- Fl_Button *forward_;
- void cb_forward__i(Fl_Button*, void*);
- static void cb_forward_(Fl_Button*, void*);
- Fl_Button *smaller_;
- void cb_smaller__i(Fl_Button*, void*);
- static void cb_smaller_(Fl_Button*, void*);
- Fl_Button *larger_;
- void cb_larger__i(Fl_Button*, void*);
- static void cb_larger_(Fl_Button*, void*);
+ fltk3::Button *back_;
+ void cb_back__i(fltk3::Button*, void*);
+ static void cb_back_(fltk3::Button*, void*);
+ fltk3::Button *forward_;
+ void cb_forward__i(fltk3::Button*, void*);
+ static void cb_forward_(fltk3::Button*, void*);
+ fltk3::Button *smaller_;
+ void cb_smaller__i(fltk3::Button*, void*);
+ static void cb_smaller_(fltk3::Button*, void*);
+ fltk3::Button *larger_;
+ void cb_larger__i(fltk3::Button*, void*);
+ static void cb_larger_(fltk3::Button*, void*);
Fl_Input *find_;
void cb_find__i(Fl_Input*, void*);
static void cb_find_(Fl_Input*, void*);
Modified: branches/branch-3.0/fltk3/Image.h
===================================================================
--- branches/branch-3.0/fltk3/Image.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Image.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -33,9 +33,11 @@
# include "enumerations.h"
-namespace fltk3 { class Widget; }
+namespace fltk3 {
+ class Widget;
+ struct Label;
+}
struct Fl_Menu_Item;
-struct Fl_Label;
/**
Fl_Image is the base class used for caching and
@@ -80,8 +82,8 @@
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, fltk3::Align la);
- static void measure(const Fl_Label *lo, int &lw, int &lh);
+ static void labeltype(const fltk3::Label *lo, int lx, int ly, int lw, int lh, fltk3::Align la);
+ static void measure(const fltk3::Label *lo, int &lw, int &lh);
public:
Modified: branches/branch-3.0/fltk3/Input_.h
===================================================================
--- branches/branch-3.0/fltk3/Input_.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Input_.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -371,14 +371,14 @@
/** Return the shortcut key associated with this widget.
\return shortcut keystroke
- \see Fl_Button::shortcut() */
+ \see fltk3::Button::shortcut() */
int shortcut() const {return shortcut_;}
/**
Sets the shortcut key associated with this widget.
Pressing the shortcut key gives text editing focus to this widget.
\param [in] s new shortcut keystroke
- \see Fl_Button::shortcut()
+ \see fltk3::Button::shortcut()
*/
void shortcut(int s) {shortcut_ = s;}
Modified: branches/branch-3.0/fltk3/LightButton.h
===================================================================
--- branches/branch-3.0/fltk3/LightButton.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/LightButton.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -44,7 +44,7 @@
<P ALIGN=CENTER>\image html Fl_Light_Button.png</P>
\image latex Fl_Light_Button.png "Fl_Light_Button" width=4cm
*/
-class FL_EXPORT Fl_Light_Button : public Fl_Button {
+class FL_EXPORT Fl_Light_Button : public fltk3::Button {
protected:
virtual void draw();
public:
Modified: branches/branch-3.0/fltk3/MenuItem.h
===================================================================
--- branches/branch-3.0/fltk3/MenuItem.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/MenuItem.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -58,7 +58,7 @@
struct Fl_Menu_Item {
const char* text; // label()
ulong shortcut_;
- Fl_Callback* callback_;
+ fltk3::Callback* callback_;
void* user_data_;
int flags;
uchar labeltype_;
@@ -118,7 +118,7 @@
struct FL_EXPORT Fl_Menu_Item {
const char *text; ///< menu item text, returned by label()
int shortcut_; ///< menu item shortcut
- Fl_Callback *callback_; ///< menu item callback
+ fltk3::Callback *callback_; ///< menu item callback
void *user_data_; ///< menu item user_data for the menu's callback
int flags; ///< menu item flags like FL_MENU_TOGGLE, FL_MENU_RADIO
uchar labeltype_; ///< how the menu item text looks like
@@ -220,36 +220,36 @@
is not passed to the callback, instead you have to get it by calling
((Fl_Menu_*)w)->mvalue() where w is the widget argument.
*/
- Fl_Callback_p callback() const {return callback_;}
+ fltk3::CallbackPtr callback() const {return callback_;}
/**
Sets the menu item's callback function and userdata() argument.
- \see Fl_Callback_p Fl_MenuItem::callback() const
+ \see fltk3::CallbackPtr Fl_MenuItem::callback() const
*/
- void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;}
+ void callback(fltk3::Callback* c, void* p) {callback_=c; user_data_=p;}
/**
Sets the menu item's callback function.
This method does not set the userdata() argument.
- \see Fl_Callback_p Fl_MenuItem::callback() const
+ \see fltk3::CallbackPtr Fl_MenuItem::callback() const
*/
- void callback(Fl_Callback* c) {callback_=c;}
+ void callback(fltk3::Callback* c) {callback_=c;}
/**
Sets the menu item's callback function.
This method does not set the userdata() argument.
- \see Fl_Callback_p Fl_MenuItem::callback() const
+ \see fltk3::CallbackPtr Fl_MenuItem::callback() const
*/
- void callback(Fl_Callback0*c) {callback_=(Fl_Callback*)c;}
+ void callback(fltk3::Callback0*c) {callback_=(fltk3::Callback*)c;}
/**
Sets the menu item's callback function and userdata() argument.
This method does not set the userdata() argument.
The argument \p is cast to void* and stored as the userdata()
for the menu item's callback function.
- \see Fl_Callback_p Fl_MenuItem::callback() const
+ \see fltk3::CallbackPtr Fl_MenuItem::callback() const
*/
- void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;}
+ void callback(fltk3::Callback1*c, long p=0) {callback_=(fltk3::Callback*)c; user_data_=(void*)p;}
/**
Gets the user_data() argument that is sent to the callback function.
@@ -410,11 +410,11 @@
/** back compatibility only \deprecated. */
void uncheck() {flags &= ~FL_MENU_VALUE;}
- int insert(int,const char*,int,Fl_Callback*,void* =0, int =0);
- int add(const char*, int shortcut, Fl_Callback*, void* =0, int = 0);
+ int insert(int,const char*,int,fltk3::Callback*,void* =0, int =0);
+ int add(const char*, int shortcut, fltk3::Callback*, void* =0, int = 0);
- /** See int add(const char*, int shortcut, Fl_Callback*, void*, int) */
- int add(const char*a, const char* b, Fl_Callback* c,
+ /** See int add(const char*, int shortcut, fltk3::Callback*, void*, int) */
+ int add(const char*a, const char* b, fltk3::Callback* c,
void* d = 0, int e = 0) {
return add(a,fl_old_shortcut(b),c,d,e);}
Modified: branches/branch-3.0/fltk3/Menu_.h
===================================================================
--- branches/branch-3.0/fltk3/Menu_.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Menu_.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -65,10 +65,10 @@
int item_pathname(char *name, int namelen, const Fl_Menu_Item *finditem=0) const;
const Fl_Menu_Item* picked(const Fl_Menu_Item*);
const Fl_Menu_Item* find_item(const char *name);
- const Fl_Menu_Item* find_item(Fl_Callback*);
+ const Fl_Menu_Item* find_item(fltk3::Callback*);
int find_index(const char *name) const;
int find_index(const Fl_Menu_Item *item) const;
- int find_index(Fl_Callback *cb) const;
+ int find_index(fltk3::Callback *cb) const;
/**
Returns the menu item with the entered shortcut (key value).
@@ -91,14 +91,14 @@
const Fl_Menu_Item *menu() const {return menu_;}
void menu(const Fl_Menu_Item *m);
void copy(const Fl_Menu_Item *m, void* user_data = 0);
- int insert(int index, const char*, int shortcut, Fl_Callback*, void* = 0, int = 0);
- int add(const char*, int shortcut, Fl_Callback*, void* = 0, int = 0);
- /** See int Fl_Menu_::add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0) */
- int add(const char* a, const char* b, Fl_Callback* c, void* d = 0, int e = 0) {
+ int insert(int index, const char*, int shortcut, fltk3::Callback*, void* = 0, int = 0);
+ int add(const char*, int shortcut, fltk3::Callback*, void* = 0, int = 0);
+ /** See int Fl_Menu_::add(const char* label, int shortcut, fltk3::Callback*, void *user_data=0, int flags=0) */
+ int add(const char* a, const char* b, fltk3::Callback* c, void* d = 0, int e = 0) {
return add(a,fl_old_shortcut(b),c,d,e);
}
- /** See int Fl_Menu_::insert(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0) */
- int insert(int index, const char* a, const char* b, Fl_Callback* c, void* d = 0, int e = 0) {
+ /** See int Fl_Menu_::insert(const char* label, int shortcut, fltk3::Callback*, void *user_data=0, int flags=0) */
+ int insert(int index, const char* a, const char* b, fltk3::Callback* c, void* d = 0, int e = 0) {
return insert(index,a,fl_old_shortcut(b),c,d,e);
}
int add(const char *);
Modified: branches/branch-3.0/fltk3/RadioButton.h
===================================================================
--- branches/branch-3.0/fltk3/RadioButton.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/RadioButton.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -33,10 +33,10 @@
#include "Button.h"
-class FL_EXPORT Fl_Radio_Button : public Fl_Button {
+class FL_EXPORT Fl_Radio_Button : public fltk3::Button {
public:
Fl_Radio_Button(int x,int y,int w,int h,const char *l=0)
- : Fl_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);}
+ : fltk3::Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);}
};
#endif
Modified: branches/branch-3.0/fltk3/RepeatButton.h
===================================================================
--- branches/branch-3.0/fltk3/RepeatButton.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/RepeatButton.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -34,12 +34,12 @@
#include "Button.h"
/**
- The Fl_Repeat_Button is a subclass of Fl_Button that
+ The Fl_Repeat_Button is a subclass of fltk3::Button that
generates a callback when it is pressed and then repeatedly generates
callbacks as long as it is held down. The speed of the repeat is fixed
and depends on the implementation.
*/
-class FL_EXPORT Fl_Repeat_Button : public Fl_Button {
+class FL_EXPORT Fl_Repeat_Button : public fltk3::Button {
static void repeat_callback(void *);
public:
int handle(int);
@@ -49,10 +49,10 @@
Deletes the button.
*/
Fl_Repeat_Button(int X,int Y,int W,int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {}
+ : fltk3::Button(X,Y,W,H,l) {}
void deactivate() {
fltk3::remove_timeout(repeat_callback,this);
- Fl_Button::deactivate();
+ fltk3::Button::deactivate();
}
};
Modified: branches/branch-3.0/fltk3/ReturnButton.h
===================================================================
--- branches/branch-3.0/fltk3/ReturnButton.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/ReturnButton.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -33,13 +33,13 @@
#include "Button.h"
/**
- The Fl_Return_Button is a subclass of Fl_Button that
+ The Fl_Return_Button is a subclass of fltk3::Button that
generates a callback when it is pressed or when the user presses the
Enter key. A carriage-return symbol is drawn next to the button label.
<P ALIGN=CENTER>\image html Fl_Return_Button.png
\image latex Fl_Return_Button.png "Fl_Return_Button" width=4cm
*/
-class FL_EXPORT Fl_Return_Button : public Fl_Button {
+class FL_EXPORT Fl_Return_Button : public fltk3::Button {
protected:
void draw();
public:
@@ -50,7 +50,7 @@
<P> The inherited destructor deletes the button.
*/
Fl_Return_Button(int X, int Y, int W, int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {}
+ : fltk3::Button(X,Y,W,H,l) {}
};
#endif
Modified: branches/branch-3.0/fltk3/Spinner.h
===================================================================
--- branches/branch-3.0/fltk3/Spinner.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Spinner.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -142,11 +142,11 @@
input_.value("1");
input_.type(FL_INT_INPUT);
input_.when(fltk3::WHEN_ENTER_KEY | fltk3::WHEN_RELEASE);
- input_.callback((Fl_Callback *)sb_cb, this);
+ input_.callback((fltk3::Callback *)sb_cb, this);
- up_button_.callback((Fl_Callback *)sb_cb, this);
+ up_button_.callback((fltk3::Callback *)sb_cb, this);
- down_button_.callback((Fl_Callback *)sb_cb, this);
+ down_button_.callback((fltk3::Callback *)sb_cb, this);
}
/** Sets or returns the format string for the value. */
Modified: branches/branch-3.0/fltk3/SysMenuBar.h
===================================================================
--- branches/branch-3.0/fltk3/SysMenuBar.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/SysMenuBar.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -53,8 +53,8 @@
fl_sys_menu_bar = this;
}
void menu(const Fl_Menu_Item *m);
- int add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0);
- int insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data=0, int flags=0);
+ int add(const char* label, int shortcut, fltk3::Callback*, void *user_data=0, int flags=0);
+ int insert(int index, const char* label, int shortcut, fltk3::Callback *cb, void *user_data=0, int flags=0);
void remove(int n);
void replace(int rank, const char *name);
void clear();
Modified: branches/branch-3.0/fltk3/ToggleButton.h
===================================================================
--- branches/branch-3.0/fltk3/ToggleButton.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/ToggleButton.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -42,7 +42,7 @@
control exactly when and how by changing the values for type()
and when().
*/
-class FL_EXPORT Fl_Toggle_Button : public Fl_Button {
+class FL_EXPORT Fl_Toggle_Button : public fltk3::Button {
public:
/**
Creates a new Fl_Toggle_Button widget using the given
@@ -50,7 +50,7 @@
<P>The inherited destructor deletes the toggle button.
*/
Fl_Toggle_Button(int X,int Y,int W,int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {type(FL_TOGGLE_BUTTON);}
+ : fltk3::Button(X,Y,W,H,l) {type(FL_TOGGLE_BUTTON);}
};
#endif
Modified: branches/branch-3.0/fltk3/Widget.h
===================================================================
--- branches/branch-3.0/fltk3/Widget.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/Widget.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -26,7 +26,7 @@
//
/** \file
- fltk3::Widget, Fl_Label classes . */
+ fltk3::Widget, fltk3::Label classes . */
#ifndef Fl_Widget_H
#define Fl_Widget_H
@@ -57,48 +57,47 @@
}
class Fl_Image;
-/** Default callback type definition for all fltk widgets (by far the most used) */
-typedef void (Fl_Callback )(fltk3::Widget*, void*);
-/** Default callback type pointer definition for all fltk widgets */
-typedef Fl_Callback* Fl_Callback_p; // needed for BORLAND
-/** One parameter callback type definition passing only the widget */
-typedef void (Fl_Callback0)(fltk3::Widget*);
-/** Callback type definition passing the widget and a long data value */
-typedef void (Fl_Callback1)(fltk3::Widget*, long);
-
-/** This struct stores all information for a text or mixed graphics label.
-
- \todo For FLTK 1.3, the Fl_Label type will become a widget by itself. That way
- we will be avoiding a lot of code duplication by handling labels in
- a similar fashion to widgets containing text. We also provide an easy
- interface for very complex labels, containing html or vector graphics.
- */
-struct FL_EXPORT Fl_Label {
- /** label text */
- const char* value;
- /** optional image for an active label */
- Fl_Image* image;
- /** optional image for a deactivated label */
- Fl_Image* deimage;
- /** label font used in text */
- fltk3::Font font;
- /** size of label font */
- fltk3::Fontsize size;
- /** text color */
- fltk3::Color color;
- /** alignment of label */
- fltk3::Align align_;
- /** type of label. \see fltk3::Labeltype */
- uchar type;
+namespace fltk3 {
+ /** Default callback type definition for all fltk widgets (by far the most used) */
+ typedef void (Callback)(Widget*, void*);
+ /** Default callback type pointer definition for all fltk widgets */
+ typedef Callback* CallbackPtr; // needed for BORLAND
+ /** One parameter callback type definition passing only the widget */
+ typedef void (Callback0)(Widget*);
+ /** Callback type definition passing the widget and a long data value */
+ typedef void (Callback1)(Widget*, long);
- /** Draws the label aligned to the given box */
- void draw(int,int,int,int, fltk3::Align) const ;
- void measure(int &w, int &h) const ;
-};
-
-
-namespace fltk3 {
+ /** This struct stores all information for a text or mixed graphics label.
+
+ \todo For FLTK 1.3, the fltk3::Label type will become a widget by itself. That way
+ we will be avoiding a lot of code duplication by handling labels in
+ a similar fashion to widgets containing text. We also provide an easy
+ interface for very complex labels, containing html or vector graphics.
+ */
+ struct FL_EXPORT Label {
+ /** label text */
+ const char* value;
+ /** optional image for an active label */
+ Fl_Image* image;
+ /** optional image for a deactivated label */
+ Fl_Image* deimage;
+ /** label font used in text */
+ fltk3::Font font;
+ /** size of label font */
+ fltk3::Fontsize size;
+ /** text color */
+ fltk3::Color color;
+ /** alignment of label */
+ 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, fltk3::Align) const ;
+ void measure(int &w, int &h) const ;
+ };
+
/** fltk3::Widget is the base class for all widgets in FLTK.
You can't create one of these because the constructor is not public.
@@ -115,10 +114,10 @@
friend class Group;
fltk3::Group* parent_;
- Fl_Callback* callback_;
+ fltk3::Callback* callback_;
void* user_data_;
int x_,y_,w_,h_;
- Fl_Label label_;
+ Label label_;
unsigned int flags_;
Color color_;
Color color2_;
@@ -559,33 +558,33 @@
Each widget has a single callback.
\return current callback
*/
- Fl_Callback_p callback() const {return callback_;}
+ CallbackPtr callback() const {return callback_;}
/** Sets the current callback function for the widget.
Each widget has a single callback.
\param[in] cb new callback
\param[in] p user data
*/
- void callback(Fl_Callback* cb, void* p) {callback_=cb; user_data_=p;}
+ void callback(fltk3::Callback* cb, void* p) {callback_=cb; user_data_=p;}
/** Sets the current callback function for the widget.
Each widget has a single callback.
\param[in] cb new callback
*/
- void callback(Fl_Callback* cb) {callback_=cb;}
+ void callback(fltk3::Callback* cb) {callback_=cb;}
/** Sets the current callback function for the widget.
Each widget has a single callback.
\param[in] cb new callback
*/
- void callback(Fl_Callback0*cb) {callback_=(Fl_Callback*)cb;}
+ void callback(fltk3::Callback0*cb) {callback_=(fltk3::Callback*)cb;}
/** Sets the current callback function for the widget.
Each widget has a single callback.
\param[in] cb new callback
\param[in] p user data
*/
- void callback(Fl_Callback1*cb, long p=0) {callback_=(Fl_Callback*)cb; user_data_=(void*)p;}
+ void callback(fltk3::Callback1*cb, long p=0) {callback_=(fltk3::Callback*)cb; user_data_=(void*)p;}
/** Gets the user data for this widget.
Gets the current user data (void *) argument that is passed to the callback function.
Modified: branches/branch-3.0/fltk3/enumerations.h
===================================================================
--- branches/branch-3.0/fltk3/enumerations.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/enumerations.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -334,7 +334,7 @@
// FIXME: These codes collide with valid Unicode keys
- const unsigned int MouseButton = 0xfee8; ///< A mouse button; use Fl_Button + n for mouse button n.
+ const unsigned int MouseButton = 0xfee8; ///< A mouse button; use fltk3::Button + n for mouse button n.
const unsigned int BackSpaceKey = 0xff08; ///< The backspace key.
const unsigned int TabKey = 0xff09; ///< The tab key.
const unsigned int EnterKey = 0xff0d; ///< The enter key.
Modified: branches/branch-3.0/fltk3/forms.h
===================================================================
--- branches/branch-3.0/fltk3/forms.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/forms.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -482,12 +482,12 @@
#define FL_PUSH_BUTTON FL_TOGGLE_BUTTON
#define FL_MENU_BUTTON 9
-FL_EXPORT Fl_Button* fl_add_button(uchar t,int x,int y,int w,int h,const char* l);
-inline int fl_get_button(fltk3::Widget* b) {return ((Fl_Button*)b)->value();}
-inline void fl_set_button(fltk3::Widget* b, int v) {((Fl_Button*)b)->value(v);}
+FL_EXPORT fltk3::Button* fl_add_button(uchar t,int x,int y,int w,int h,const char* l);
+inline int fl_get_button(fltk3::Widget* b) {return ((fltk3::Button*)b)->value();}
+inline void fl_set_button(fltk3::Widget* b, int v) {((fltk3::Button*)b)->value(v);}
inline int fl_get_button_numb(fltk3::Widget*) {return fltk3::event_button();}
inline void fl_set_button_shortcut(fltk3::Widget* b, const char* s,int=0) {
- ((Fl_Button*)b)->shortcut(s);}
+ ((fltk3::Button*)b)->shortcut(s);}
//#define fl_set_object_shortcut(b,s) fl_set_button_shortcut(b,s)
#include "LightButton.h"
Modified: branches/branch-3.0/fltk3/osx.h
===================================================================
--- branches/branch-3.0/fltk3/osx.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/osx.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -202,7 +202,7 @@
* \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., fltk3::META+'a')
*/
-extern void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut = 0);
+extern void fl_mac_set_about( fltk3::Callback *cb, void *user_data, int shortcut = 0);
/** \brief The version number of the running Mac OS X (e.g., 100604 for 10.6.4)
*/
Modified: branches/branch-3.0/fltk3/run.h
===================================================================
--- branches/branch-3.0/fltk3/run.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fltk3/run.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -29,8 +29,8 @@
fltk3 namespace
*/
-#ifndef Fl_H
-# define Fl_H
+#ifndef FLTK3_RUN_H
+# define FLTK3_RUN_H
#ifdef FLTK_HAVE_CAIRO
# include <fltk3/Cairo.h>
@@ -50,9 +50,9 @@
namespace fltk3 {
class Widget;
class Window;
+ struct Label;
}
class Fl_Image;
-struct Fl_Label;
namespace fltk3 {
@@ -73,10 +73,10 @@
@{ */
/** Signature of some label drawing functions passed as parameters */
- typedef void (LabelDrawF)(const Fl_Label *label, int x, int y, int w, int h, fltk3::Align align);
+ typedef void (LabelDrawF)(const fltk3::Label *label, int x, int y, int w, int h, fltk3::Align align);
/** Signature of some label measurement functions passed as parameters */
- typedef void (LabelMeasureF)(const Fl_Label *label, int &width, int &height);
+ typedef void (LabelMeasureF)(const fltk3::Label *label, int &width, int &height);
/** Signature of some box drawing functions passed as parameters */
typedef void (BoxDrawF)(int x, int y, int w, int h, fltk3::Color color);
@@ -897,7 +897,7 @@
void default_atclose(fltk3::Window*,void*);
/** For back compatibility, sets the fltk3::atclose handler callback. You
can now simply change the callback for the window instead.
- \see fltk3::Window::callback(Fl_Callback*) */
+ \see fltk3::Window::callback(fltk3::Callback*) */
inline void set_atclose(fltk3::AtcloseHandler f) {atclose = f;}
/** @} */
Modified: branches/branch-3.0/fluid/Fl_Menu_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -89,7 +89,7 @@
m->label(i->o->label() ? i->o->label() : "(nolabel)");
m->labeltype(i->o->labeltype());
}
- m->shortcut(((Fl_Button*)(i->o))->shortcut());
+ m->shortcut(((fltk3::Button*)(i->o))->shortcut());
m->callback(0,(void*)i);
m->flags = i->flags();
m->labelfont(i->o->labelfont());
@@ -120,12 +120,12 @@
return 0;
}
if (!o) {
- o = new Fl_Button(0,0,100,20); // create template widget
+ o = new fltk3::Button(0,0,100,20); // create template widget
o->labelsize(Fl_Widget_Type::default_size);
}
Fl_Menu_Item_Type* t = submenuflag ? new Fl_Submenu_Type() : new Fl_Menu_Item_Type();
- t->o = new Fl_Button(0,0,100,20);
+ t->o = new fltk3::Button(0,0,100,20);
t->factory = this;
t->add(p);
if (!reading_file) t->label(submenuflag ? "submenu" : "item");
@@ -274,7 +274,7 @@
int Fl_Menu_Item_Type::flags() {
int i = o->type();
- if (((Fl_Button*)o)->value()) i |= FL_MENU_VALUE;
+ if (((fltk3::Button*)o)->value()) i |= FL_MENU_VALUE;
if (!o->active()) i |= FL_MENU_INACTIVE;
if (!o->visible()) i |= FL_MENU_INVISIBLE;
if (is_parent()) {
@@ -301,8 +301,8 @@
if (image) write_c("0");
else if (label()) write_cstring(label()); // we will call i18n when the widget is instantiated for the first time
else write_c("\"\"");
- if (((Fl_Button*)o)->shortcut()) {
- int s = ((Fl_Button*)o)->shortcut();
+ if (((fltk3::Button*)o)->shortcut()) {
+ int s = ((fltk3::Button*)o)->shortcut();
if (use_FL_COMMAND && (s & (fltk3::CTRL|fltk3::META))) {
write_c(", fltk3::COMMAND|0x%x, ", s & ~(fltk3::CTRL|fltk3::META));
} else {
@@ -313,9 +313,9 @@
if (callback()) {
const char* k = is_name(callback()) ? 0 : class_name(1);
if (k) {
- write_c(" (Fl_Callback*)%s::%s,", k, callback_name());
+ write_c(" (fltk3::Callback*)%s::%s,", k, callback_name());
} else {
- write_c(" (Fl_Callback*)%s,", callback_name());
+ write_c(" (fltk3::Callback*)%s,", callback_name());
}
} else
write_c(" 0,");
@@ -426,7 +426,7 @@
m->label(i->o->label() ? i->o->label() : "(nolabel)");
m->labeltype(i->o->labeltype());
}
- m->shortcut(((Fl_Button*)(i->o))->shortcut());
+ m->shortcut(((fltk3::Button*)(i->o))->shortcut());
m->callback(0,(void*)i);
m->flags = i->flags();
m->labelfont(i->o->labelfont());
@@ -610,7 +610,7 @@
} else if (e == fltk3::FOCUS) {
return value();
} else {
- int r = Fl_Button::handle(e);
+ int r = fltk3::Button::handle(e);
if (e == fltk3::RELEASE && value() && fltk3::focus() != this) take_focus();
return r;
}
@@ -619,7 +619,7 @@
void shortcut_in_cb(Shortcut_Button* i, void* v) {
if (v == LOAD) {
if (current_widget->is_button())
- i->svalue = ((Fl_Button*)(current_widget->o))->shortcut();
+ i->svalue = ((fltk3::Button*)(current_widget->o))->shortcut();
else if (current_widget->is_input())
i->svalue = ((Fl_Input_*)(current_widget->o))->shortcut();
else if (current_widget->is_value_input())
@@ -636,7 +636,7 @@
int mod = 0;
for (Fl_Type *o = Fl_Type::first; o; o = o->next)
if (o->selected && o->is_button()) {
- Fl_Button* b = (Fl_Button*)(((Fl_Widget_Type*)o)->o);
+ fltk3::Button* b = (fltk3::Button*)(((Fl_Widget_Type*)o)->o);
if (b->shortcut()!=i->svalue) mod = 1;
b->shortcut(i->svalue);
if (o->is_menu_item()) ((Fl_Widget_Type*)o)->redraw();
Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -420,7 +420,7 @@
}
}
-void image_browse_cb(Fl_Button* b, void *v) {
+void image_browse_cb(fltk3::Button* b, void *v) {
if (v == LOAD) {
if (current_widget->is_widget() && !current_widget->is_window())
b->activate();
@@ -462,7 +462,7 @@
}
}
-void inactive_browse_cb(Fl_Button* b, void *v) {
+void inactive_browse_cb(fltk3::Button* b, void *v) {
if (v == LOAD) {
if (current_widget->is_widget() && !current_widget->is_window())
b->activate();
@@ -752,7 +752,7 @@
if (v == LOAD) {
int n;
if (current_widget->is_button() && !current_widget->is_menu_item())
- n = ((Fl_Button*)(current_widget->o))->down_box();
+ n = ((fltk3::Button*)(current_widget->o))->down_box();
else if (!strcmp(current_widget->type_name(), "Fl_Input_Choice"))
n = ((Fl_Input_Choice*)(current_widget->o))->down_box();
else if (current_widget->is_menu_button())
@@ -774,8 +774,8 @@
if (o->selected) {
if (o->is_button() && !o->is_menu_item()) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
- ((Fl_Button*)(q->o))->down_box((fltk3::Boxtype)n);
- if (((Fl_Button*)(q->o))->value()) q->redraw();
+ ((fltk3::Button*)(q->o))->down_box((fltk3::Boxtype)n);
+ if (((fltk3::Button*)(q->o))->value()) q->redraw();
} else if (!strcmp(o->type_name(), "Fl_Input_Choice")) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
((Fl_Input_Choice*)(q->o))->down_box((fltk3::Boxtype)n);
@@ -1057,7 +1057,7 @@
////////////////////////////////////////////////////////////////
-void color_cb(Fl_Button* i, void *v) {
+void color_cb(fltk3::Button* i, void *v) {
fltk3::Color c = current_widget->o->color();
if (v == LOAD) {
if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
@@ -1081,7 +1081,7 @@
i->color(c); i->labelcolor(fltk3::contrast(fltk3::BLACK,c)); i->redraw();
}
-void color2_cb(Fl_Button* i, void *v) {
+void color2_cb(fltk3::Button* i, void *v) {
fltk3::Color c = current_widget->o->selection_color();
if (v == LOAD) {
if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
@@ -1102,7 +1102,7 @@
i->color(c); i->labelcolor(fltk3::contrast(fltk3::BLACK,c)); i->redraw();
}
-void labelcolor_cb(Fl_Button* i, void *v) {
+void labelcolor_cb(fltk3::Button* i, void *v) {
fltk3::Color c = current_widget->o->labelcolor();
if (v != LOAD) {
int mod = 0;
@@ -1121,9 +1121,9 @@
i->color(c); i->labelcolor(fltk3::contrast(fltk3::BLACK,c)); i->redraw();
}
-static Fl_Button* relative(fltk3::Widget* o, int i) {
+static fltk3::Button* relative(fltk3::Widget* o, int i) {
fltk3::Group* g = (fltk3::Group*)(o->parent());
- return (Fl_Button*)(g->child(g->find(*o)+i));
+ return (fltk3::Button*)(g->child(g->find(*o)+i));
}
static Fl_Menu_Item alignmenu[] = {
@@ -1146,7 +1146,7 @@
{"fltk3::ALIGN_RIGHT_BOTTOM",0,0,(void*)(fltk3::ALIGN_RIGHT_BOTTOM)},
{0}};
-void align_cb(Fl_Button* i, void *v) {
+void align_cb(fltk3::Button* i, void *v) {
fltk3::Align b = fltk3::Align(fl_uintptr_t(i->user_data()));
if (v == LOAD) {
if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
@@ -1161,12 +1161,12 @@
if (i->value()) {
y = x | b;
if (b == fltk3::ALIGN_LEFT || b == fltk3::ALIGN_TOP) {
- Fl_Button *b1 = relative(i,+1);
+ fltk3::Button *b1 = relative(i,+1);
b1->clear();
y = y & ~(b1->argument());
}
if (b == fltk3::ALIGN_RIGHT || b == fltk3::ALIGN_BOTTOM) {
- Fl_Button *b1 = relative(i,-1);
+ fltk3::Button *b1 = relative(i,-1);
b1->clear();
y = y & ~(b1->argument());
}
@@ -1404,7 +1404,7 @@
i->value(s);
}
-void textcolor_cb(Fl_Button* i, void* v) {
+void textcolor_cb(fltk3::Button* i, void* v) {
fltk3::Font n; int s; fltk3::Color c;
if (v == LOAD) {
if (!current_widget->textstuff(0,n,s,c)) {i->deactivate(); return;}
@@ -1499,7 +1499,7 @@
}
}
-void set_min_size_cb(Fl_Button*, void* v) {
+void set_min_size_cb(fltk3::Button*, void* v) {
if (v == LOAD) {
} else {
int mod = 0;
@@ -1516,7 +1516,7 @@
}
}
-void set_max_size_cb(Fl_Button*, void* v) {
+void set_max_size_cb(fltk3::Button*, void* v) {
if (v == LOAD) {
} else {
int mod = 0;
@@ -1665,7 +1665,7 @@
i->value(((Fl_Valuator*)(current_widget->o))->value());
} else if (current_widget->is_button()) {
i->activate();
- i->value(((Fl_Button*)(current_widget->o))->value());
+ i->value(((fltk3::Button*)(current_widget->o))->value());
} else if (current_widget->is_spinner()) {
i->activate();
i->value(((Fl_Spinner*)(current_widget->o))->value());
@@ -1681,7 +1681,7 @@
((Fl_Valuator*)(q->o))->value(n);
mod = 1;
} else if (q->is_button()) {
- ((Fl_Button*)(q->o))->value(n != 0);
+ ((fltk3::Button*)(q->o))->value(n != 0);
if (q->is_menu_item()) q->redraw();
mod = 1;
} else if (q->is_spinner()) {
@@ -1750,7 +1750,7 @@
}
}
-void set_cb(Fl_Button*, void*) {
+void set_cb(fltk3::Button*, void*) {
haderror = 0;
fltk3::Widget*const* a = the_panel->array();
for (int i=the_panel->children(); i--;) {
@@ -1768,26 +1768,26 @@
if (!haderror) the_panel->hide();
}
-void revert_cb(Fl_Button*, void*) {
+void revert_cb(fltk3::Button*, void*) {
// We have to revert all dynamically changing fields:
// but for now only the first label works...
if (numselected == 1) current_widget->label(oldlabel);
propagate_load(the_panel, LOAD);
}
-void cancel_cb(Fl_Button* o, void* v) {
+void cancel_cb(fltk3::Button* o, void* v) {
revert_cb(o,v);
the_panel->hide();
}
void toggle_overlays(fltk3::Widget *,void *); // in Fl_Window_Type.cxx
-void overlay_cb(Fl_Button*o,void *v) {
+void overlay_cb(fltk3::Button*o,void *v) {
toggle_overlays(o,v);
}
void leave_live_mode_cb(fltk3::Widget*, void*);
-void live_mode_cb(Fl_Button*o,void *) {
+void live_mode_cb(fltk3::Button*o,void *) {
/// \todo live mode should end gracefully when the application quits
/// or when the user closes the live widget
static Fl_Type *live_type = 0L;
@@ -1815,7 +1815,7 @@
fltk3::Box *rsz_dummy = new fltk3::Box(110, h+20, 1, 25);
rsz_dummy->box(fltk3::NO_BOX);
rsz->resizable(rsz_dummy);
- Fl_Button *btn = new Fl_Button(10, h+20, 100, 25, "Exit Live Mode");
+ fltk3::Button *btn = new fltk3::Button(10, h+20, 100, 25, "Exit Live Mode");
btn->labelsize(12);
btn->callback(leave_live_mode_cb);
rsz->end();
@@ -2241,7 +2241,7 @@
// write shortcut command if needed
int shortcut = 0;
- if (is_button()) shortcut = ((Fl_Button*)o)->shortcut();
+ if (is_button()) shortcut = ((fltk3::Button*)o)->shortcut();
else if (is_input()) shortcut = ((Fl_Input_*)o)->shortcut();
else if (is_value_input()) shortcut = ((Fl_Value_Input*)o)->shortcut();
else if (is_text_display()) shortcut = ((Fl_Text_Display*)o)->shortcut();
@@ -2254,7 +2254,7 @@
}
if (is_button()) {
- Fl_Button* b = (Fl_Button*)o;
+ fltk3::Button* b = (fltk3::Button*)o;
if (b->down_box()) write_c("%s%s->down_box(FL_%s);\n", indent(), var,
boxname(b->down_box()));
if (b->value()) write_c("%s%s->value(1);\n", indent(), var);
@@ -2326,7 +2326,7 @@
const char* ud = user_data();
if (class_name(1) && !parent->is_widget()) ud = "this";
if (callback()) {
- write_c("%s%s->callback((Fl_Callback*)%s", indent(), var, callback_name());
+ write_c("%s%s->callback((fltk3::Callback*)%s", indent(), var, callback_name());
if (ud)
write_c(", (void*)(%s));\n", ud);
else
@@ -2429,7 +2429,7 @@
if (b->shortcut()) write_string("shortcut 0x%x", b->shortcut());
}
if (is_button()) {
- Fl_Button* b = (Fl_Button*)o;
+ fltk3::Button* b = (fltk3::Button*)o;
if (b->down_box()) {
write_string("down_box"); write_word(boxname(b->down_box()));}
if (b->shortcut()) write_string("shortcut 0x%x", b->shortcut());
@@ -2544,7 +2544,7 @@
const char* value = read_word();
if ((x = boxnumber(value))) {
if (x == ZERO_ENTRY) x = 0;
- ((Fl_Button*)o)->down_box((fltk3::Boxtype)x);
+ ((fltk3::Button*)o)->down_box((fltk3::Boxtype)x);
}
} else if (!strcmp(type_name(), "Fl_Input_Choice") && !strcmp(c,"down_box")) {
const char* value = read_word();
@@ -2560,7 +2560,7 @@
}
} else if (is_button() && !strcmp(c,"value")) {
const char* value = read_word();
- ((Fl_Button*)o)->value(atoi(value));
+ ((fltk3::Button*)o)->value(atoi(value));
} else if (!strcmp(c,"color")) {
const char *cw = read_word();
if (cw[0]=='0' && cw[1]=='x') {
@@ -2630,7 +2630,7 @@
subclass(read_word());
} else if (!strcmp(c,"shortcut")) {
int shortcut = strtol(read_word(),0,0);
- if (is_button()) ((Fl_Button*)o)->shortcut(shortcut);
+ if (is_button()) ((fltk3::Button*)o)->shortcut(shortcut);
else if (is_input()) ((Fl_Input_*)o)->shortcut(shortcut);
else if (is_value_input()) ((Fl_Value_Input*)o)->shortcut(shortcut);
else if (is_text_display()) ((Fl_Text_Display*)o)->shortcut(shortcut);
@@ -2799,9 +2799,9 @@
w->labelcolor(o->labelcolor());
w->align(o->align());
- // copy all attributes specific to widgets derived from Fl_Button
+ // copy all attributes specific to widgets derived from fltk3::Button
if (is_button()) {
- Fl_Button* d = (Fl_Button*)live_widget, *s = (Fl_Button*)o;
+ fltk3::Button* d = (fltk3::Button*)live_widget, *s = (fltk3::Button*)o;
d->down_box(s->down_box());
d->shortcut(s->shortcut());
d->value(s->value());
Modified: branches/branch-3.0/fluid/Shortcut_Button.h
===================================================================
--- branches/branch-3.0/fluid/Shortcut_Button.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/Shortcut_Button.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -27,13 +27,13 @@
#include <fltk3/Button.h>
-class Shortcut_Button : public Fl_Button {
+class Shortcut_Button : public fltk3::Button {
public:
int svalue;
int handle(int);
void draw();
Shortcut_Button(int X,int Y,int W,int H, const char* l = 0) :
- Fl_Button(X,Y,W,H,l) {svalue = 0;}
+ fltk3::Button(X,Y,W,H,l) {svalue = 0;}
};
//
Modified: branches/branch-3.0/fluid/about_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/about_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/about_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -262,7 +262,7 @@
};
static Fl_Pixmap image_fluid(idata_fluid);
-static void cb_View(Fl_Button*, void*) {
+static void cb_View(fltk3::Button*, void*) {
show_help("license.html");
}
@@ -288,12 +288,12 @@
{ fltk3::Box* o = new fltk3::Box(135, 90, 200, 45, "Copyright 1998-2010 by\nBill Spitzak and others");
o->align(fltk3::Align(132|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
- { Fl_Button* o = new Fl_Button(115, 145, 123, 25, "View License...");
+ { fltk3::Button* o = new fltk3::Button(115, 145, 123, 25, "View License...");
o->labelcolor(fltk3::DARK_BLUE);
- o->callback((Fl_Callback*)cb_View);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)cb_View);
+ } // fltk3::Button* o
{ Fl_Return_Button* o = new Fl_Return_Button(250, 145, 83, 25, "Close");
- o->callback((Fl_Callback*)cb_Close);
+ o->callback((fltk3::Callback*)cb_Close);
} // Fl_Return_Button* o
about_panel->set_non_modal();
about_panel->end();
Modified: branches/branch-3.0/fluid/alignment_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/alignment_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/alignment_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -34,7 +34,7 @@
Fl_Double_Window *project_window=(Fl_Double_Window *)0;
-static void cb_Close(Fl_Button*, void*) {
+static void cb_Close(fltk3::Button*, void*) {
project_window->hide();
}
@@ -65,10 +65,10 @@
Fl_Double_Window* make_project_window() {
{ project_window = new Fl_Double_Window(399, 252, "Project Settings");
- { Fl_Button* o = new Fl_Button(328, 216, 60, 25, "Close");
+ { fltk3::Button* o = new fltk3::Button(328, 216, 60, 25, "Close");
o->tooltip("Close this dialog.");
- o->callback((Fl_Callback*)cb_Close);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)cb_Close);
+ } // fltk3::Button* o
{ Fl_Tabs* o = new Fl_Tabs(10, 10, 378, 195);
o->selection_color((fltk3::Color)12);
{ fltk3::Group* o = new fltk3::Group(10, 36, 378, 169, "Output");
@@ -81,7 +81,7 @@
header_file_input->box(fltk3::THIN_DOWN_BOX);
header_file_input->labelfont(1);
header_file_input->textfont(4);
- header_file_input->callback((Fl_Callback*)header_input_cb, (void*)(1));
+ header_file_input->callback((fltk3::Callback*)header_input_cb, (void*)(1));
header_file_input->when(fltk3::WHEN_CHANGED);
} // Fl_Input* header_file_input
{ code_file_input = new Fl_Input(100, 128, 272, 20, "Code File:");
@@ -89,18 +89,18 @@
code_file_input->box(fltk3::THIN_DOWN_BOX);
code_file_input->labelfont(1);
code_file_input->textfont(4);
- code_file_input->callback((Fl_Callback*)code_input_cb, (void*)(1));
+ code_file_input->callback((fltk3::Callback*)code_input_cb, (void*)(1));
code_file_input->when(fltk3::WHEN_CHANGED);
} // Fl_Input* code_file_input
{ include_H_from_C_button = new Fl_Check_Button(100, 153, 272, 20, "Include Header from Code");
include_H_from_C_button->tooltip("Include the header file from the code file.");
include_H_from_C_button->down_box(fltk3::DOWN_BOX);
- include_H_from_C_button->callback((Fl_Callback*)include_H_from_C_button_cb);
+ include_H_from_C_button->callback((fltk3::Callback*)include_H_from_C_button_cb);
} // Fl_Check_Button* include_H_from_C_button
{ use_FL_COMMAND_button = new Fl_Check_Button(100, 176, 272, 20, "Menu shortcuts use fltk3::COMMAND");
use_FL_COMMAND_button->tooltip("Replace fltk3::CTRL with fltk3::COMMAND when generating menu shortcut code.");
use_FL_COMMAND_button->down_box(fltk3::DOWN_BOX);
- use_FL_COMMAND_button->callback((Fl_Callback*)use_FL_COMMAND_button_cb);
+ use_FL_COMMAND_button->callback((fltk3::Callback*)use_FL_COMMAND_button_cb);
} // Fl_Check_Button* use_FL_COMMAND_button
o->end();
} // fltk3::Group* o
@@ -110,7 +110,7 @@
i18n_type_chooser->box(fltk3::THIN_UP_BOX);
i18n_type_chooser->down_box(fltk3::BORDER_BOX);
i18n_type_chooser->labelfont(1);
- i18n_type_chooser->callback((Fl_Callback*)i18n_type_cb);
+ i18n_type_chooser->callback((fltk3::Callback*)i18n_type_cb);
i18n_type_chooser->menu(menu_i18n_type_chooser);
} // Fl_Choice* i18n_type_chooser
{ i18n_include_input = new Fl_Input(100, 78, 272, 20, "#include:");
@@ -118,14 +118,14 @@
i18n_include_input->box(fltk3::THIN_DOWN_BOX);
i18n_include_input->labelfont(1);
i18n_include_input->textfont(4);
- i18n_include_input->callback((Fl_Callback*)i18n_text_cb);
+ i18n_include_input->callback((fltk3::Callback*)i18n_text_cb);
} // Fl_Input* i18n_include_input
{ i18n_file_input = new Fl_Input(100, 104, 272, 20, "File:");
i18n_file_input->tooltip("The name of the message catalog.");
i18n_file_input->box(fltk3::THIN_DOWN_BOX);
i18n_file_input->labelfont(1);
i18n_file_input->textfont(4);
- i18n_file_input->callback((Fl_Callback*)i18n_text_cb);
+ i18n_file_input->callback((fltk3::Callback*)i18n_text_cb);
} // Fl_Input* i18n_file_input
{ i18n_set_input = new Fl_Int_Input(100, 128, 272, 20, "Set:");
i18n_set_input->tooltip("The message set number.");
@@ -133,14 +133,14 @@
i18n_set_input->box(fltk3::THIN_DOWN_BOX);
i18n_set_input->labelfont(1);
i18n_set_input->textfont(4);
- i18n_set_input->callback((Fl_Callback*)i18n_int_cb);
+ i18n_set_input->callback((fltk3::Callback*)i18n_int_cb);
} // Fl_Int_Input* i18n_set_input
{ i18n_function_input = new Fl_Input(100, 103, 272, 20, "Function:");
i18n_function_input->tooltip("The function to call to internationalize the labels and tooltips.");
i18n_function_input->box(fltk3::THIN_DOWN_BOX);
i18n_function_input->labelfont(1);
i18n_function_input->textfont(4);
- i18n_function_input->callback((Fl_Callback*)i18n_text_cb);
+ i18n_function_input->callback((fltk3::Callback*)i18n_text_cb);
} // Fl_Input* i18n_function_input
o->end();
} // fltk3::Group* o
@@ -205,7 +205,7 @@
load_history();
}
-static void cb_Close1(Fl_Button*, void*) {
+static void cb_Close1(fltk3::Button*, void*) {
settings_window->hide();
}
@@ -214,7 +214,7 @@
{ scheme_choice = new Fl_Choice(116, 10, 115, 25, "Scheme: ");
scheme_choice->down_box(fltk3::BORDER_BOX);
scheme_choice->labelfont(1);
- scheme_choice->callback((Fl_Callback*)scheme_cb);
+ scheme_choice->callback((fltk3::Callback*)scheme_cb);
scheme_choice->menu(menu_scheme_choice);
int s;
fluid_prefs.get("scheme", s, 0);
@@ -230,7 +230,7 @@
} // fltk3::Box* o
{ tooltips_button = new Fl_Check_Button(116, 43, 113, 25, "Show Tooltips");
tooltips_button->down_box(fltk3::DOWN_BOX);
- tooltips_button->callback((Fl_Callback*)cb_tooltips_button);
+ tooltips_button->callback((fltk3::Callback*)cb_tooltips_button);
int b;
fluid_prefs.get("show_tooltips", b, 1);
tooltips_button->value(b);
@@ -238,28 +238,28 @@
} // Fl_Check_Button* tooltips_button
{ completion_button = new Fl_Check_Button(116, 68, 186, 25, "Show Completion Dialogs");
completion_button->down_box(fltk3::DOWN_BOX);
- completion_button->callback((Fl_Callback*)cb_completion_button);
+ completion_button->callback((fltk3::Callback*)cb_completion_button);
int b;
fluid_prefs.get("show_completion_dialogs", b, 1);
completion_button->value(b);
} // Fl_Check_Button* completion_button
{ openlast_button = new Fl_Check_Button(116, 93, 214, 25, "Open Previous File on Startup");
openlast_button->down_box(fltk3::DOWN_BOX);
- openlast_button->callback((Fl_Callback*)cb_openlast_button);
+ openlast_button->callback((fltk3::Callback*)cb_openlast_button);
int b;
fluid_prefs.get("open_previous_file", b, 0);
openlast_button->value(b);
} // Fl_Check_Button* openlast_button
{ prevpos_button = new Fl_Check_Button(116, 118, 209, 25, "Remember Window Positions");
prevpos_button->down_box(fltk3::DOWN_BOX);
- prevpos_button->callback((Fl_Callback*)cb_prevpos_button);
+ prevpos_button->callback((fltk3::Callback*)cb_prevpos_button);
int b;
fluid_prefs.get("prev_window_pos", b, 1);
prevpos_button->value(b);
} // Fl_Check_Button* prevpos_button
{ show_comments_button = new Fl_Check_Button(116, 143, 209, 25, "Show Comments in Browser");
show_comments_button->down_box(fltk3::DOWN_BOX);
- show_comments_button->callback((Fl_Callback*)cb_show_comments_button);
+ show_comments_button->callback((fltk3::Callback*)cb_show_comments_button);
fluid_prefs.get("show_comments", show_comments, 1);
show_comments_button->value(show_comments);
} // Fl_Check_Button* show_comments_button
@@ -267,17 +267,17 @@
} // fltk3::Group* o
{ recent_spinner = new Fl_Spinner(115, 173, 40, 25, "# Recent Files: ");
recent_spinner->labelfont(1);
- recent_spinner->callback((Fl_Callback*)cb_recent_spinner);
+ recent_spinner->callback((fltk3::Callback*)cb_recent_spinner);
recent_spinner->when(fltk3::WHEN_CHANGED);
int c;
fluid_prefs.get("recent_files", c, 5);
recent_spinner->maximum(10);
recent_spinner->value(c);
} // Fl_Spinner* recent_spinner
- { Fl_Button* o = new Fl_Button(266, 205, 64, 25, "Close");
+ { fltk3::Button* o = new fltk3::Button(266, 205, 64, 25, "Close");
o->tooltip("Close this dialog.");
- o->callback((Fl_Callback*)cb_Close1);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)cb_Close1);
+ } // fltk3::Button* o
settings_window->set_non_modal();
settings_window->end();
} // Fl_Double_Window* settings_window
@@ -310,7 +310,7 @@
fluid_prefs.set("shell_savefl", shell_savefl_button->value());
}
-static void cb_Cancel(Fl_Button*, void*) {
+static void cb_Cancel(fltk3::Button*, void*) {
shell_window->hide();
}
@@ -328,7 +328,7 @@
{ shell_window = new Fl_Double_Window(365, 125, "Shell Command");
{ shell_command_input = new Fl_Input(10, 27, 347, 25, "Command:");
shell_command_input->labelfont(1);
- shell_command_input->callback((Fl_Callback*)cb_shell_command_input);
+ shell_command_input->callback((fltk3::Callback*)cb_shell_command_input);
shell_command_input->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
char buf[1024];
fluid_prefs.get("shell_command", buf, "", sizeof(buf));
@@ -336,31 +336,31 @@
} // Fl_Input* shell_command_input
{ shell_writecode_button = new Fl_Check_Button(128, 61, 93, 19, "Write Code");
shell_writecode_button->down_box(fltk3::DOWN_BOX);
- shell_writecode_button->callback((Fl_Callback*)cb_shell_writecode_button);
+ shell_writecode_button->callback((fltk3::Callback*)cb_shell_writecode_button);
int b;
fluid_prefs.get("shell_writecode", b, 1);
shell_writecode_button->value(b);
} // Fl_Check_Button* shell_writecode_button
{ shell_writemsgs_button = new Fl_Check_Button(231, 61, 126, 19, "Write Messages");
shell_writemsgs_button->down_box(fltk3::DOWN_BOX);
- shell_writemsgs_button->callback((Fl_Callback*)cb_shell_writemsgs_button);
+ shell_writemsgs_button->callback((fltk3::Callback*)cb_shell_writemsgs_button);
int b;
fluid_prefs.get("shell_writemsgs", b, 0);
shell_writemsgs_button->value(b);
} // Fl_Check_Button* shell_writemsgs_button
{ shell_savefl_button = new Fl_Check_Button(10, 62, 108, 19, "Save .FL File");
shell_savefl_button->down_box(fltk3::DOWN_BOX);
- shell_savefl_button->callback((Fl_Callback*)cb_shell_savefl_button);
+ shell_savefl_button->callback((fltk3::Callback*)cb_shell_savefl_button);
int b;
fluid_prefs.get("shell_savefl", b, 1);
shell_savefl_button->value(b);
} // Fl_Check_Button* shell_savefl_button
{ Fl_Return_Button* o = new Fl_Return_Button(132, 90, 143, 25, "Run Command");
- o->callback((Fl_Callback*)do_shell_command);
+ o->callback((fltk3::Callback*)do_shell_command);
} // Fl_Return_Button* o
- { Fl_Button* o = new Fl_Button(285, 90, 72, 25, "Cancel");
- o->callback((Fl_Callback*)cb_Cancel);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(285, 90, 72, 25, "Cancel");
+ o->callback((fltk3::Callback*)cb_Cancel);
+ } // fltk3::Button* o
shell_window->end();
} // Fl_Double_Window* shell_window
{ shell_run_window = new Fl_Double_Window(555, 430, "Shell Command Output");
@@ -372,7 +372,7 @@
shell_run_display->buffer(shell_run_buffer);
} // Fl_Text_Display* shell_run_display
{ shell_run_button = new Fl_Return_Button(468, 395, 77, 25, "Close");
- shell_run_button->callback((Fl_Callback*)cb_shell_run_button);
+ shell_run_button->callback((fltk3::Callback*)cb_shell_run_button);
} // Fl_Return_Button* shell_run_button
shell_run_window->end();
} // Fl_Double_Window* shell_run_window
@@ -389,7 +389,7 @@
Fl_Check_Button *guides_toggle=(Fl_Check_Button *)0;
-static void cb_Close2(Fl_Button*, void*) {
+static void cb_Close2(fltk3::Button*, void*) {
grid_window->hide();
}
@@ -401,7 +401,7 @@
horizontal_input->tooltip("Horizontal grid spacing.");
horizontal_input->type(2);
horizontal_input->box(fltk3::THIN_DOWN_BOX);
- horizontal_input->callback((Fl_Callback*)grid_cb, (void*)(1));
+ horizontal_input->callback((fltk3::Callback*)grid_cb, (void*)(1));
horizontal_input->align(fltk3::Align(fltk3::ALIGN_RIGHT));
o->when(fltk3::WHEN_RELEASE|fltk3::WHEN_ENTER_KEY);
} // Fl_Int_Input* horizontal_input
@@ -409,7 +409,7 @@
vertical_input->tooltip("Vertical grid spacing.");
vertical_input->type(2);
vertical_input->box(fltk3::THIN_DOWN_BOX);
- vertical_input->callback((Fl_Callback*)grid_cb, (void*)(2));
+ vertical_input->callback((fltk3::Callback*)grid_cb, (void*)(2));
vertical_input->align(fltk3::Align(fltk3::ALIGN_RIGHT));
o->when(fltk3::WHEN_RELEASE|fltk3::WHEN_ENTER_KEY);
} // Fl_Int_Input* vertical_input
@@ -417,19 +417,19 @@
snap_input->tooltip("Snap to grid within this many pixels.");
snap_input->type(2);
snap_input->box(fltk3::THIN_DOWN_BOX);
- snap_input->callback((Fl_Callback*)grid_cb, (void*)(3));
+ snap_input->callback((fltk3::Callback*)grid_cb, (void*)(3));
snap_input->align(fltk3::Align(fltk3::ALIGN_RIGHT));
o->when(fltk3::WHEN_RELEASE|fltk3::WHEN_ENTER_KEY);
} // Fl_Int_Input* snap_input
{ guides_toggle = new Fl_Check_Button(106, 80, 110, 25, "Show Guides");
guides_toggle->tooltip("Show distance and alignment guides in overlay");
guides_toggle->down_box(fltk3::DOWN_BOX);
- guides_toggle->callback((Fl_Callback*)guides_cb, (void*)(4));
+ guides_toggle->callback((fltk3::Callback*)guides_cb, (void*)(4));
} // Fl_Check_Button* guides_toggle
- { Fl_Button* o = new Fl_Button(215, 210, 60, 25, "Close");
+ { fltk3::Button* o = new fltk3::Button(215, 210, 60, 25, "Close");
o->tooltip("Close this dialog.");
- o->callback((Fl_Callback*)cb_Close2);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)cb_Close2);
+ } // fltk3::Button* o
{ fltk3::Box* o = new fltk3::Box(26, 10, 70, 25, "Grid:");
o->labelfont(1);
o->align(fltk3::Align(fltk3::ALIGN_RIGHT|fltk3::ALIGN_INSIDE));
@@ -442,7 +442,7 @@
{ def_widget_size[0] = new Fl_Round_Button(105, 115, 70, 25);
def_widget_size[0]->type(102);
def_widget_size[0]->down_box(fltk3::ROUND_DOWN_BOX);
- def_widget_size[0]->callback((Fl_Callback*)default_widget_size_cb, (void*)(8));
+ def_widget_size[0]->callback((fltk3::Callback*)default_widget_size_cb, (void*)(8));
} // Fl_Round_Button* def_widget_size[0]
{ fltk3::Box* o = new fltk3::Box(120, 115, 50, 25, "tiny");
o->labelsize(8);
@@ -451,7 +451,7 @@
{ def_widget_size[1] = new Fl_Round_Button(180, 115, 70, 25);
def_widget_size[1]->type(102);
def_widget_size[1]->down_box(fltk3::ROUND_DOWN_BOX);
- def_widget_size[1]->callback((Fl_Callback*)default_widget_size_cb, (void*)(11));
+ def_widget_size[1]->callback((fltk3::Callback*)default_widget_size_cb, (void*)(11));
} // Fl_Round_Button* def_widget_size[1]
{ fltk3::Box* o = new fltk3::Box(195, 115, 50, 25, "small");
o->labelsize(11);
@@ -460,7 +460,7 @@
{ def_widget_size[2] = new Fl_Round_Button(105, 140, 70, 25);
def_widget_size[2]->type(102);
def_widget_size[2]->down_box(fltk3::ROUND_DOWN_BOX);
- def_widget_size[2]->callback((Fl_Callback*)default_widget_size_cb, (void*)(14));
+ def_widget_size[2]->callback((fltk3::Callback*)default_widget_size_cb, (void*)(14));
} // Fl_Round_Button* def_widget_size[2]
{ fltk3::Box* o = new fltk3::Box(120, 140, 50, 25, "normal");
o->align(fltk3::Align(fltk3::ALIGN_LEFT|fltk3::ALIGN_INSIDE));
@@ -468,7 +468,7 @@
{ def_widget_size[3] = new Fl_Round_Button(180, 140, 90, 25);
def_widget_size[3]->type(102);
def_widget_size[3]->down_box(fltk3::ROUND_DOWN_BOX);
- def_widget_size[3]->callback((Fl_Callback*)default_widget_size_cb, (void*)(18));
+ def_widget_size[3]->callback((fltk3::Callback*)default_widget_size_cb, (void*)(18));
} // Fl_Round_Button* def_widget_size[3]
{ fltk3::Box* o = new fltk3::Box(195, 140, 68, 25, "medium");
o->labelsize(18);
@@ -477,7 +477,7 @@
{ def_widget_size[4] = new Fl_Round_Button(105, 165, 75, 25);
def_widget_size[4]->type(102);
def_widget_size[4]->down_box(fltk3::ROUND_DOWN_BOX);
- def_widget_size[4]->callback((Fl_Callback*)default_widget_size_cb, (void*)(24));
+ def_widget_size[4]->callback((fltk3::Callback*)default_widget_size_cb, (void*)(24));
} // Fl_Round_Button* def_widget_size[4]
{ fltk3::Box* o = new fltk3::Box(120, 165, 64, 25, "large");
o->labelsize(24);
@@ -486,7 +486,7 @@
{ def_widget_size[5] = new Fl_Round_Button(180, 165, 95, 25);
def_widget_size[5]->type(102);
def_widget_size[5]->down_box(fltk3::ROUND_DOWN_BOX);
- def_widget_size[5]->callback((Fl_Callback*)default_widget_size_cb, (void*)(32));
+ def_widget_size[5]->callback((fltk3::Callback*)default_widget_size_cb, (void*)(32));
} // Fl_Round_Button* def_widget_size[5]
{ fltk3::Box* o = new fltk3::Box(195, 165, 76, 25, "huge");
o->labelsize(32);
@@ -655,11 +655,11 @@
{0,0,0,0,0,0,0,0,0}
};
-static void cb_Cancel1(Fl_Button*, void*) {
+static void cb_Cancel1(fltk3::Button*, void*) {
global_settings_window->hide();
}
-static void cb_OK(Fl_Button*, void*) {
+static void cb_OK(fltk3::Button*, void*) {
writePrefs();
global_settings_window->hide();
}
@@ -677,7 +677,7 @@
hed off, no such indicator will be drawn and keyboard navigation is disabled.\
\n\nDefault is on.");
wVisibleFocus->down_box(fltk3::BORDER_BOX);
- wVisibleFocus->callback((Fl_Callback*)cb_wVisibleFocus);
+ wVisibleFocus->callback((fltk3::Callback*)cb_wVisibleFocus);
wVisibleFocus->menu(menu_wVisibleFocus);
} // Fl_Choice* wVisibleFocus
{ wArrowFocus = new Fl_Choice(245, 75, 100, 25, "Arrow Keys move Focus:");
@@ -687,7 +687,7 @@
Ctrl-Tab will advance the keyboard focus. Switch this on, if you want the old\
behavior of FLTK 1.1.\n\nDefault is off.");
wArrowFocus->down_box(fltk3::BORDER_BOX);
- wArrowFocus->callback((Fl_Callback*)cb_wArrowFocus);
+ wArrowFocus->callback((fltk3::Callback*)cb_wArrowFocus);
wArrowFocus->menu(menu_wArrowFocus);
} // Fl_Choice* wArrowFocus
o->end();
@@ -701,7 +701,7 @@
dget with a tooltip text will open a little tooltip window until the mouse lea\
ves the widget. If disabled, no tooltip is shown.\n\nDefault is on.");
wShowTooltips->down_box(fltk3::BORDER_BOX);
- wShowTooltips->callback((Fl_Callback*)cb_wShowTooltips);
+ wShowTooltips->callback((fltk3::Callback*)cb_wShowTooltips);
wShowTooltips->menu(menu_wShowTooltips);
} // Fl_Choice* wShowTooltips
o->end();
@@ -715,7 +715,7 @@
drag text from any text widget. If disabled, no dragging is possible, however \
dropping text from other applications still works.\n\nDefault is on.");
wDNDText->down_box(fltk3::BORDER_BOX);
- wDNDText->callback((Fl_Callback*)cb_wDNDText);
+ wDNDText->callback((fltk3::Callback*)cb_wDNDText);
wDNDText->menu(menu_wDNDText);
} // Fl_Choice* wDNDText
o->end();
@@ -725,15 +725,15 @@
computer. Individual users can override system options, if they set their opt\
ions to specific values (not \'default\').");
wUserOrSystem->down_box(fltk3::BORDER_BOX);
- wUserOrSystem->callback((Fl_Callback*)cb_wUserOrSystem);
+ wUserOrSystem->callback((fltk3::Callback*)cb_wUserOrSystem);
wUserOrSystem->menu(menu_wUserOrSystem);
} // Fl_Choice* wUserOrSystem
- { Fl_Button* o = new Fl_Button(230, 275, 75, 25, "Cancel");
- o->callback((Fl_Callback*)cb_Cancel1);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(315, 275, 75, 25, "OK");
- o->callback((Fl_Callback*)cb_OK);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(230, 275, 75, 25, "Cancel");
+ o->callback((fltk3::Callback*)cb_Cancel1);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(315, 275, 75, 25, "OK");
+ o->callback((fltk3::Callback*)cb_OK);
+ } // fltk3::Button* o
global_settings_window->end();
} // Fl_Double_Window* global_settings_window
readPrefs();
Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/factory.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -102,10 +102,10 @@
w += 2 * (o->labelsize() - 4);
h = (h / 5) * 5;
}
- virtual const char *type_name() {return "Fl_Button";}
+ virtual const char *type_name() {return "fltk3::Button";}
virtual const char *alt_type_name() {return "fltk::Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
- return new Fl_Button(x,y,w,h,"button");}
+ return new fltk3::Button(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Button_Type();}
int is_button() const {return 1;}
int pixmapID() { return 2; }
Modified: branches/branch-3.0/fluid/file.cxx
===================================================================
--- branches/branch-3.0/fluid/file.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/file.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -633,8 +633,8 @@
value = class_matcher[i+1]; break;}
widget = (Fl_Widget_Type*)Fl_Type_make(value);
if (!widget) {
- printf("class %s not found, using Fl_Button\n", value);
- widget = (Fl_Widget_Type*)Fl_Type_make("Fl_Button");
+ printf("class %s not found, using fltk3::Button\n", value);
+ widget = (Fl_Widget_Type*)Fl_Type_make("fltk3::Button");
}
}
Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/fluid.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -1679,7 +1679,7 @@
{"Ung&roup", fltk3::FKey+8, ungroup_cb,0, FL_MENU_DIVIDER},
{"Hide O&verlays",fltk3::COMMAND+fltk3::SHIFT+'o',toggle_overlays},
{"Show Widget &Bin...",fltk3::ALT+'b',toggle_widgetbin_cb},
- {"Show Source Code...",fltk3::ALT+fltk3::SHIFT+'s', (Fl_Callback*)toggle_sourceview_cb, 0, FL_MENU_DIVIDER},
+ {"Show Source Code...",fltk3::ALT+fltk3::SHIFT+'s', (fltk3::Callback*)toggle_sourceview_cb, 0, FL_MENU_DIVIDER},
{"Pro&ject Settings...",fltk3::ALT+'p',show_project_cb},
{"GU&I Settings...",fltk3::ALT+fltk3::SHIFT+'p',show_settings_cb,0,FL_MENU_DIVIDER},
{"Global &FLTK Settings...",fltk3::ALT+fltk3::SHIFT+'g',show_global_settings_cb},
@@ -1687,39 +1687,39 @@
{"&New", 0, 0, (void *)New_Menu, FL_SUBMENU_POINTER},
{"&Layout",0,0,0,FL_SUBMENU},
{"&Align",0,0,0,FL_SUBMENU},
- {"&Left",0,(Fl_Callback *)align_widget_cb,(void*)10},
- {"&Center",0,(Fl_Callback *)align_widget_cb,(void*)11},
- {"&Right",0,(Fl_Callback *)align_widget_cb,(void*)12},
- {"&Top",0,(Fl_Callback *)align_widget_cb,(void*)13},
- {"&Middle",0,(Fl_Callback *)align_widget_cb,(void*)14},
- {"&Bottom",0,(Fl_Callback *)align_widget_cb,(void*)15},
+ {"&Left",0,(fltk3::Callback *)align_widget_cb,(void*)10},
+ {"&Center",0,(fltk3::Callback *)align_widget_cb,(void*)11},
+ {"&Right",0,(fltk3::Callback *)align_widget_cb,(void*)12},
+ {"&Top",0,(fltk3::Callback *)align_widget_cb,(void*)13},
+ {"&Middle",0,(fltk3::Callback *)align_widget_cb,(void*)14},
+ {"&Bottom",0,(fltk3::Callback *)align_widget_cb,(void*)15},
{0},
{"&Space Evenly",0,0,0,FL_SUBMENU},
- {"&Across",0,(Fl_Callback *)align_widget_cb,(void*)20},
- {"&Down",0,(Fl_Callback *)align_widget_cb,(void*)21},
+ {"&Across",0,(fltk3::Callback *)align_widget_cb,(void*)20},
+ {"&Down",0,(fltk3::Callback *)align_widget_cb,(void*)21},
{0},
{"&Make Same Size",0,0,0,FL_SUBMENU},
- {"&Width",0,(Fl_Callback *)align_widget_cb,(void*)30},
- {"&Height",0,(Fl_Callback *)align_widget_cb,(void*)31},
- {"&Both",0,(Fl_Callback *)align_widget_cb,(void*)32},
+ {"&Width",0,(fltk3::Callback *)align_widget_cb,(void*)30},
+ {"&Height",0,(fltk3::Callback *)align_widget_cb,(void*)31},
+ {"&Both",0,(fltk3::Callback *)align_widget_cb,(void*)32},
{0},
{"&Center In Group",0,0,0,FL_SUBMENU},
- {"&Horizontal",0,(Fl_Callback *)align_widget_cb,(void*)40},
- {"&Vertical",0,(Fl_Callback *)align_widget_cb,(void*)41},
+ {"&Horizontal",0,(fltk3::Callback *)align_widget_cb,(void*)40},
+ {"&Vertical",0,(fltk3::Callback *)align_widget_cb,(void*)41},
{0},
{"Set &Widget Size",0,0,0,FL_SUBMENU|FL_MENU_DIVIDER},
- {"&Tiny",fltk3::ALT+'1',(Fl_Callback *)widget_size_cb,(void*)8,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,8},
- {"&Small",fltk3::ALT+'2',(Fl_Callback *)widget_size_cb,(void*)11,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,11},
- {"&Normal",fltk3::ALT+'3',(Fl_Callback *)widget_size_cb,(void*)14,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,14},
- {"&Medium",fltk3::ALT+'4',(Fl_Callback *)widget_size_cb,(void*)18,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,18},
- {"&Large",fltk3::ALT+'5',(Fl_Callback *)widget_size_cb,(void*)24,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,24},
- {"&Huge",fltk3::ALT+'6',(Fl_Callback *)widget_size_cb,(void*)32,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,32},
+ {"&Tiny",fltk3::ALT+'1',(fltk3::Callback *)widget_size_cb,(void*)8,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,8},
+ {"&Small",fltk3::ALT+'2',(fltk3::Callback *)widget_size_cb,(void*)11,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,11},
+ {"&Normal",fltk3::ALT+'3',(fltk3::Callback *)widget_size_cb,(void*)14,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,14},
+ {"&Medium",fltk3::ALT+'4',(fltk3::Callback *)widget_size_cb,(void*)18,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,18},
+ {"&Large",fltk3::ALT+'5',(fltk3::Callback *)widget_size_cb,(void*)24,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,24},
+ {"&Huge",fltk3::ALT+'6',(fltk3::Callback *)widget_size_cb,(void*)32,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,32},
{0},
{"&Grid and Size Settings...",fltk3::COMMAND+'g',show_grid_cb},
{0},
{"&Shell",0,0,0,FL_SUBMENU},
- {"Execute &Command...",fltk3::ALT+'x',(Fl_Callback *)show_shell_window},
- {"Execute &Again...",fltk3::ALT+'g',(Fl_Callback *)do_shell_command},
+ {"Execute &Command...",fltk3::ALT+'x',(fltk3::Callback *)show_shell_window},
+ {"Execute &Again...",fltk3::ALT+'g',(fltk3::Callback *)do_shell_command},
{0},
{"&Help",0,0,0,FL_SUBMENU},
{"&Rapid development with FLUID...",0,help_cb},
@@ -1777,7 +1777,7 @@
void toggle_sourceview_cb(Fl_Double_Window *, void *) {
if (!sourceview_panel) {
make_sourceview();
- sourceview_panel->callback((Fl_Callback*)toggle_sourceview_cb);
+ sourceview_panel->callback((fltk3::Callback*)toggle_sourceview_cb);
Fl_Preferences svp(fluid_prefs, "sourceview");
int autorefresh;
svp.get("autorefresh", autorefresh, 1);
@@ -1801,7 +1801,7 @@
}
}
-void toggle_sourceview_b_cb(Fl_Button*, void *) {
+void toggle_sourceview_b_cb(fltk3::Button*, void *) {
toggle_sourceview_cb(0,0);
}
@@ -1831,7 +1831,7 @@
save_item = (Fl_Menu_Item*)main_menubar->find_item(save_cb);
history_item = (Fl_Menu_Item*)main_menubar->find_item(open_history_cb);
widgetbin_item = (Fl_Menu_Item*)main_menubar->find_item(toggle_widgetbin_cb);
- sourceview_item = (Fl_Menu_Item*)main_menubar->find_item((Fl_Callback*)toggle_sourceview_cb);
+ sourceview_item = (Fl_Menu_Item*)main_menubar->find_item((fltk3::Callback*)toggle_sourceview_cb);
main_menubar->global();
fill_in_New_Menu();
main_window->end();
@@ -2209,7 +2209,7 @@
// Generate a header and source file in a temporary directory and
// load those into the Code Viewer widgets.
//
-void update_sourceview_cb(Fl_Button*, void*)
+void update_sourceview_cb(fltk3::Button*, void*)
{
if (!sourceview_panel || !sourceview_panel->visible())
return;
Modified: branches/branch-3.0/fluid/function_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/function_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/function_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -64,7 +64,7 @@
Fl_Return_Button *f_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *f_panel_cancel=(Fl_Button *)0;
+fltk3::Button *f_panel_cancel=(fltk3::Button *)0;
Fl_Text_Editor *f_comment_input=(Fl_Text_Editor *)0;
@@ -120,11 +120,11 @@
f_panel_ok->labelsize(11);
f_panel_ok->window()->hotspot(f_panel_ok);
} // Fl_Return_Button* f_panel_ok
- { f_panel_cancel = new Fl_Button(280, 200, 50, 20, "Cancel");
+ { f_panel_cancel = new fltk3::Button(280, 200, 50, 20, "Cancel");
f_panel_cancel->tooltip("Cancel the changes.");
f_panel_cancel->shortcut(0xff1b);
f_panel_cancel->labelsize(11);
- } // Fl_Button* f_panel_cancel
+ } // fltk3::Button* f_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 200, 205, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -153,7 +153,7 @@
Fl_Return_Button *code_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *code_panel_cancel=(Fl_Button *)0;
+fltk3::Button *code_panel_cancel=(fltk3::Button *)0;
Fl_Double_Window* make_code_panel() {
{ Fl_Double_Window* o = code_panel = new Fl_Double_Window(540, 180, "Code Properties");
@@ -179,10 +179,10 @@
code_panel_ok->labelsize(11);
code_panel_ok->window()->hotspot(code_panel_ok);
} // Fl_Return_Button* code_panel_ok
- { code_panel_cancel = new Fl_Button(470, 150, 60, 20, "Cancel");
+ { code_panel_cancel = new fltk3::Button(470, 150, 60, 20, "Cancel");
code_panel_cancel->shortcut(0xff1b);
code_panel_cancel->labelsize(11);
- } // Fl_Button* code_panel_cancel
+ } // fltk3::Button* code_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 150, 380, 20);
o->labelsize(11);
fltk3::Group::current()->resizable(o);
@@ -204,7 +204,7 @@
Fl_Return_Button *codeblock_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *codeblock_panel_cancel=(Fl_Button *)0;
+fltk3::Button *codeblock_panel_cancel=(fltk3::Button *)0;
Fl_Double_Window* make_codeblock_panel() {
{ Fl_Double_Window* o = codeblock_panel = new Fl_Double_Window(300, 115, "Code Block Properties");
@@ -231,10 +231,10 @@
codeblock_panel_ok->labelsize(11);
codeblock_panel_ok->window()->hotspot(codeblock_panel_ok);
} // Fl_Return_Button* codeblock_panel_ok
- { codeblock_panel_cancel = new Fl_Button(230, 85, 60, 20, "Cancel");
+ { codeblock_panel_cancel = new fltk3::Button(230, 85, 60, 20, "Cancel");
codeblock_panel_cancel->shortcut(0xff1b);
codeblock_panel_cancel->labelsize(11);
- } // Fl_Button* codeblock_panel_cancel
+ } // fltk3::Button* codeblock_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 85, 140, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -265,7 +265,7 @@
Fl_Return_Button *declblock_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *declblock_panel_cancel=(Fl_Button *)0;
+fltk3::Button *declblock_panel_cancel=(fltk3::Button *)0;
Fl_Double_Window* make_declblock_panel() {
{ Fl_Double_Window* o = declblock_panel = new Fl_Double_Window(300, 135, "Declaration Block Properties");
@@ -312,10 +312,10 @@
declblock_panel_ok->labelsize(11);
declblock_panel_ok->window()->hotspot(declblock_panel_ok);
} // Fl_Return_Button* declblock_panel_ok
- { declblock_panel_cancel = new Fl_Button(230, 105, 60, 20, "Cancel");
+ { declblock_panel_cancel = new fltk3::Button(230, 105, 60, 20, "Cancel");
declblock_panel_cancel->shortcut(0xff1b);
declblock_panel_cancel->labelsize(11);
- } // Fl_Button* declblock_panel_cancel
+ } // fltk3::Button* declblock_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 105, 140, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -353,7 +353,7 @@
Fl_Return_Button *decl_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *decl_panel_cancel=(Fl_Button *)0;
+fltk3::Button *decl_panel_cancel=(fltk3::Button *)0;
Fl_Text_Editor *decl_comment_input=(Fl_Text_Editor *)0;
@@ -394,10 +394,10 @@
decl_panel_ok->labelsize(11);
decl_panel_ok->window()->hotspot(decl_panel_ok);
} // Fl_Return_Button* decl_panel_ok
- { decl_panel_cancel = new Fl_Button(270, 205, 60, 20, "Cancel");
+ { decl_panel_cancel = new fltk3::Button(270, 205, 60, 20, "Cancel");
decl_panel_cancel->shortcut(0xff1b);
decl_panel_cancel->labelsize(11);
- } // Fl_Button* decl_panel_cancel
+ } // fltk3::Button* decl_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 205, 185, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -445,11 +445,11 @@
Fl_Input *data_filename=(Fl_Input *)0;
-Fl_Button *data_filebrowser=(Fl_Button *)0;
+fltk3::Button *data_filebrowser=(fltk3::Button *)0;
Fl_Return_Button *data_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *data_panel_cancel=(Fl_Button *)0;
+fltk3::Button *data_panel_cancel=(fltk3::Button *)0;
Fl_Text_Editor *data_comment_input=(Fl_Text_Editor *)0;
@@ -492,18 +492,18 @@
data_filename->align(fltk3::Align(133));
data_filename->when(fltk3::WHEN_NEVER);
} // Fl_Input* data_filename
- { data_filebrowser = new Fl_Button(290, 90, 40, 20, "@fileopen");
+ { data_filebrowser = new fltk3::Button(290, 90, 40, 20, "@fileopen");
data_filebrowser->labelcolor((fltk3::Color)134);
- } // Fl_Button* data_filebrowser
+ } // fltk3::Button* data_filebrowser
{ fltk3::Group* o = new fltk3::Group(10, 205, 320, 20);
{ data_panel_ok = new Fl_Return_Button(200, 205, 60, 20, "OK");
data_panel_ok->labelsize(11);
data_panel_ok->window()->hotspot(data_panel_ok);
} // Fl_Return_Button* data_panel_ok
- { data_panel_cancel = new Fl_Button(270, 205, 60, 20, "Cancel");
+ { data_panel_cancel = new fltk3::Button(270, 205, 60, 20, "Cancel");
data_panel_cancel->shortcut(0xff1b);
data_panel_cancel->labelsize(11);
- } // Fl_Button* data_panel_cancel
+ } // fltk3::Button* data_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 205, 185, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -538,7 +538,7 @@
Fl_Return_Button *c_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *c_panel_cancel=(Fl_Button *)0;
+fltk3::Button *c_panel_cancel=(fltk3::Button *)0;
Fl_Double_Window* make_class_panel() {
{ class_panel = new Fl_Double_Window(342, 196, "Class Properties");
@@ -590,10 +590,10 @@
c_panel_ok->labelsize(11);
c_panel_ok->window()->hotspot(c_panel_ok);
} // Fl_Return_Button* c_panel_ok
- { c_panel_cancel = new Fl_Button(270, 165, 60, 20, "Cancel");
+ { c_panel_cancel = new fltk3::Button(270, 165, 60, 20, "Cancel");
c_panel_cancel->shortcut(0xff1b);
c_panel_cancel->labelsize(11);
- } // Fl_Button* c_panel_cancel
+ } // fltk3::Button* c_panel_cancel
{ fltk3::Box* o = new fltk3::Box(10, 165, 185, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -612,7 +612,7 @@
Fl_Return_Button *comment_panel_ok=(Fl_Return_Button *)0;
-Fl_Button *comment_panel_cancel=(Fl_Button *)0;
+fltk3::Button *comment_panel_cancel=(fltk3::Button *)0;
Fl_Light_Button *comment_in_source=(Fl_Light_Button *)0;
@@ -620,7 +620,7 @@
Fl_Menu_Button *comment_predefined=(Fl_Menu_Button *)0;
-Fl_Button *comment_load=(Fl_Button *)0;
+fltk3::Button *comment_load=(fltk3::Button *)0;
Fl_Double_Window* make_comment_panel() {
{ Fl_Double_Window* o = comment_panel = new Fl_Double_Window(550, 280, "Comment Properties");
@@ -646,10 +646,10 @@
comment_panel_ok->labelsize(11);
comment_panel_ok->window()->hotspot(comment_panel_ok);
} // Fl_Return_Button* comment_panel_ok
- { comment_panel_cancel = new Fl_Button(460, 250, 80, 20, "Cancel");
+ { comment_panel_cancel = new fltk3::Button(460, 250, 80, 20, "Cancel");
comment_panel_cancel->shortcut(0xff1b);
comment_panel_cancel->labelsize(11);
- } // Fl_Button* comment_panel_cancel
+ } // fltk3::Button* comment_panel_cancel
{ fltk3::Box* o = new fltk3::Box(110, 250, 250, 20);
o->labelsize(11);
fltk3::Group::current()->resizable(o);
@@ -672,9 +672,9 @@
comment_predefined->labelsize(11);
comment_predefined->textsize(11);
} // Fl_Menu_Button* comment_predefined
- { comment_load = new Fl_Button(10, 100, 90, 20, "Import...");
+ { comment_load = new fltk3::Button(10, 100, 90, 20, "Import...");
comment_load->labelsize(11);
- } // Fl_Button* comment_load
+ } // fltk3::Button* comment_load
{ fltk3::Box* o = new fltk3::Box(10, 132, 90, 121);
o->labelsize(11);
fltk3::Group::current()->resizable(o);
@@ -712,342 +712,342 @@
fltk3::Window* make_widgetbin() {
{ widgetbin_panel = new fltk3::Window(574, 85, "Widget Bin");
- widgetbin_panel->callback((Fl_Callback*)cb_widgetbin_panel);
+ widgetbin_panel->callback((fltk3::Callback*)cb_widgetbin_panel);
widgetbin_panel->align(fltk3::Align(fltk3::ALIGN_CLIP|fltk3::ALIGN_INSIDE));
{ fltk3::Group* o = new fltk3::Group(3, 3, 79, 79);
- { Fl_Button* o = new Fl_Button(5, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(5, 5, 24, 24);
o->tooltip("Function");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Function"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Function"));
o->image(pixmap[7]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(30, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(30, 5, 24, 24);
o->tooltip("Class");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Class"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Class"));
o->image(pixmap[12]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(55, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(55, 5, 24, 24);
o->tooltip("Comment");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("comment"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("comment"));
o->image(pixmap[46]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(5, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(5, 30, 24, 24);
o->tooltip("Code");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Code"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Code"));
o->image(pixmap[8]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(30, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(30, 30, 24, 24);
o->tooltip("Code Block");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("CodeBlock"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("CodeBlock"));
o->image(pixmap[9]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(55, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(55, 30, 24, 24);
o->tooltip("Widget Class");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("widget_class"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("widget_class"));
o->image(pixmap[48]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(5, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(5, 55, 24, 24);
o->tooltip("Declaration");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("decl"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("decl"));
o->image(pixmap[10]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(30, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(30, 55, 24, 24);
o->tooltip("Declaration Block");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("declblock"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("declblock"));
o->image(pixmap[11]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(55, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(55, 55, 24, 24);
o->tooltip("Binary Data");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("data"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("data"));
o->image(pixmap[49]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(87, 3, 79, 79);
- { Fl_Button* o = new Fl_Button(89, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(89, 5, 24, 24);
o->tooltip("Window");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("fltk3::Window"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("fltk3::Window"));
o->image(pixmap[1]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(114, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(114, 5, 24, 24);
o->tooltip("Group");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("fltk3::Group"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("fltk3::Group"));
o->image(pixmap[6]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(139, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(139, 5, 24, 24);
o->tooltip("Pack");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Pack"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Pack"));
o->image(pixmap[22]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(89, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(89, 30, 24, 24);
o->tooltip("Tabs");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tabs"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Tabs"));
o->image(pixmap[13]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(114, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(114, 30, 24, 24);
o->tooltip("Scroll");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scroll"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Scroll"));
o->image(pixmap[19]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(139, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(139, 30, 24, 24);
o->tooltip("Table");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Table"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Table"));
o->image(pixmap[51]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(89, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(89, 55, 24, 24);
o->tooltip("Tile");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tile"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Tile"));
o->image(pixmap[20]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(114, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(114, 55, 24, 24);
o->tooltip("Wizard");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Wizard"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Wizard"));
o->image(pixmap[21]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(171, 3, 54, 79);
- { Fl_Button* o = new Fl_Button(173, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(173, 5, 24, 24);
o->tooltip("Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("fltk3::Button"));
o->image(pixmap[2]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(198, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(198, 5, 24, 24);
o->tooltip("Return Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Return_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Return_Button"));
o->image(pixmap[23]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(173, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(173, 30, 24, 24);
o->tooltip("Light Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Light_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Light_Button"));
o->image(pixmap[24]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(198, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(198, 30, 24, 24);
o->tooltip("Repeat Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Repeat_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Repeat_Button"));
o->image(pixmap[25]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(173, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(173, 55, 24, 24);
o->tooltip("Check Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Check_Button"));
o->image(pixmap[3]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(198, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(198, 55, 24, 24);
o->tooltip("Round Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Round_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Round_Button"));
o->image(pixmap[4]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(230, 3, 104, 79);
- { Fl_Button* o = new Fl_Button(232, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(232, 5, 24, 24);
o->tooltip("Slider");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Slider"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Slider"));
o->image(pixmap[37]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(257, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(257, 5, 24, 24);
o->tooltip("Scroll Bar");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scrollbar"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Scrollbar"));
o->image(pixmap[38]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(282, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(282, 5, 24, 24);
o->tooltip("Value Slider");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Slider"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Value_Slider"));
o->image(pixmap[39]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(307, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(307, 5, 24, 24);
o->tooltip("Value Output");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Output"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Value_Output"));
o->image(pixmap[45]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(232, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(232, 30, 24, 24);
o->tooltip("Adjuster");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Adjuster"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Adjuster"));
o->image(pixmap[40]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(257, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(257, 30, 24, 24);
o->tooltip("Counter");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Counter"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Counter"));
o->image(pixmap[41]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(282, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(282, 30, 24, 24);
o->tooltip("Dial");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Dial"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Dial"));
o->image(pixmap[42]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(232, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(232, 55, 24, 24);
o->tooltip("Roller");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Roller"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Roller"));
o->image(pixmap[43]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(257, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(257, 55, 24, 24);
o->tooltip("Spinner");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Spinner"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Spinner"));
o->image(pixmap[47]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(282, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(282, 55, 24, 24);
o->tooltip("Value Input");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Input"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Value_Input"));
o->image(pixmap[44]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(339, 3, 54, 79);
- { Fl_Button* o = new Fl_Button(341, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(341, 5, 24, 24);
o->tooltip("Input");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Input"));
o->image(pixmap[14]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(366, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(366, 5, 24, 24);
o->tooltip("Output");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Output"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Output"));
o->image(pixmap[27]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(341, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(341, 30, 24, 24);
o->tooltip("Text Edit");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Editor"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Text_Editor"));
o->image(pixmap[29]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(366, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(366, 30, 24, 24);
o->tooltip("Text Display");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Display"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Text_Display"));
o->image(pixmap[28]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(341, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(341, 55, 24, 24);
o->tooltip("File Input");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Input"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_File_Input"));
o->image(pixmap[30]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(398, 3, 54, 79);
- { Fl_Button* o = new Fl_Button(400, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(400, 5, 24, 24);
o->tooltip("Menu Bar");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Bar"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Menu_Bar"));
o->image(pixmap[17]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(425, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(425, 5, 24, 24);
o->tooltip("Input Choice");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input_Choice"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Input_Choice"));
o->image(pixmap[15]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(400, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(400, 30, 24, 24);
o->tooltip("Menu Button");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Button"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Menu_Button"));
o->image(pixmap[26]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(425, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(425, 30, 24, 24);
o->tooltip("Menu Item");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("menuitem"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("menuitem"));
o->image(pixmap[16]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(400, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(400, 55, 24, 24);
o->tooltip("Choice");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Choice"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Choice"));
o->image(pixmap[15]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(425, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(425, 55, 24, 24);
o->tooltip("Sub Menu");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("submenu"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("submenu"));
o->image(pixmap[18]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(457, 3, 54, 79);
- { Fl_Button* o = new Fl_Button(459, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(459, 5, 24, 24);
o->tooltip("Browser");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Browser"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Browser"));
o->image(pixmap[31]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(484, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(484, 5, 24, 24);
o->tooltip("Tree");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tree"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Tree"));
o->image(pixmap[50]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(459, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(459, 30, 24, 24);
o->tooltip("Check Browser");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Browser"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Check_Browser"));
o->image(pixmap[32]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(459, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(459, 55, 24, 24);
o->tooltip("File Browser");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Browser"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_File_Browser"));
o->image(pixmap[33]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(515, 3, 55, 79);
- { Fl_Button* o = new Fl_Button(517, 5, 24, 24);
+ { fltk3::Button* o = new fltk3::Button(517, 5, 24, 24);
o->tooltip("Box");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("fltk3::Box"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("fltk3::Box"));
o->image(pixmap[5]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(542, 5, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(542, 5, 24, 24);
o->tooltip("Clock");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Clock"));
o->image(pixmap[34]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(517, 30, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(517, 30, 24, 24);
o->tooltip("Help Browser");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Help_View"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Help_View"));
o->image(pixmap[35]);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(517, 55, 24, 24);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(517, 55, 24, 24);
o->tooltip("Progress");
o->box(fltk3::THIN_UP_BOX);
- o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Progress"));
+ o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Progress"));
o->image(pixmap[36]);
- } // Fl_Button* o
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
widgetbin_panel->set_non_modal();
@@ -1070,12 +1070,12 @@
Fl_Double_Window* make_sourceview() {
{ sourceview_panel = new Fl_Double_Window(520, 490, "Code View");
- sourceview_panel->callback((Fl_Callback*)toggle_sourceview_cb);
+ sourceview_panel->callback((fltk3::Callback*)toggle_sourceview_cb);
sourceview_panel->align(fltk3::Align(fltk3::ALIGN_CLIP|fltk3::ALIGN_INSIDE));
{ sv_tab = new Fl_Tabs(10, 10, 500, 440);
sv_tab->selection_color((fltk3::Color)4);
sv_tab->labelcolor(fltk3::BACKGROUND2_COLOR);
- sv_tab->callback((Fl_Callback*)update_sourceview_position_cb);
+ sv_tab->callback((fltk3::Callback*)update_sourceview_position_cb);
{ fltk3::Group* o = new fltk3::Group(10, 35, 500, 415, "Source");
o->labelsize(13);
o->hide();
@@ -1118,21 +1118,21 @@
fltk3::Group::current()->resizable(sv_tab);
} // Fl_Tabs* sv_tab
{ fltk3::Group* o = new fltk3::Group(10, 460, 500, 20);
- { Fl_Button* o = new Fl_Button(10, 460, 61, 20, "Refresh");
+ { fltk3::Button* o = new fltk3::Button(10, 460, 61, 20, "Refresh");
o->labelsize(11);
- o->callback((Fl_Callback*)update_sourceview_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)update_sourceview_cb);
+ } // fltk3::Button* o
{ Fl_Light_Button* o = sv_autorefresh = new Fl_Light_Button(76, 460, 91, 20, "Auto-Refresh");
sv_autorefresh->labelsize(11);
- o->callback((Fl_Callback*)update_sourceview_cb);
+ o->callback((fltk3::Callback*)update_sourceview_cb);
} // Fl_Light_Button* sv_autorefresh
{ sv_autoposition = new Fl_Light_Button(172, 460, 89, 20, "Auto-Position");
sv_autoposition->labelsize(11);
} // Fl_Light_Button* sv_autoposition
- { Fl_Button* o = new Fl_Button(460, 460, 50, 20, "Close");
+ { fltk3::Button* o = new fltk3::Button(460, 460, 50, 20, "Close");
o->labelsize(11);
- o->callback((Fl_Callback*)toggle_sourceview_b_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)toggle_sourceview_b_cb);
+ } // fltk3::Button* o
{ fltk3::Box* o = new fltk3::Box(265, 460, 190, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
Modified: branches/branch-3.0/fluid/function_panel.h
===================================================================
--- branches/branch-3.0/fluid/function_panel.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/function_panel.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -45,7 +45,7 @@
#include <fltk3/ReturnButton.h>
extern Fl_Return_Button *f_panel_ok;
#include <fltk3/Button.h>
-extern Fl_Button *f_panel_cancel;
+extern fltk3::Button *f_panel_cancel;
#include <fltk3/TextEditor.h>
extern Fl_Text_Editor *f_comment_input;
Fl_Double_Window* make_function_panel();
@@ -55,13 +55,13 @@
#include "CodeEditor.h"
extern CodeEditor *code_input;
extern Fl_Return_Button *code_panel_ok;
-extern Fl_Button *code_panel_cancel;
+extern fltk3::Button *code_panel_cancel;
Fl_Double_Window* make_code_panel();
extern Fl_Double_Window *codeblock_panel;
extern Fl_Input *code_before_input;
extern Fl_Input *code_after_input;
extern Fl_Return_Button *codeblock_panel_ok;
-extern Fl_Button *codeblock_panel_cancel;
+extern fltk3::Button *codeblock_panel_cancel;
Fl_Double_Window* make_codeblock_panel();
extern Fl_Double_Window *declblock_panel;
extern Fl_Choice *declblock_public_choice;
@@ -69,7 +69,7 @@
extern Fl_Input *decl_before_input;
extern Fl_Input *decl_after_input;
extern Fl_Return_Button *declblock_panel_ok;
-extern Fl_Button *declblock_panel_cancel;
+extern fltk3::Button *declblock_panel_cancel;
Fl_Double_Window* make_declblock_panel();
extern Fl_Menu_Item menu_declblock_public_choice[];
extern Fl_Double_Window *decl_panel;
@@ -77,7 +77,7 @@
extern Fl_Choice *decl_class_choice;
extern Fl_Input *decl_input;
extern Fl_Return_Button *decl_panel_ok;
-extern Fl_Button *decl_panel_cancel;
+extern fltk3::Button *decl_panel_cancel;
extern Fl_Text_Editor *decl_comment_input;
Fl_Double_Window* make_decl_panel();
extern Fl_Menu_Item menu_decl_choice[];
@@ -87,9 +87,9 @@
extern Fl_Choice *data_class_choice;
extern Fl_Input *data_input;
extern Fl_Input *data_filename;
-extern Fl_Button *data_filebrowser;
+extern fltk3::Button *data_filebrowser;
extern Fl_Return_Button *data_panel_ok;
-extern Fl_Button *data_panel_cancel;
+extern fltk3::Button *data_panel_cancel;
extern Fl_Text_Editor *data_comment_input;
Fl_Double_Window* make_data_panel();
extern Fl_Menu_Item menu_data_choice[];
@@ -100,17 +100,17 @@
extern Fl_Input *c_subclass_input;
extern Fl_Text_Editor *c_comment_input;
extern Fl_Return_Button *c_panel_ok;
-extern Fl_Button *c_panel_cancel;
+extern fltk3::Button *c_panel_cancel;
Fl_Double_Window* make_class_panel();
extern Fl_Double_Window *comment_panel;
extern CodeEditor *comment_input;
extern Fl_Return_Button *comment_panel_ok;
-extern Fl_Button *comment_panel_cancel;
+extern fltk3::Button *comment_panel_cancel;
extern Fl_Light_Button *comment_in_source;
extern Fl_Light_Button *comment_in_header;
#include <fltk3/MenuButton.h>
extern Fl_Menu_Button *comment_predefined;
-extern Fl_Button *comment_load;
+extern fltk3::Button *comment_load;
Fl_Double_Window* make_comment_panel();
void type_make_cb(fltk3::Widget*,void*d);
#include <fltk3/Window.h>
@@ -123,10 +123,10 @@
extern Fl_Tabs *sv_tab;
extern CodeViewer *sv_source;
extern CodeViewer *sv_header;
-extern void update_sourceview_cb(Fl_Button*, void*);
+extern void update_sourceview_cb(fltk3::Button*, void*);
extern Fl_Light_Button *sv_autorefresh;
extern Fl_Light_Button *sv_autoposition;
-extern void toggle_sourceview_b_cb(Fl_Button*, void*);
+extern void toggle_sourceview_b_cb(fltk3::Button*, void*);
Fl_Double_Window* make_sourceview();
#endif
Modified: branches/branch-3.0/fluid/print_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/print_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/print_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -44,9 +44,9 @@
print_update_status();
}
-Fl_Button *print_properties=(Fl_Button *)0;
+fltk3::Button *print_properties=(fltk3::Button *)0;
-static void cb_print_properties(Fl_Button*, void*) {
+static void cb_print_properties(fltk3::Button*, void*) {
print_properties_panel->show();
}
@@ -101,7 +101,7 @@
fltk3::Group *print_collate_group[2]={(fltk3::Group *)0};
-static void cb_Cancel(Fl_Button*, void*) {
+static void cb_Cancel(fltk3::Button*, void*) {
print_panel->hide();
}
@@ -215,7 +215,7 @@
};
static Fl_Pixmap image_print_gray(idata_print_gray);
-Fl_Button *print_output_mode[4]={(Fl_Button *)0};
+fltk3::Button *print_output_mode[4]={(fltk3::Button *)0};
static void cb_Save(Fl_Return_Button*, void*) {
print_properties_panel->hide();
@@ -234,12 +234,12 @@
fluid_prefs.set(name, val);
}
-static void cb_Cancel1(Fl_Button*, void*) {
+static void cb_Cancel1(fltk3::Button*, void*) {
print_properties_panel->hide();
print_update_status();
}
-static void cb_Use(Fl_Button*, void*) {
+static void cb_Use(fltk3::Button*, void*) {
print_properties_panel->hide();
}
@@ -249,12 +249,12 @@
{ print_choice = new Fl_Choice(113, 10, 181, 25, "Printer:");
print_choice->down_box(fltk3::BORDER_BOX);
print_choice->labelfont(1);
- print_choice->callback((Fl_Callback*)cb_print_choice);
+ print_choice->callback((fltk3::Callback*)cb_print_choice);
print_choice->when(fltk3::WHEN_CHANGED);
} // Fl_Choice* print_choice
- { print_properties = new Fl_Button(294, 10, 105, 25, "Properties...");
- print_properties->callback((Fl_Callback*)cb_print_properties);
- } // Fl_Button* print_properties
+ { print_properties = new fltk3::Button(294, 10, 105, 25, "Properties...");
+ print_properties->callback((fltk3::Callback*)cb_print_properties);
+ } // fltk3::Button* print_properties
{ print_status = new fltk3::Box(111, 41, 288, 17, "printer/job status");
print_status->align(fltk3::Align(68|fltk3::ALIGN_INSIDE));
} // fltk3::Box* print_status
@@ -266,17 +266,17 @@
print_all->type(102);
print_all->down_box(fltk3::ROUND_DOWN_BOX);
print_all->value(1);
- print_all->callback((Fl_Callback*)cb_print_all);
+ print_all->callback((fltk3::Callback*)cb_print_all);
} // Fl_Round_Button* print_all
{ print_pages = new Fl_Round_Button(20, 126, 64, 25, "Pages");
print_pages->type(102);
print_pages->down_box(fltk3::ROUND_DOWN_BOX);
- print_pages->callback((Fl_Callback*)cb_print_pages);
+ print_pages->callback((fltk3::Callback*)cb_print_pages);
} // Fl_Round_Button* print_pages
{ print_selection = new Fl_Round_Button(20, 156, 82, 25, "Selection");
print_selection->type(102);
print_selection->down_box(fltk3::ROUND_DOWN_BOX);
- print_selection->callback((Fl_Callback*)cb_print_selection);
+ print_selection->callback((fltk3::Callback*)cb_print_selection);
} // Fl_Round_Button* print_selection
{ print_from = new Fl_Int_Input(136, 126, 28, 25, "From:");
print_from->type(2);
@@ -295,12 +295,12 @@
o->labelfont(1);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
{ print_copies = new Fl_Spinner(321, 96, 45, 25, "# Copies:");
- print_copies->callback((Fl_Callback*)cb_print_copies);
+ print_copies->callback((fltk3::Callback*)cb_print_copies);
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->callback((fltk3::Callback*)cb_print_collate_button);
print_collate_button->when(fltk3::WHEN_CHANGED);
print_collate_button->deactivate();
} // Fl_Check_Button* print_collate_button
@@ -433,11 +433,11 @@
o->end();
} // fltk3::Group* o
{ Fl_Return_Button* o = new Fl_Return_Button(309, 201, 70, 25, "Print");
- o->callback((Fl_Callback*)print_cb);
+ o->callback((fltk3::Callback*)print_cb);
} // Fl_Return_Button* o
- { Fl_Button* o = new Fl_Button(389, 201, 68, 25, "Cancel");
- o->callback((Fl_Callback*)cb_Cancel);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(389, 201, 68, 25, "Cancel");
+ o->callback((fltk3::Callback*)cb_Cancel);
+ } // fltk3::Button* o
print_panel_controls->end();
} // fltk3::Group* print_panel_controls
{ print_progress = new Fl_Progress(10, 203, 289, 21);
@@ -448,7 +448,7 @@
print_panel->end();
} // Fl_Double_Window* print_panel
{ print_properties_panel = new Fl_Double_Window(290, 130, "Printer Properties");
- print_properties_panel->callback((Fl_Callback*)cb_print_properties_panel);
+ print_properties_panel->callback((fltk3::Callback*)cb_print_properties_panel);
{ print_page_size = new Fl_Choice(110, 10, 80, 25, "Page Size:");
print_page_size->down_box(fltk3::BORDER_BOX);
print_page_size->labelfont(1);
@@ -457,7 +457,7 @@
{ fltk3::Group* o = new fltk3::Group(110, 45, 170, 40, "Output Mode:");
o->labelfont(1);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
- { print_output_mode[0] = new Fl_Button(110, 45, 30, 40);
+ { print_output_mode[0] = new fltk3::Button(110, 45, 30, 40);
print_output_mode[0]->type(102);
print_output_mode[0]->box(fltk3::BORDER_BOX);
print_output_mode[0]->down_box(fltk3::BORDER_BOX);
@@ -465,42 +465,42 @@
print_output_mode[0]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[0]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[0]->image(image_print_color);
- } // Fl_Button* print_output_mode[0]
- { print_output_mode[1] = new Fl_Button(150, 50, 40, 30);
+ } // fltk3::Button* print_output_mode[0]
+ { print_output_mode[1] = new fltk3::Button(150, 50, 40, 30);
print_output_mode[1]->type(102);
print_output_mode[1]->box(fltk3::BORDER_BOX);
print_output_mode[1]->down_box(fltk3::BORDER_BOX);
print_output_mode[1]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[1]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[1]->image(image_print_color);
- } // Fl_Button* print_output_mode[1]
- { print_output_mode[2] = new Fl_Button(200, 45, 30, 40);
+ } // fltk3::Button* print_output_mode[1]
+ { print_output_mode[2] = new fltk3::Button(200, 45, 30, 40);
print_output_mode[2]->type(102);
print_output_mode[2]->box(fltk3::BORDER_BOX);
print_output_mode[2]->down_box(fltk3::BORDER_BOX);
print_output_mode[2]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[2]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[2]->image(image_print_gray);
- } // Fl_Button* print_output_mode[2]
- { print_output_mode[3] = new Fl_Button(240, 50, 40, 30);
+ } // fltk3::Button* print_output_mode[2]
+ { print_output_mode[3] = new fltk3::Button(240, 50, 40, 30);
print_output_mode[3]->type(102);
print_output_mode[3]->box(fltk3::BORDER_BOX);
print_output_mode[3]->down_box(fltk3::BORDER_BOX);
print_output_mode[3]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[3]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[3]->image(image_print_gray);
- } // Fl_Button* print_output_mode[3]
+ } // fltk3::Button* print_output_mode[3]
o->end();
} // fltk3::Group* o
{ Fl_Return_Button* o = new Fl_Return_Button(123, 95, 79, 25, "Save");
- o->callback((Fl_Callback*)cb_Save);
+ o->callback((fltk3::Callback*)cb_Save);
} // Fl_Return_Button* o
- { Fl_Button* o = new Fl_Button(212, 95, 68, 25, "Cancel");
- o->callback((Fl_Callback*)cb_Cancel1);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(60, 95, 53, 25, "Use");
- o->callback((Fl_Callback*)cb_Use);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(212, 95, 68, 25, "Cancel");
+ o->callback((fltk3::Callback*)cb_Cancel1);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(60, 95, 53, 25, "Use");
+ o->callback((fltk3::Callback*)cb_Use);
+ } // fltk3::Button* o
print_properties_panel->set_modal();
print_properties_panel->end();
} // Fl_Double_Window* print_properties_panel
Modified: branches/branch-3.0/fluid/print_panel.h
===================================================================
--- branches/branch-3.0/fluid/print_panel.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/print_panel.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -37,7 +37,7 @@
#include <fltk3/Choice.h>
extern Fl_Choice *print_choice;
#include <fltk3/Button.h>
-extern Fl_Button *print_properties;
+extern fltk3::Button *print_properties;
#include <fltk3/Box.h>
extern fltk3::Box *print_status;
#include <fltk3/RoundButton.h>
@@ -58,7 +58,7 @@
extern Fl_Progress *print_progress;
extern Fl_Double_Window *print_properties_panel;
extern Fl_Choice *print_page_size;
-extern Fl_Button *print_output_mode[4];
+extern fltk3::Button *print_output_mode[4];
Fl_Double_Window* make_print_panel();
extern Fl_Menu_Item menu_print_page_size[];
extern void print_cb(Fl_Return_Button *, void *);
Modified: branches/branch-3.0/fluid/template_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/template_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/template_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -118,9 +118,9 @@
Fl_Input *template_instance=(Fl_Input *)0;
-Fl_Button *template_delete=(Fl_Button *)0;
+fltk3::Button *template_delete=(fltk3::Button *)0;
-static void cb_Cancel(Fl_Button*, void*) {
+static void cb_Cancel(fltk3::Button*, void*) {
Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image();
if (img) img->release();
template_preview->image(0);
@@ -143,11 +143,11 @@
Fl_Double_Window* make_template_panel() {
{ template_panel = new Fl_Double_Window(460, 355, "New/Save Template");
- template_panel->callback((Fl_Callback*)cb_template_panel);
+ template_panel->callback((fltk3::Callback*)cb_template_panel);
{ template_browser = new Fl_Browser(10, 28, 180, 250, "Available Templates:");
template_browser->type(2);
template_browser->labelfont(1);
- template_browser->callback((Fl_Callback*)cb_template_browser);
+ template_browser->callback((fltk3::Callback*)cb_template_browser);
template_browser->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
template_browser->when(3);
} // Fl_Browser* template_browser
@@ -159,7 +159,7 @@
{ template_name = new Fl_Input(124, 288, 326, 25, "Template Name:");
template_name->labelfont(1);
template_name->textfont(4);
- template_name->callback((Fl_Callback*)cb_template_name);
+ template_name->callback((fltk3::Callback*)cb_template_name);
template_name->when(3);
} // Fl_Input* template_name
{ template_instance = new Fl_Input(124, 288, 326, 25, "Instance Name:");
@@ -168,17 +168,17 @@
template_instance->hide();
} // Fl_Input* template_instance
{ fltk3::Group* o = new fltk3::Group(10, 323, 440, 25);
- { template_delete = new Fl_Button(10, 323, 133, 25, "Delete Template");
- template_delete->callback((Fl_Callback*)template_delete_cb);
- } // Fl_Button* template_delete
+ { template_delete = new fltk3::Button(10, 323, 133, 25, "Delete Template");
+ template_delete->callback((fltk3::Callback*)template_delete_cb);
+ } // fltk3::Button* template_delete
{ fltk3::Box* o = new fltk3::Box(153, 323, 126, 25);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
- { Fl_Button* o = new Fl_Button(289, 323, 72, 25, "Cancel");
- o->callback((Fl_Callback*)cb_Cancel);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(289, 323, 72, 25, "Cancel");
+ o->callback((fltk3::Callback*)cb_Cancel);
+ } // fltk3::Button* o
{ template_submit = new Fl_Return_Button(371, 323, 79, 25, "Save");
- template_submit->callback((Fl_Callback*)cb_template_submit);
+ template_submit->callback((fltk3::Callback*)cb_template_submit);
} // Fl_Return_Button* template_submit
o->end();
} // fltk3::Group* o
@@ -200,7 +200,7 @@
template_browser->clear();
}
-void template_delete_cb(Fl_Button *, void *) {
+void template_delete_cb(fltk3::Button *, void *) {
int item = template_browser->value();
if (item < 1) return;
Modified: branches/branch-3.0/fluid/template_panel.h
===================================================================
--- branches/branch-3.0/fluid/template_panel.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/template_panel.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -41,12 +41,12 @@
extern Fl_Input *template_instance;
#include <fltk3/Group.h>
#include <fltk3/Button.h>
-extern Fl_Button *template_delete;
+extern fltk3::Button *template_delete;
#include <fltk3/ReturnButton.h>
extern Fl_Return_Button *template_submit;
Fl_Double_Window* make_template_panel();
void template_clear();
-void template_delete_cb(Fl_Button *, void *);
+void template_delete_cb(fltk3::Button *, void *);
void template_load();
#endif
Modified: branches/branch-3.0/fluid/widget_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/widget_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/widget_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -85,7 +85,7 @@
Fl_Input *v_input[4]={(Fl_Input *)0};
-Fl_Button *wLiveMode=(Fl_Button *)0;
+fltk3::Button *wLiveMode=(fltk3::Button *)0;
Fl_Double_Window* make_widget_panel() {
Fl_Double_Window* w;
@@ -98,23 +98,23 @@
o->selection_color((fltk3::Color)12);
o->labelsize(11);
o->labelcolor(fltk3::BACKGROUND2_COLOR);
- o->callback((Fl_Callback*)cb_);
+ o->callback((fltk3::Callback*)cb_);
o->when(fltk3::WHEN_NEVER);
{ fltk3::Group* o = new fltk3::Group(10, 30, 400, 290, "GUI");
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->when(fltk3::WHEN_NEVER);
{ fltk3::Group* o = new fltk3::Group(95, 40, 309, 20, "Label:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 40, 190, 20);
o->tooltip("The label text for the widget.\nUse Ctrl-J for newlines.");
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)label_cb);
+ o->callback((fltk3::Callback*)label_cb);
o->when(fltk3::WHEN_CHANGED);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
@@ -125,7 +125,7 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)labeltype_cb);
+ o->callback((fltk3::Callback*)labeltype_cb);
o->menu(labeltypemenu);
} // Fl_Choice* o
o->end();
@@ -133,121 +133,121 @@
{ fltk3::Group* o = new fltk3::Group(95, 65, 309, 20, "Image:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 65, 240, 20);
o->tooltip("The active image for the widget.");
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)image_cb);
+ o->callback((fltk3::Callback*)image_cb);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
- { Fl_Button* o = new Fl_Button(334, 65, 70, 20, "Browse...");
+ { fltk3::Button* o = new fltk3::Button(334, 65, 70, 20, "Browse...");
o->tooltip("Click to choose the active image.");
o->labelsize(11);
- o->callback((Fl_Callback*)image_browse_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)image_browse_cb);
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(95, 90, 309, 20, "Inactive:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 90, 240, 20);
o->tooltip("The inactive image for the widget.");
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)inactive_cb);
+ o->callback((fltk3::Callback*)inactive_cb);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
- { Fl_Button* o = new Fl_Button(334, 90, 70, 20, "Browse...");
+ { fltk3::Button* o = new fltk3::Button(334, 90, 70, 20, "Browse...");
o->tooltip("Click to choose the inactive image.");
o->labelsize(11);
- o->callback((Fl_Callback*)inactive_browse_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)inactive_browse_cb);
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(95, 115, 300, 20, "Alignment:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
- { Fl_Button* o = new Fl_Button(95, 115, 30, 20, "Clip");
+ { fltk3::Button* o = new fltk3::Button(95, 115, 30, 20, "Clip");
o->tooltip("Clip the label to the inside of the widget.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_CLIP));
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_CLIP));
o->align(fltk3::Align(fltk3::ALIGN_CENTER|fltk3::ALIGN_INSIDE));
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(130, 115, 30, 20, "Wrap");
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(130, 115, 30, 20, "Wrap");
o->tooltip("Wrap the label text.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_WRAP));
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(270, 115, 20, 20, "@-1<-");
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_WRAP));
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(270, 115, 20, 20, "@-1<-");
o->tooltip("Left-align the label.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
o->labelcolor(fltk3::INACTIVE_COLOR);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_LEFT));
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_LEFT));
o->hide();
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(295, 115, 20, 20, "@-1->");
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(295, 115, 20, 20, "@-1->");
o->tooltip("Right-align the label.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
o->labelcolor(fltk3::INACTIVE_COLOR);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_RIGHT));
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_RIGHT));
o->hide();
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(320, 115, 20, 20, "@-18");
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(320, 115, 20, 20, "@-18");
o->tooltip("Top-align the label.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
o->labelcolor(fltk3::INACTIVE_COLOR);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_TOP));
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_TOP));
o->hide();
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(345, 115, 20, 20, "@-12");
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(345, 115, 20, 20, "@-12");
o->tooltip("Bottom-align the label.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
o->labelcolor(fltk3::INACTIVE_COLOR);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_BOTTOM));
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_BOTTOM));
o->hide();
- } // Fl_Button* o
+ } // fltk3::Button* o
{ Fl_Choice* o = new Fl_Choice(165, 115, 110, 20);
o->down_box(fltk3::BORDER_BOX);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)align_text_image_cb);
+ o->callback((fltk3::Callback*)align_text_image_cb);
o->menu(menu_);
} // Fl_Choice* o
{ Fl_Choice* o = new Fl_Choice(280, 115, 85, 20);
o->down_box(fltk3::BORDER_BOX);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)align_position_cb);
+ o->callback((fltk3::Callback*)align_position_cb);
o->menu(menu_1);
} // Fl_Choice* o
- { Fl_Button* o = new Fl_Button(370, 115, 20, 20, "@-3square");
+ { fltk3::Button* o = new fltk3::Button(370, 115, 20, 20, "@-3square");
o->tooltip("Show the label inside the widget.");
o->type(1);
o->selection_color(fltk3::INACTIVE_COLOR);
o->labelsize(11);
o->labelcolor(fltk3::INACTIVE_COLOR);
- o->callback((Fl_Callback*)align_cb, (void*)(fltk3::ALIGN_INSIDE));
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)align_cb, (void*)(fltk3::ALIGN_INSIDE));
+ } // fltk3::Button* o
{ fltk3::Box* o = new fltk3::Box(395, 115, 0, 20);
o->labelsize(11);
fltk3::Group::current()->resizable(o);
@@ -257,7 +257,7 @@
{ fltk3::Group* o = new fltk3::Group(95, 150, 300, 20, "Position:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ widget_x_input = new Fl_Value_Input(95, 150, 55, 20, "X:");
widget_x_input->tooltip("The X position of the widget.");
@@ -265,7 +265,7 @@
widget_x_input->maximum(2048);
widget_x_input->step(1);
widget_x_input->textsize(11);
- widget_x_input->callback((Fl_Callback*)x_cb);
+ widget_x_input->callback((fltk3::Callback*)x_cb);
widget_x_input->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* widget_x_input
{ widget_y_input = new Fl_Value_Input(155, 150, 55, 20, "Y:");
@@ -274,7 +274,7 @@
widget_y_input->maximum(2048);
widget_y_input->step(1);
widget_y_input->textsize(11);
- widget_y_input->callback((Fl_Callback*)y_cb);
+ widget_y_input->callback((fltk3::Callback*)y_cb);
widget_y_input->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* widget_y_input
{ widget_w_input = new Fl_Value_Input(215, 150, 55, 20, "Width:");
@@ -283,7 +283,7 @@
widget_w_input->maximum(2048);
widget_w_input->step(1);
widget_w_input->textsize(11);
- widget_w_input->callback((Fl_Callback*)w_cb);
+ widget_w_input->callback((fltk3::Callback*)w_cb);
widget_w_input->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* widget_w_input
{ widget_h_input = new Fl_Value_Input(275, 150, 55, 20, "Height:");
@@ -292,14 +292,14 @@
widget_h_input->maximum(2048);
widget_h_input->step(1);
widget_h_input->textsize(11);
- widget_h_input->callback((Fl_Callback*)h_cb);
+ widget_h_input->callback((fltk3::Callback*)h_cb);
widget_h_input->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* widget_h_input
{ Fl_Light_Button* o = new Fl_Light_Button(335, 150, 55, 20, "Relative");
o->tooltip("If set, widgets inside a widget class of type fltk3::Group are repositioned relat\
ive to the origin at construction time");
o->labelsize(11);
- o->callback((Fl_Callback*)wc_relative_cb);
+ o->callback((fltk3::Callback*)wc_relative_cb);
} // Fl_Light_Button* o
{ fltk3::Box* o = new fltk3::Box(394, 150, 1, 20);
fltk3::Group::current()->resizable(o);
@@ -309,21 +309,21 @@
{ fltk3::Group* o = new fltk3::Group(95, 185, 300, 20, "Values:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Size:");
o->tooltip("The size of the slider.");
o->labelsize(11);
o->step(0.010101);
o->textsize(11);
- o->callback((Fl_Callback*)slider_size_cb);
+ o->callback((fltk3::Callback*)slider_size_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ Fl_Value_Input* o = new Fl_Value_Input(155, 185, 55, 20, "Minimum:");
o->tooltip("The minimum value of the widget.");
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)min_cb);
+ o->callback((fltk3::Callback*)min_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ Fl_Value_Input* o = new Fl_Value_Input(215, 185, 55, 20, "Maximum:");
@@ -331,21 +331,21 @@
o->labelsize(11);
o->value(1);
o->textsize(11);
- o->callback((Fl_Callback*)max_cb);
+ o->callback((fltk3::Callback*)max_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ Fl_Value_Input* o = new Fl_Value_Input(275, 185, 55, 20, "Step:");
o->tooltip("The resolution of the widget value.");
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)step_cb);
+ o->callback((fltk3::Callback*)step_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ Fl_Value_Input* o = new Fl_Value_Input(335, 185, 55, 20, "Value:");
o->tooltip("The current widget value.");
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)value_cb);
+ o->callback((fltk3::Callback*)value_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ fltk3::Box* o = new fltk3::Box(395, 185, 0, 20);
@@ -356,7 +356,7 @@
{ fltk3::Group* o = new fltk3::Group(95, 185, 300, 20, "Size Range:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
o->hide();
{ Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Minimum Size:");
@@ -365,7 +365,7 @@
o->maximum(2048);
o->step(1);
o->textsize(11);
- o->callback((Fl_Callback*)min_w_cb);
+ o->callback((fltk3::Callback*)min_w_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ Fl_Value_Input* o = new Fl_Value_Input(155, 185, 55, 20);
@@ -374,20 +374,20 @@
o->maximum(2048);
o->step(1);
o->textsize(11);
- o->callback((Fl_Callback*)min_h_cb);
+ o->callback((fltk3::Callback*)min_h_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
- { Fl_Button* o = new Fl_Button(215, 185, 25, 20, "set");
+ { fltk3::Button* o = new fltk3::Button(215, 185, 25, 20, "set");
o->labelsize(11);
- o->callback((Fl_Callback*)set_min_size_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)set_min_size_cb);
+ } // fltk3::Button* o
{ Fl_Value_Input* o = new Fl_Value_Input(245, 185, 55, 20, "Maximum Size:");
o->tooltip("The maximum value of the widget.");
o->labelsize(11);
o->maximum(2048);
o->step(1);
o->textsize(11);
- o->callback((Fl_Callback*)max_w_cb);
+ o->callback((fltk3::Callback*)max_w_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
{ Fl_Value_Input* o = new Fl_Value_Input(305, 185, 55, 20);
@@ -396,13 +396,13 @@
o->maximum(2048);
o->step(1);
o->textsize(11);
- o->callback((Fl_Callback*)max_h_cb);
+ o->callback((fltk3::Callback*)max_h_cb);
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // Fl_Value_Input* o
- { Fl_Button* o = new Fl_Button(365, 185, 25, 20, "set");
+ { fltk3::Button* o = new fltk3::Button(365, 185, 25, 20, "set");
o->labelsize(11);
- o->callback((Fl_Callback*)set_max_size_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)set_max_size_cb);
+ } // fltk3::Button* o
{ fltk3::Box* o = new fltk3::Box(395, 185, 0, 20);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -417,40 +417,40 @@
o->labelfont(1);
o->labelsize(11);
o->labelcolor(fltk3::FOREGROUND_COLOR);
- o->callback((Fl_Callback*)shortcut_in_cb);
+ o->callback((fltk3::Callback*)shortcut_in_cb);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
o->when(fltk3::WHEN_RELEASE);
} // Shortcut_Button* o
{ fltk3::Group* o = new fltk3::Group(95, 235, 300, 20, "X Class:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 235, 95, 20, ":");
o->tooltip("The X resource class.");
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)xclass_cb);
+ o->callback((fltk3::Callback*)xclass_cb);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
{ Fl_Light_Button* o = new Fl_Light_Button(195, 235, 60, 20, "Border");
o->tooltip("Add a border around the window.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)border_cb);
+ o->callback((fltk3::Callback*)border_cb);
} // Fl_Light_Button* o
{ Fl_Light_Button* o = new Fl_Light_Button(260, 235, 55, 20, "Modal");
o->tooltip("Make the window modal.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)modal_cb);
+ o->callback((fltk3::Callback*)modal_cb);
} // Fl_Light_Button* o
{ Fl_Light_Button* o = new Fl_Light_Button(320, 235, 75, 20, "Nonmodal");
o->tooltip("Make the window non-modal.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)non_modal_cb);
+ o->callback((fltk3::Callback*)non_modal_cb);
o->align(fltk3::Align(132|fltk3::ALIGN_INSIDE));
} // Fl_Light_Button* o
o->end();
@@ -458,32 +458,32 @@
{ fltk3::Group* o = new fltk3::Group(95, 260, 305, 20, "Attributes:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Light_Button* o = new Fl_Light_Button(95, 260, 60, 20, "Visible");
o->tooltip("Show the widget.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)visible_cb);
+ o->callback((fltk3::Callback*)visible_cb);
} // Fl_Light_Button* o
{ Fl_Light_Button* o = new Fl_Light_Button(160, 260, 60, 20, "Active");
o->tooltip("Activate the widget.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)active_cb);
+ o->callback((fltk3::Callback*)active_cb);
} // Fl_Light_Button* o
{ Fl_Light_Button* o = new Fl_Light_Button(225, 260, 75, 20, "Resizable");
o->tooltip("Make the widget resizable.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)resizable_cb);
+ o->callback((fltk3::Callback*)resizable_cb);
o->when(fltk3::WHEN_CHANGED);
} // Fl_Light_Button* o
{ Fl_Light_Button* o = new Fl_Light_Button(305, 260, 70, 20, "Hotspot");
o->tooltip("Center the window under this widget.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)hotspot_cb);
+ o->callback((fltk3::Callback*)hotspot_cb);
o->when(fltk3::WHEN_CHANGED);
} // Fl_Light_Button* o
{ fltk3::Box* o = new fltk3::Box(395, 260, 0, 20);
@@ -497,7 +497,7 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)tooltip_cb);
+ o->callback((fltk3::Callback*)tooltip_cb);
} // Fl_Input* o
{ fltk3::Box* o = new fltk3::Box(95, 305, 300, 5);
o->labelsize(11);
@@ -508,13 +508,13 @@
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(10, 30, 400, 290, "Style");
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->when(fltk3::WHEN_NEVER);
o->hide();
{ fltk3::Group* o = new fltk3::Group(95, 40, 309, 20, "Label Font:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Choice* o = new Fl_Choice(95, 40, 170, 20);
o->tooltip("The style of the label text.");
@@ -523,7 +523,7 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)labelfont_cb);
+ o->callback((fltk3::Callback*)labelfont_cb);
fltk3::Group::current()->resizable(o);
o->menu(fontmenu);
} // Fl_Choice* o
@@ -534,19 +534,19 @@
o->step(1);
o->value(14);
o->textsize(11);
- o->callback((Fl_Callback*)labelsize_cb);
+ o->callback((fltk3::Callback*)labelsize_cb);
} // Fl_Value_Input* o
- { Fl_Button* o = new Fl_Button(314, 40, 90, 20, "Label Color");
+ { fltk3::Button* o = new fltk3::Button(314, 40, 90, 20, "Label Color");
o->tooltip("The color of the label text.");
o->labelsize(11);
- o->callback((Fl_Callback*)labelcolor_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)labelcolor_cb);
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(95, 65, 309, 20, "Box:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Choice* o = new Fl_Choice(95, 65, 219, 20);
o->tooltip("The \"up\" box of the widget.");
@@ -555,21 +555,21 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)box_cb);
+ o->callback((fltk3::Callback*)box_cb);
fltk3::Group::current()->resizable(o);
o->menu(boxmenu);
} // Fl_Choice* o
- { Fl_Button* o = new Fl_Button(314, 65, 90, 20, "Color");
+ { fltk3::Button* o = new fltk3::Button(314, 65, 90, 20, "Color");
o->tooltip("The background color of the widget.");
o->labelsize(11);
- o->callback((Fl_Callback*)color_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)color_cb);
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(95, 90, 309, 20, "Down Box:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Choice* o = new Fl_Choice(95, 90, 219, 20);
o->tooltip("The \"down\" box of the widget.");
@@ -578,21 +578,21 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)down_box_cb);
+ o->callback((fltk3::Callback*)down_box_cb);
fltk3::Group::current()->resizable(o);
o->menu(boxmenu);
} // Fl_Choice* o
- { Fl_Button* o = new Fl_Button(314, 90, 90, 20, "Select Color");
+ { fltk3::Button* o = new fltk3::Button(314, 90, 90, 20, "Select Color");
o->tooltip("The selection color of the widget.");
o->labelsize(11);
- o->callback((Fl_Callback*)color2_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)color2_cb);
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(95, 115, 309, 20, "Text Font:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Choice* o = new Fl_Choice(95, 115, 170, 20);
o->tooltip("The value text style.");
@@ -601,7 +601,7 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)textfont_cb);
+ o->callback((fltk3::Callback*)textfont_cb);
fltk3::Group::current()->resizable(o);
o->menu(fontmenu);
} // Fl_Choice* o
@@ -612,13 +612,13 @@
o->step(1);
o->value(14);
o->textsize(11);
- o->callback((Fl_Callback*)textsize_cb);
+ o->callback((fltk3::Callback*)textsize_cb);
} // Fl_Value_Input* o
- { Fl_Button* o = new Fl_Button(314, 115, 90, 20, "Text Color");
+ { fltk3::Button* o = new fltk3::Button(314, 115, 90, 20, "Text Color");
o->tooltip("The value text color.");
o->labelsize(11);
- o->callback((Fl_Callback*)textcolor_cb);
- } // Fl_Button* o
+ o->callback((fltk3::Callback*)textcolor_cb);
+ } // fltk3::Button* o
o->end();
} // fltk3::Group* o
{ fltk3::Box* o = new fltk3::Box(95, 140, 300, 40);
@@ -629,13 +629,13 @@
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(10, 30, 400, 290, "C++");
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->when(fltk3::WHEN_NEVER);
o->hide();
{ fltk3::Group* o = new fltk3::Group(95, 40, 310, 20, "Class:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 40, 172, 20);
o->tooltip("The widget subclass.");
@@ -643,7 +643,7 @@
o->labelsize(11);
o->textfont(4);
o->textsize(11);
- o->callback((Fl_Callback*)subclass_cb, (void*)(4));
+ o->callback((fltk3::Callback*)subclass_cb, (void*)(4));
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
{ Fl_Choice* o = new Fl_Choice(265, 40, 140, 20);
@@ -652,21 +652,21 @@
o->down_box(fltk3::BORDER_BOX);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)subtype_cb);
+ o->callback((fltk3::Callback*)subtype_cb);
} // Fl_Choice* o
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(95, 65, 310, 20, "Name:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 65, 235, 20);
o->tooltip("The name of the widget.");
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)name_cb);
+ o->callback((fltk3::Callback*)name_cb);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
{ Fl_Choice* o = new Fl_Choice(330, 65, 75, 20);
@@ -674,7 +674,7 @@
o->down_box(fltk3::BORDER_BOX);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)name_public_member_cb);
+ o->callback((fltk3::Callback*)name_public_member_cb);
o->when(fltk3::WHEN_CHANGED);
o->menu(menu_2);
} // Fl_Choice* o
@@ -683,7 +683,7 @@
o->down_box(fltk3::BORDER_BOX);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)name_public_cb);
+ o->callback((fltk3::Callback*)name_public_cb);
o->when(fltk3::WHEN_CHANGED);
o->menu(menu_3);
} // Fl_Choice* o
@@ -695,28 +695,28 @@
v_input[0]->labelsize(11);
v_input[0]->textfont(4);
v_input[0]->textsize(11);
- v_input[0]->callback((Fl_Callback*)v_input_cb, (void*)(0));
+ v_input[0]->callback((fltk3::Callback*)v_input_cb, (void*)(0));
} // Fl_Input* v_input[0]
{ v_input[1] = new Fl_Input(95, 110, 310, 20);
v_input[1]->tooltip("Extra initialization code for the widget.");
v_input[1]->labelsize(11);
v_input[1]->textfont(4);
v_input[1]->textsize(11);
- v_input[1]->callback((Fl_Callback*)v_input_cb, (void*)(1));
+ v_input[1]->callback((fltk3::Callback*)v_input_cb, (void*)(1));
} // Fl_Input* v_input[1]
{ v_input[2] = new Fl_Input(95, 130, 310, 20);
v_input[2]->tooltip("Extra initialization code for the widget.");
v_input[2]->labelsize(11);
v_input[2]->textfont(4);
v_input[2]->textsize(11);
- v_input[2]->callback((Fl_Callback*)v_input_cb, (void*)(2));
+ v_input[2]->callback((fltk3::Callback*)v_input_cb, (void*)(2));
} // Fl_Input* v_input[2]
{ v_input[3] = new Fl_Input(95, 150, 310, 20);
v_input[3]->tooltip("Extra initialization code for the widget.");
v_input[3]->labelsize(11);
v_input[3]->textfont(4);
v_input[3]->textsize(11);
- v_input[3]->callback((Fl_Callback*)v_input_cb, (void*)(3));
+ v_input[3]->callback((fltk3::Callback*)v_input_cb, (void*)(3));
} // Fl_Input* v_input[3]
{ CodeEditor* o = new CodeEditor(95, 175, 310, 90, "Callback:");
o->tooltip("The callback function or code for the widget. Use the variable name \'o\' to \
@@ -730,7 +730,7 @@
o->labelcolor(fltk3::FOREGROUND_COLOR);
o->textfont(4);
o->textsize(11);
- o->callback((Fl_Callback*)callback_cb);
+ o->callback((fltk3::Callback*)callback_cb);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
o->when(fltk3::WHEN_RELEASE);
fltk3::Group::current()->resizable(o);
@@ -738,7 +738,7 @@
{ fltk3::Group* o = new fltk3::Group(95, 270, 310, 20, "User Data:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 270, 158, 20);
o->tooltip("The user data to pass into the callback code.");
@@ -746,7 +746,7 @@
o->labelsize(11);
o->textfont(4);
o->textsize(11);
- o->callback((Fl_Callback*)user_data_cb);
+ o->callback((fltk3::Callback*)user_data_cb);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
{ Fl_Choice* o = new Fl_Choice(300, 270, 105, 20, "When:");
@@ -756,7 +756,7 @@
o->labelfont(1);
o->labelsize(11);
o->textsize(11);
- o->callback((Fl_Callback*)when_cb);
+ o->callback((fltk3::Callback*)when_cb);
o->when(fltk3::WHEN_CHANGED);
o->menu(whenmenu);
} // Fl_Choice* o
@@ -765,7 +765,7 @@
{ fltk3::Group* o = new fltk3::Group(95, 295, 310, 20, "Type:");
o->labelfont(1);
o->labelsize(11);
- o->callback((Fl_Callback*)propagate_load);
+ o->callback((fltk3::Callback*)propagate_load);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
{ Fl_Input* o = new Fl_Input(95, 295, 158, 20);
o->tooltip("The type of the user data.");
@@ -773,14 +773,14 @@
o->labelsize(11);
o->textfont(4);
o->textsize(11);
- o->callback((Fl_Callback*)user_data_type_cb);
+ o->callback((fltk3::Callback*)user_data_type_cb);
fltk3::Group::current()->resizable(o);
} // Fl_Input* o
{ Fl_Light_Button* o = new Fl_Light_Button(300, 295, 105, 20, "No Change");
o->tooltip("Call the callback even if the value has not changed.");
o->selection_color((fltk3::Color)1);
o->labelsize(11);
- o->callback((Fl_Callback*)when_button_cb);
+ o->callback((fltk3::Callback*)when_button_cb);
} // Fl_Light_Button* o
o->end();
} // fltk3::Group* o
@@ -795,33 +795,33 @@
o->labelsize(11);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
- { Fl_Button* o = new Fl_Button(240, 330, 99, 20, "Hide &Overlays");
+ { fltk3::Button* o = new fltk3::Button(240, 330, 99, 20, "Hide &Overlays");
o->tooltip("Hide the widget overlay box.");
o->labelsize(11);
o->labelcolor((fltk3::Color)1);
- o->callback((Fl_Callback*)overlay_cb);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(66, 330, 80, 20, "Revert");
+ o->callback((fltk3::Callback*)overlay_cb);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(66, 330, 80, 20, "Revert");
o->labelsize(11);
- o->callback((Fl_Callback*)revert_cb);
+ o->callback((fltk3::Callback*)revert_cb);
o->hide();
- } // Fl_Button* o
+ } // fltk3::Button* o
{ Fl_Return_Button* o = new Fl_Return_Button(344, 330, 64, 20, "Close");
o->labelsize(11);
- o->callback((Fl_Callback*)ok_cb);
+ o->callback((fltk3::Callback*)ok_cb);
} // Fl_Return_Button* o
- { Fl_Button* o = new Fl_Button(339, 330, 70, 20, "Cancel");
+ { fltk3::Button* o = new fltk3::Button(339, 330, 70, 20, "Cancel");
o->labelsize(11);
- o->callback((Fl_Callback*)cancel_cb);
+ o->callback((fltk3::Callback*)cancel_cb);
o->hide();
- } // Fl_Button* o
- { wLiveMode = new Fl_Button(151, 330, 84, 20, "Live &Mode");
+ } // fltk3::Button* o
+ { wLiveMode = new fltk3::Button(151, 330, 84, 20, "Live &Mode");
wLiveMode->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\
avior.");
wLiveMode->type(1);
wLiveMode->labelsize(11);
- wLiveMode->callback((Fl_Callback*)live_mode_cb);
- } // Fl_Button* wLiveMode
+ wLiveMode->callback((fltk3::Callback*)live_mode_cb);
+ } // fltk3::Button* wLiveMode
o->end();
} // fltk3::Group* o
o->size_range(o->w(), o->h());
Modified: branches/branch-3.0/fluid/widget_panel.h
===================================================================
--- branches/branch-3.0/fluid/widget_panel.h 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/fluid/widget_panel.h 2011-05-17 15:45:34 UTC (rev 8681)
@@ -41,10 +41,10 @@
extern void labeltype_cb(Fl_Choice*, void*);
extern void image_cb(Fl_Input*, void*);
#include <fltk3/Button.h>
-extern void image_browse_cb(Fl_Button*, void*);
+extern void image_browse_cb(fltk3::Button*, void*);
extern void inactive_cb(Fl_Input*, void*);
-extern void inactive_browse_cb(Fl_Button*, void*);
-extern void align_cb(Fl_Button*, void*);
+extern void inactive_browse_cb(fltk3::Button*, void*);
+extern void align_cb(fltk3::Button*, void*);
extern void align_text_image_cb(Fl_Choice*, void*);
extern void align_position_cb(Fl_Choice*, void*);
#include <fltk3/Box.h>
@@ -66,10 +66,10 @@
extern void value_cb(Fl_Value_Input*, void*);
extern void min_w_cb(Fl_Value_Input*, void*);
extern void min_h_cb(Fl_Value_Input*, void*);
-extern void set_min_size_cb(Fl_Button*, void*);
+extern void set_min_size_cb(fltk3::Button*, void*);
extern void max_w_cb(Fl_Value_Input*, void*);
extern void max_h_cb(Fl_Value_Input*, void*);
-extern void set_max_size_cb(Fl_Button*, void*);
+extern void set_max_size_cb(fltk3::Button*, void*);
#include "Shortcut_Button.h"
extern void shortcut_in_cb(Shortcut_Button*, void*);
extern void xclass_cb(Fl_Input*, void*);
@@ -84,15 +84,15 @@
extern Fl_Menu_Item fontmenu[];
extern void labelfont_cb(Fl_Choice*, void*);
extern void labelsize_cb(Fl_Value_Input*, void*);
-extern void labelcolor_cb(Fl_Button*, void*);
+extern void labelcolor_cb(fltk3::Button*, void*);
extern Fl_Menu_Item boxmenu[];
extern void box_cb(Fl_Choice*, void*);
-extern void color_cb(Fl_Button*, void*);
+extern void color_cb(fltk3::Button*, void*);
extern void down_box_cb(Fl_Choice*, void*);
-extern void color2_cb(Fl_Button*, void*);
+extern void color2_cb(fltk3::Button*, void*);
extern void textfont_cb(Fl_Choice*, void*);
extern void textsize_cb(Fl_Value_Input*, void*);
-extern void textcolor_cb(Fl_Button*, void*);
+extern void textcolor_cb(fltk3::Button*, void*);
extern void subclass_cb(Fl_Input*, void*);
extern void subtype_cb(Fl_Choice*, void*);
extern void name_cb(Fl_Input*, void*);
@@ -107,13 +107,13 @@
extern void when_cb(Fl_Choice*, void*);
extern void user_data_type_cb(Fl_Input*, void*);
extern void when_button_cb(Fl_Light_Button*, void*);
-extern void overlay_cb(Fl_Button*, void*);
-extern void revert_cb(Fl_Button*, void*);
+extern void overlay_cb(fltk3::Button*, void*);
+extern void revert_cb(fltk3::Button*, void*);
#include <fltk3/ReturnButton.h>
extern void ok_cb(Fl_Return_Button*, void*);
-extern void cancel_cb(Fl_Button*, void*);
-extern void live_mode_cb(Fl_Button*, void*);
-extern Fl_Button *wLiveMode;
+extern void cancel_cb(fltk3::Button*, void*);
+extern void live_mode_cb(fltk3::Button*, void*);
+extern fltk3::Button *wLiveMode;
Fl_Double_Window* make_widget_panel();
extern Fl_Menu_Item menu_[];
extern Fl_Menu_Item menu_1[];
Modified: branches/branch-3.0/make3.sh
===================================================================
--- branches/branch-3.0/make3.sh 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/make3.sh 2011-05-17 15:45:34 UTC (rev 8681)
@@ -234,6 +234,8 @@
renameClass Fl_Widget Widget
renameClass Fl_Group Group
renameClass Fl_Window Window
+renameClass Fl_Button Button
+renameClass Fl_Label Label
renameClass Fl_Widget_Tracker WidgetTracker
renameType Fl_Label_Draw_F LabelDrawF
@@ -249,6 +251,8 @@
renameType Fl_Atclose_Handler FlAtcloseHandler
renameType Fl_Args_Handler ArgsHandler
renameType Fl_Event_Dispatch EventDispatch
+renameType Fl_Callback Callback
+renameType Fl_Callback_p CallbackPtr
@@ -261,4 +265,3 @@
-
Modified: branches/branch-3.0/src/Fl_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Button.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Button.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -31,7 +31,7 @@
#include <fltk3/Window.h>
-fltk3::WidgetTracker *Fl_Button::key_release_tracker = 0;
+fltk3::WidgetTracker *fltk3::Button::key_release_tracker = 0;
// There are a lot of subclasses, named Fl_*_Button. Some of
@@ -44,7 +44,7 @@
\param[in] v button value.
\see set(), clear()
*/
-int Fl_Button::value(int v) {
+int fltk3::Button::value(int v) {
v = v ? 1 : 0;
oldval = v;
clear_changed();
@@ -62,17 +62,17 @@
Turns on this button and turns off all other radio buttons in the group
(calling \c value(1) or \c set() does not do this).
*/
-void Fl_Button::setonly() { // set this radio button on, turn others off
+void fltk3::Button::setonly() { // set this radio button on, turn others off
value(1);
fltk3::Group* g = parent();
fltk3::Widget*const* a = g->array();
for (int i = g->children(); i--;) {
fltk3::Widget* o = *a++;
- if (o != this && o->type()==FL_RADIO_BUTTON) ((Fl_Button*)o)->value(0);
+ if (o != this && o->type()==FL_RADIO_BUTTON) ((fltk3::Button*)o)->value(0);
}
}
-void Fl_Button::draw() {
+void fltk3::Button::draw() {
if (type() == FL_HIDDEN_BUTTON) return;
fltk3::Color col = value() ? selection_color() : color();
draw_box(value() ? (down_box()?down_box():fltk3::down(box())) : box(), col);
@@ -86,7 +86,7 @@
if (fltk3::focus() == this) draw_focus();
}
-int Fl_Button::handle(int event) {
+int fltk3::Button::handle(int event) {
int newval;
switch (event) {
case fltk3::ENTER: /* FALLTHROUGH */
@@ -172,7 +172,7 @@
}
}
-void Fl_Button::simulate_key_action()
+void fltk3::Button::simulate_key_action()
{
if (key_release_tracker) {
fltk3::remove_timeout(key_release_timeout, key_release_tracker);
@@ -184,14 +184,14 @@
fltk3::add_timeout(0.15, key_release_timeout, key_release_tracker);
}
-void Fl_Button::key_release_timeout(void *d)
+void fltk3::Button::key_release_timeout(void *d)
{
fltk3::WidgetTracker *wt = (fltk3::WidgetTracker*)d;
if (!wt)
return;
if (wt==key_release_tracker)
key_release_tracker = 0L;
- Fl_Button *btn = (Fl_Button*)wt->widget();
+ fltk3::Button *btn = (fltk3::Button*)wt->widget();
if (btn) {
btn->value(0);
btn->redraw();
@@ -204,7 +204,7 @@
\param[in] X, Y, W, H position and size of the widget
\param[in] L widget label, default is no label
*/
-Fl_Button::Fl_Button(int X, int Y, int W, int H, const char *L)
+fltk3::Button::Button(int X, int Y, int W, int H, const char *L)
: fltk3::Widget(X,Y,W,H,L) {
box(fltk3::UP_BOX);
down_box(fltk3::NO_BOX);
Modified: branches/branch-3.0/src/Fl_Check_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Check_Button.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Check_Button.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -29,7 +29,7 @@
#include <fltk3/CheckButton.h>
// TODO Correct incorrect Fl_Check_Button comments.
-// A subclass of Fl_Button that always draws as a diamond box. This
+// A subclass of fltk3::Button that always draws as a diamond box. This
// diamond is smaller than the widget size and can be surchecked by
// another box type, for compatibility with Forms.
Modified: branches/branch-3.0/src/Fl_Choice.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Choice.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Choice.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -90,7 +90,7 @@
fl_push_clip(xx, yy, ww, hh);
if ( fltk3::scheme()) {
- Fl_Label l;
+ fltk3::Label l;
l.value = m.text;
l.image = 0;
l.deimage = 0;
Modified: branches/branch-3.0/src/Fl_Color_Chooser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Color_Chooser.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Color_Chooser.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -582,7 +582,7 @@
cancel_color.r = uchar(255*r+.5); ok_color.r = cancel_color.r;
ok_color.g = cancel_color.g = uchar(255*g+.5);
ok_color.b = cancel_color.b = uchar(255*b+.5);
- Fl_Button cancel_button(110, 165, 95, 25, fl_cancel);
+ fltk3::Button cancel_button(110, 165, 95, 25, fl_cancel);
cancel_button.callback(cc_cancel_cb,&ret);
window.resizable(chooser);
chooser.rgb(r,g,b);
Modified: branches/branch-3.0/src/Fl_File_Chooser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Chooser.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_File_Chooser.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -54,10 +54,10 @@
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favoritesButton_i(o,v);
}
-void Fl_File_Chooser::cb_newButton_i(Fl_Button*, void*) {
+void Fl_File_Chooser::cb_newButton_i(fltk3::Button*, void*) {
newdir();
}
-void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) {
+void Fl_File_Chooser::cb_newButton(fltk3::Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_newButton_i(o,v);
}
@@ -126,13 +126,13 @@
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_okButton_i(o,v);
}
-void Fl_File_Chooser::cb_cancelButton_i(Fl_Button*, void*) {
+void Fl_File_Chooser::cb_cancelButton_i(fltk3::Button*, void*) {
fileName->value("");
fileList->deselect();
fltk3::remove_timeout((fltk3::TimeoutHandler)previewCB, this);
window->hide();
}
-void Fl_File_Chooser::cb_cancelButton(Fl_Button* o, void* v) {
+void Fl_File_Chooser::cb_cancelButton(fltk3::Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_cancelButton_i(o,v);
}
@@ -143,31 +143,31 @@
((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favList_i(o,v);
}
-void Fl_File_Chooser::cb_favUpButton_i(Fl_Button*, void*) {
+void Fl_File_Chooser::cb_favUpButton_i(fltk3::Button*, void*) {
favoritesCB(favUpButton);
}
-void Fl_File_Chooser::cb_favUpButton(Fl_Button* o, void* v) {
+void Fl_File_Chooser::cb_favUpButton(fltk3::Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favUpButton_i(o,v);
}
-void Fl_File_Chooser::cb_favDeleteButton_i(Fl_Button*, void*) {
+void Fl_File_Chooser::cb_favDeleteButton_i(fltk3::Button*, void*) {
favoritesCB(favDeleteButton);
}
-void Fl_File_Chooser::cb_favDeleteButton(Fl_Button* o, void* v) {
+void Fl_File_Chooser::cb_favDeleteButton(fltk3::Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favDeleteButton_i(o,v);
}
-void Fl_File_Chooser::cb_favDownButton_i(Fl_Button*, void*) {
+void Fl_File_Chooser::cb_favDownButton_i(fltk3::Button*, void*) {
favoritesCB(favDownButton);
}
-void Fl_File_Chooser::cb_favDownButton(Fl_Button* o, void* v) {
+void Fl_File_Chooser::cb_favDownButton(fltk3::Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favDownButton_i(o,v);
}
-void Fl_File_Chooser::cb_favCancelButton_i(Fl_Button*, void*) {
+void Fl_File_Chooser::cb_favCancelButton_i(fltk3::Button*, void*) {
favWindow->hide();
}
-void Fl_File_Chooser::cb_favCancelButton(Fl_Button* o, void* v) {
+void Fl_File_Chooser::cb_favCancelButton(fltk3::Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favCancelButton_i(o,v);
}
@@ -181,34 +181,34 @@
Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char *title) {
fltk3::Group *prev_current = fltk3::Group::current();
{ window = new Fl_Double_Window(490, 380, "Choose File");
- window->callback((Fl_Callback*)cb_window, (void*)(this));
+ window->callback((fltk3::Callback*)cb_window, (void*)(this));
{ fltk3::Group* o = new fltk3::Group(10, 10, 470, 25);
{ showChoice = new Fl_Choice(65, 10, 215, 25, "Show:");
showChoice->down_box(fltk3::BORDER_BOX);
showChoice->labelfont(1);
- showChoice->callback((Fl_Callback*)cb_showChoice);
+ showChoice->callback((fltk3::Callback*)cb_showChoice);
fltk3::Group::current()->resizable(showChoice);
showChoice->label(show_label);
} // Fl_Choice* showChoice
{ favoritesButton = new Fl_Menu_Button(290, 10, 155, 25, "Favorites");
favoritesButton->down_box(fltk3::BORDER_BOX);
- favoritesButton->callback((Fl_Callback*)cb_favoritesButton);
+ favoritesButton->callback((fltk3::Callback*)cb_favoritesButton);
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);
+ { fltk3::Button* o = newButton = new fltk3::Button(455, 10, 25, 25);
newButton->image(image_new);
newButton->labelsize(8);
- newButton->callback((Fl_Callback*)cb_newButton);
+ newButton->callback((fltk3::Callback*)cb_newButton);
o->tooltip(new_directory_tooltip);
- } // Fl_Button* newButton
+ } // fltk3::Button* newButton
o->end();
} // fltk3::Group* o
{ Fl_Tile* o = new Fl_Tile(10, 45, 470, 225);
- o->callback((Fl_Callback*)cb_);
+ o->callback((fltk3::Callback*)cb_);
{ fileList = new Fl_File_Browser(10, 45, 295, 225);
fileList->type(2);
- fileList->callback((Fl_Callback*)cb_fileList);
+ fileList->callback((fltk3::Callback*)cb_fileList);
fileList->window()->hotspot(fileList);
} // Fl_File_Browser* fileList
{ previewBox = new fltk3::Box(305, 45, 175, 225, "?");
@@ -225,7 +225,7 @@
previewButton->shortcut(0x80070);
previewButton->down_box(fltk3::DOWN_BOX);
previewButton->value(1);
- previewButton->callback((Fl_Callback*)cb_previewButton);
+ previewButton->callback((fltk3::Callback*)cb_previewButton);
previewButton->label(preview_label);
} // Fl_Check_Button* previewButton
#ifndef WIN32
@@ -233,7 +233,7 @@
previewButton->x() + previewButton->w() + 30, 275, 140, 20, "Show hidden files");
show_hidden->down_box(fltk3::DOWN_BOX);
show_hidden->value(0);
- show_hidden->callback((Fl_Callback*)show_hidden_cb, this);
+ show_hidden->callback((fltk3::Callback*)show_hidden_cb, this);
show_hidden->label(hidden_label);
} // Fl_Check_Button* show_hidden
#endif
@@ -244,7 +244,7 @@
} // fltk3::Group* o
{ fileName = new Fl_File_Input(115, 300, 365, 35);
fileName->labelfont(1);
- fileName->callback((Fl_Callback*)cb_fileName);
+ fileName->callback((fltk3::Callback*)cb_fileName);
fileName->when(fltk3::WHEN_ENTER_KEY);
fltk3::Group::current()->resizable(fileName);
fileName->when(fltk3::WHEN_CHANGED | fltk3::WHEN_ENTER_KEY);
@@ -256,13 +256,13 @@
} // fltk3::Box* o
{ fltk3::Group* o = new fltk3::Group(10, 345, 470, 25);
{ okButton = new Fl_Return_Button(313, 345, 85, 25, "OK");
- okButton->callback((Fl_Callback*)cb_okButton);
+ okButton->callback((fltk3::Callback*)cb_okButton);
okButton->label(fl_ok);
} // Fl_Return_Button* okButton
- { Fl_Button* o = cancelButton = new Fl_Button(408, 345, 72, 25, "Cancel");
- cancelButton->callback((Fl_Callback*)cb_cancelButton);
+ { fltk3::Button* o = cancelButton = new fltk3::Button(408, 345, 72, 25, "Cancel");
+ cancelButton->callback((fltk3::Callback*)cb_cancelButton);
o->label(fl_cancel);
- } // Fl_Button* cancelButton
+ } // fltk3::Button* cancelButton
{ fltk3::Box* o = new fltk3::Box(10, 345, 30, 25);
fltk3::Group::current()->resizable(o);
} // fltk3::Box* o
@@ -278,30 +278,30 @@
favWindow->user_data((void*)(this));
{ favList = new Fl_File_Browser(10, 10, 300, 95);
favList->type(2);
- favList->callback((Fl_Callback*)cb_favList);
+ favList->callback((fltk3::Callback*)cb_favList);
fltk3::Group::current()->resizable(favList);
} // Fl_File_Browser* favList
{ fltk3::Group* o = new fltk3::Group(320, 10, 25, 95);
- { favUpButton = new Fl_Button(320, 10, 25, 25, "@8>");
- favUpButton->callback((Fl_Callback*)cb_favUpButton);
- } // Fl_Button* favUpButton
- { favDeleteButton = new Fl_Button(320, 45, 25, 25, "X");
+ { favUpButton = new fltk3::Button(320, 10, 25, 25, "@8>");
+ favUpButton->callback((fltk3::Callback*)cb_favUpButton);
+ } // fltk3::Button* favUpButton
+ { favDeleteButton = new fltk3::Button(320, 45, 25, 25, "X");
favDeleteButton->labelfont(1);
- favDeleteButton->callback((Fl_Callback*)cb_favDeleteButton);
+ favDeleteButton->callback((fltk3::Callback*)cb_favDeleteButton);
fltk3::Group::current()->resizable(favDeleteButton);
- } // Fl_Button* favDeleteButton
- { favDownButton = new Fl_Button(320, 80, 25, 25, "@2>");
- favDownButton->callback((Fl_Callback*)cb_favDownButton);
- } // Fl_Button* favDownButton
+ } // fltk3::Button* favDeleteButton
+ { favDownButton = new fltk3::Button(320, 80, 25, 25, "@2>");
+ favDownButton->callback((fltk3::Callback*)cb_favDownButton);
+ } // fltk3::Button* favDownButton
o->end();
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(10, 113, 335, 29);
- { favCancelButton = new Fl_Button(273, 115, 72, 25, "Cancel");
- favCancelButton->callback((Fl_Callback*)cb_favCancelButton);
+ { favCancelButton = new fltk3::Button(273, 115, 72, 25, "Cancel");
+ favCancelButton->callback((fltk3::Callback*)cb_favCancelButton);
favCancelButton->label(fl_cancel);
- } // Fl_Button* favCancelButton
+ } // fltk3::Button* favCancelButton
{ favOkButton = new Fl_Return_Button(181, 115, 79, 25, "Save");
- favOkButton->callback((Fl_Callback*)cb_favOkButton);
+ favOkButton->callback((fltk3::Callback*)cb_favOkButton);
favOkButton->label(save_label);
} // Fl_Return_Button* favOkButton
{ fltk3::Box* o = new fltk3::Box(10, 115, 161, 25);
Modified: branches/branch-3.0/src/Fl_File_Icon.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Icon.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_File_Icon.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -469,7 +469,7 @@
\param[in] a label alignment [not used]
*/
void
-Fl_File_Icon::labeltype(const Fl_Label *o, // I - Label data
+Fl_File_Icon::labeltype(const fltk3::Label *o, // I - Label data
int x, // I - X position of label
int y, // I - Y position of label
int w, // I - Width of label
Modified: branches/branch-3.0/src/Fl_Help_Dialog.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Help_Dialog.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Help_Dialog.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -31,7 +31,7 @@
#include "flstring.h"
#include <fltk3/ask.h>
-void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
+void Fl_Help_Dialog::cb_back__i(fltk3::Button*, void*) {
if (index_ > 0)
index_ --;
@@ -47,11 +47,11 @@
view_->topline(l);
}
-void Fl_Help_Dialog::cb_back_(Fl_Button* o, void* v) {
+void Fl_Help_Dialog::cb_back_(fltk3::Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_back__i(o,v);
}
-void Fl_Help_Dialog::cb_forward__i(Fl_Button*, void*) {
+void Fl_Help_Dialog::cb_forward__i(fltk3::Button*, void*) {
if (index_ < max_)
index_ ++;
@@ -67,11 +67,11 @@
view_->topline(l);
}
-void Fl_Help_Dialog::cb_forward_(Fl_Button* o, void* v) {
+void Fl_Help_Dialog::cb_forward_(fltk3::Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_forward__i(o,v);
}
-void Fl_Help_Dialog::cb_smaller__i(Fl_Button*, void*) {
+void Fl_Help_Dialog::cb_smaller__i(fltk3::Button*, void*) {
if (view_->textsize() > 8)
view_->textsize(view_->textsize() - 2);
@@ -79,11 +79,11 @@
smaller_->deactivate();
larger_->activate();
}
-void Fl_Help_Dialog::cb_smaller_(Fl_Button* o, void* v) {
+void Fl_Help_Dialog::cb_smaller_(fltk3::Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_smaller__i(o,v);
}
-void Fl_Help_Dialog::cb_larger__i(Fl_Button*, void*) {
+void Fl_Help_Dialog::cb_larger__i(fltk3::Button*, void*) {
if (view_->textsize() < 18)
view_->textsize(view_->textsize() + 2);
@@ -91,7 +91,7 @@
larger_->deactivate();
smaller_->activate();
}
-void Fl_Help_Dialog::cb_larger_(Fl_Button* o, void* v) {
+void Fl_Help_Dialog::cb_larger_(fltk3::Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_larger__i(o,v);
}
@@ -150,30 +150,30 @@
{ window_ = new Fl_Double_Window(530, 385, "Help Dialog");
window_->user_data((void*)(this));
{ fltk3::Group* o = new fltk3::Group(10, 10, 511, 25);
- { back_ = new Fl_Button(10, 10, 25, 25, "@<-");
+ { back_ = new fltk3::Button(10, 10, 25, 25, "@<-");
back_->tooltip("Show the previous help page.");
back_->shortcut(0xff51);
back_->labelcolor((fltk3::Color)2);
- back_->callback((Fl_Callback*)cb_back_);
- } // Fl_Button* back_
- { forward_ = new Fl_Button(45, 10, 25, 25, "@->");
+ back_->callback((fltk3::Callback*)cb_back_);
+ } // fltk3::Button* back_
+ { forward_ = new fltk3::Button(45, 10, 25, 25, "@->");
forward_->tooltip("Show the next help page.");
forward_->shortcut(0xff53);
forward_->labelcolor((fltk3::Color)2);
- forward_->callback((Fl_Callback*)cb_forward_);
- } // Fl_Button* forward_
- { smaller_ = new Fl_Button(80, 10, 25, 25, "F");
+ forward_->callback((fltk3::Callback*)cb_forward_);
+ } // fltk3::Button* forward_
+ { smaller_ = new fltk3::Button(80, 10, 25, 25, "F");
smaller_->tooltip("Make the help text smaller.");
smaller_->labelfont(1);
smaller_->labelsize(10);
- smaller_->callback((Fl_Callback*)cb_smaller_);
- } // Fl_Button* smaller_
- { larger_ = new Fl_Button(115, 10, 25, 25, "F");
+ smaller_->callback((fltk3::Callback*)cb_smaller_);
+ } // fltk3::Button* smaller_
+ { larger_ = new fltk3::Button(115, 10, 25, 25, "F");
larger_->tooltip("Make the help text larger.");
larger_->labelfont(1);
larger_->labelsize(16);
- larger_->callback((Fl_Callback*)cb_larger_);
- } // Fl_Button* larger_
+ larger_->callback((fltk3::Callback*)cb_larger_);
+ } // fltk3::Button* larger_
{ fltk3::Group* o = new fltk3::Group(350, 10, 171, 25);
o->box(fltk3::DOWN_BOX);
o->color(fltk3::BACKGROUND2_COLOR);
@@ -182,7 +182,7 @@
find_->box(fltk3::FLAT_BOX);
find_->labelsize(13);
find_->textfont(4);
- find_->callback((Fl_Callback*)cb_find_);
+ find_->callback((fltk3::Callback*)cb_find_);
find_->when(fltk3::WHEN_ENTER_KEY_ALWAYS);
} // Fl_Input* find_
o->end();
@@ -194,7 +194,7 @@
} // fltk3::Group* o
{ view_ = new Fl_Help_View(10, 45, 510, 330);
view_->box(fltk3::DOWN_BOX);
- view_->callback((Fl_Callback*)cb_view_);
+ view_->callback((fltk3::Callback*)cb_view_);
fltk3::Group::current()->resizable(view_);
} // Fl_Help_View* view_
window_->size_range(260, 150);
Modified: branches/branch-3.0/src/Fl_Image.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Image.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Image.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -132,7 +132,7 @@
}
void
-Fl_Image::labeltype(const Fl_Label *lo, // I - Label
+Fl_Image::labeltype(const fltk3::Label *lo, // I - Label
int lx, // I - X position
int ly, // I - Y position
int lw, // I - Width of label
@@ -157,7 +157,7 @@
}
void
-Fl_Image::measure(const Fl_Label *lo, // I - Label
+Fl_Image::measure(const fltk3::Label *lo, // I - Label
int &lw, // O - Width of image
int &lh) { // O - Height of image
Fl_Image *img; // Image pointer
Modified: branches/branch-3.0/src/Fl_Light_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Light_Button.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Light_Button.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
-// Subclass of Fl_Button where the "box" indicates whether it is
+// Subclass of fltk3::Button where the "box" indicates whether it is
// pushed or not, and the "down box" is drawn small and square on
// the left to indicate the current state.
@@ -153,7 +153,7 @@
case fltk3::RELEASE:
if (box()) redraw();
default:
- return Fl_Button::handle(event);
+ return fltk3::Button::handle(event);
}
}
@@ -163,7 +163,7 @@
<P>The destructor deletes the check button.
*/
Fl_Light_Button::Fl_Light_Button(int X, int Y, int W, int H, const char* l)
-: Fl_Button(X, Y, W, H, l) {
+: fltk3::Button(X, Y, W, H, l) {
type(FL_TOGGLE_BUTTON);
selection_color(fltk3::YELLOW);
align(fltk3::ALIGN_LEFT|fltk3::ALIGN_INSIDE);
Modified: branches/branch-3.0/src/Fl_Menu.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Menu.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Menu.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -136,7 +136,7 @@
Optionally, can get height if hp is not NULL.
*/
int Fl_Menu_Item::measure(int* hp, const Fl_Menu_* m) const {
- Fl_Label l;
+ fltk3::Label l;
l.value = text;
l.image = 0;
l.deimage = 0;
@@ -155,7 +155,7 @@
/** Draws the menu item in bounding box x,y,w,h, optionally selects the item. */
void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
int selected) const {
- Fl_Label l;
+ fltk3::Label l;
l.value = text;
l.image = 0;
l.deimage = 0;
Modified: branches/branch-3.0/src/Fl_Menu_.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Menu_.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Menu_.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -125,7 +125,7 @@
\param pathname The path and name of the menu item
\returns The item found, or NULL if not found
- \see find_index(const char*), find_item(Fl_Callback*), item_pathname()
+ \see find_index(const char*), find_item(fltk3::Callback*), item_pathname()
*/
const Fl_Menu_Item * Fl_Menu_::find_item(const char *pathname) {
int i = find_index(pathname);
@@ -170,7 +170,7 @@
\returns The index of the item with the specific callback, or -1 if not found
\see find_index(const char*)
*/
-int Fl_Menu_::find_index(Fl_Callback *cb) const {
+int Fl_Menu_::find_index(fltk3::Callback *cb) const {
for ( int t=0; t < size(); t++ )
if (menu_[t].callback_==cb)
return(t);
@@ -231,7 +231,7 @@
\returns The item found, or NULL if not found
\see find_item(const char*)
*/
-const Fl_Menu_Item * Fl_Menu_::find_item(Fl_Callback *cb) {
+const Fl_Menu_Item * Fl_Menu_::find_item(fltk3::Callback *cb) {
for ( int t=0; t < size(); t++ ) {
const Fl_Menu_Item *m = menu_ + t;
if (m->callback_==cb) {
Modified: branches/branch-3.0/src/Fl_Menu_add.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Menu_add.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Menu_add.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -110,7 +110,7 @@
int Fl_Menu_Item::add(
const char *mytext,
int sc,
- Fl_Callback *cb,
+ fltk3::Callback *cb,
void *data,
int myflags
) {
@@ -142,7 +142,7 @@
int index,
const char *mytext,
int sc,
- Fl_Callback *cb,
+ fltk3::Callback *cb,
void *data,
int myflags
) {
@@ -324,7 +324,7 @@
\todo Raw integer shortcut needs examples.
Dependent on responses to http://fltk.org/newsgroups.php?gfltk.development+v:10086 and results of STR#2344
*/
-int Fl_Menu_::add(const char *label,int shortcut,Fl_Callback *callback,void *userdata,int flags) {
+int Fl_Menu_::add(const char *label,int shortcut,fltk3::Callback *callback,void *userdata,int flags) {
return(insert(-1,label,shortcut,callback,userdata,flags)); // -1: append
}
@@ -365,7 +365,7 @@
int index,
const char *label,
int shortcut,
- Fl_Callback *callback,
+ fltk3::Callback *callback,
void *userdata,
int flags
) {
Modified: branches/branch-3.0/src/Fl_Multi_Label.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Multi_Label.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Multi_Label.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -34,10 +34,10 @@
#include <fltk3/MultiLabel.h>
static void multi_labeltype(
- const Fl_Label* o, int x, int y, int w, int h, fltk3::Align a)
+ const fltk3::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;
+ fltk3::Label local = *o;
local.value = b->labela;
local.type = b->typea;
int W = w; int H = h; local.measure(W, H);
@@ -53,9 +53,9 @@
}
// measurement is only correct for left-to-right appending...
-static void multi_measure(const Fl_Label* o, int& w, int& h) {
+static void multi_measure(const fltk3::Label* o, int& w, int& h) {
Fl_Multi_Label* b = (Fl_Multi_Label*)(o->value);
- Fl_Label local = *o;
+ fltk3::Label local = *o;
local.value = b->labela;
local.type = b->typea;
local.measure(w,h);
Modified: branches/branch-3.0/src/Fl_Repeat_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Repeat_Button.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Repeat_Button.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -32,7 +32,7 @@
#define REPEAT .1
void Fl_Repeat_Button::repeat_callback(void *v) {
- Fl_Button *b = (Fl_Button*)v;
+ fltk3::Button *b = (fltk3::Button*)v;
fltk3::add_timeout(REPEAT,repeat_callback,b);
b->do_callback();
}
@@ -61,7 +61,7 @@
}
return 1;
default:
- return Fl_Button::handle(event);
+ return fltk3::Button::handle(event);
}
}
Modified: branches/branch-3.0/src/Fl_Return_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Return_Button.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Return_Button.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -65,7 +65,7 @@
do_callback();
return 1;
} else
- return Fl_Button::handle(event);
+ return fltk3::Button::handle(event);
}
//
Modified: branches/branch-3.0/src/Fl_Round_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Round_Button.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Round_Button.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
-// A subclass of Fl_Button that always draws as a round circle. This
+// A subclass of fltk3::Button that always draws as a round circle. This
// circle is smaller than the widget size and can be surrounded by
// another box type, for compatibility with Forms.
Modified: branches/branch-3.0/src/Fl_Sys_Menu_Bar.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Sys_Menu_Bar.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Sys_Menu_Bar.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -209,9 +209,9 @@
* add to the system menu bar a new menu item, with a title string, shortcut int,
* callback, argument to the callback, and flags.
*
- * @see Fl_Menu_::add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags)
+ * @see Fl_Menu_::add(const char* label, int shortcut, fltk3::Callback *cb, void *user_data, int flags)
*/
-int Fl_Sys_Menu_Bar::add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags)
+int Fl_Sys_Menu_Bar::add(const char* label, int shortcut, fltk3::Callback *cb, void *user_data, int flags)
{
fl_open_display();
int rank = Fl_Menu_::add(label, shortcut, cb, user_data, flags);
@@ -225,9 +225,9 @@
* insert in the system menu bar a new menu item, with a title string, shortcut int,
* callback, argument to the callback, and flags.
*
- * @see Fl_Menu_::insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags)
+ * @see Fl_Menu_::insert(int index, const char* label, int shortcut, fltk3::Callback *cb, void *user_data, int flags)
*/
-int Fl_Sys_Menu_Bar::insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags)
+int Fl_Sys_Menu_Bar::insert(int index, const char* label, int shortcut, fltk3::Callback *cb, void *user_data, int flags)
{
fl_open_display();
int rank = Fl_Menu_::insert(index, label, shortcut, cb, user_data, flags);
Modified: branches/branch-3.0/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Text_Display.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Text_Display.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -114,9 +114,9 @@
text_area.h = 0;
mVScrollBar = new Fl_Scrollbar(0,0,1,1);
- mVScrollBar->callback((Fl_Callback*)v_scrollbar_cb, this);
+ mVScrollBar->callback((fltk3::Callback*)v_scrollbar_cb, this);
mHScrollBar = new Fl_Scrollbar(0,0,1,1);
- mHScrollBar->callback((Fl_Callback*)h_scrollbar_cb, this);
+ mHScrollBar->callback((fltk3::Callback*)h_scrollbar_cb, this);
mHScrollBar->type(FL_HORIZONTAL);
end();
Modified: branches/branch-3.0/src/Fl_Window.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Window.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_Window.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -59,7 +59,7 @@
resizable(0);
size_range_set = 0;
minw = maxw = minh = maxh = 0;
- callback((Fl_Callback*)default_callback);
+ callback((fltk3::Callback*)default_callback);
}
fltk3::Window::Window(int X,int Y,int W, int H, const char *l)
Modified: branches/branch-3.0/src/Fl_cocoa.mm
===================================================================
--- branches/branch-3.0/src/Fl_cocoa.mm 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_cocoa.mm 2011-05-17 15:45:34 UTC (rev 8681)
@@ -3022,7 +3022,7 @@
}
@end
-void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut)
+void fl_mac_set_about( fltk3::Callback *cb, void *user_data, int shortcut)
{
fl_open_display();
Fl_Menu_Item aboutItem;
Modified: branches/branch-3.0/src/Fl_win32.cxx
===================================================================
--- branches/branch-3.0/src/Fl_win32.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_win32.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -2048,7 +2048,7 @@
if(!first) return;
first=FALSE;
static fltk3::Window w(0,0,120,30);
- static Fl_Button b(0,0,w.w(),w.h(), "Print front window");
+ static fltk3::Button b(0,0,w.w(),w.h(), "Print front window");
b.callback(printFront);
w.end();
w.show();
Modified: branches/branch-3.0/src/Fl_x.cxx
===================================================================
--- branches/branch-3.0/src/Fl_x.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/Fl_x.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -2018,7 +2018,7 @@
if(!first) return;
first=0;
static fltk3::Window w(0,0,150,30);
- static Fl_Button b(0,0,w.w(),w.h(), "Print front window");
+ static fltk3::Button b(0,0,w.w(),w.h(), "Print front window");
b.callback(printFront);
w.end();
w.show();
Modified: branches/branch-3.0/src/fl_ask.cxx
===================================================================
--- branches/branch-3.0/src/fl_ask.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/fl_ask.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -50,7 +50,7 @@
static fltk3::Window *message_form;
static fltk3::Box *message;
static fltk3::Box *icon;
-static Fl_Button *button[3];
+static fltk3::Button *button[3];
static Fl_Input *input;
static int ret_val;
static const char *iconlabel = "?";
@@ -67,7 +67,7 @@
// Sets the global return value (ret_val) and closes the window.
// Note: this is used for the button callbacks and the window
// callback (closing the window with the close button or menu).
-// The first argument (fltk3::Widget *) can either be an Fl_Button*
+// The first argument (fltk3::Widget *) can either be an fltk3::Button*
// pointer to one of the buttons or an fltk3::Window* pointer to the
// message window (message_form).
static void button_cb(fltk3::Widget *, void *val) {
@@ -105,7 +105,7 @@
if (b==1)
button[b] = new Fl_Return_Button(x, 70, 90, 23);
else
- button[b] = new Fl_Button(x, 70, 90, 23);
+ button[b] = new fltk3::Button(x, 70, 90, 23);
button[b]->align(fltk3::ALIGN_INSIDE|fltk3::ALIGN_WRAP);
button[b]->callback(button_cb,(void *)b);
}
Modified: branches/branch-3.0/src/fl_engraved_label.cxx
===================================================================
--- branches/branch-3.0/src/fl_engraved_label.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/fl_engraved_label.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -34,7 +34,7 @@
// data[] is dx, dy, color triples
static void innards(
- const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align,
+ const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align,
int data[][3], int n)
{
fltk3::Align a1 = align;
@@ -49,14 +49,14 @@
}
static void fl_shadow_label(
- const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
+ const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
static int data[2][3] = {{2,2,fltk3::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, fltk3::Align align)
+ const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
static int data[7][3] = {
{1,0,fltk3::LIGHT3},{1,1,fltk3::LIGHT3},{0,1,fltk3::LIGHT3},
@@ -66,7 +66,7 @@
}
static void fl_embossed_label(
- const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
+ const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
static int data[7][3] = {
{-1,0,fltk3::LIGHT3},{-1,-1,fltk3::LIGHT3},{0,-1,fltk3::LIGHT3},
Modified: branches/branch-3.0/src/fl_labeltype.cxx
===================================================================
--- branches/branch-3.0/src/fl_labeltype.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/fl_labeltype.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -36,10 +36,10 @@
#include <fltk3/Image.h>
void
-fl_no_label(const Fl_Label*,int,int,int,int,fltk3::Align) {}
+fl_no_label(const fltk3::Label*,int,int,int,int,fltk3::Align) {}
void
-fl_normal_label(const Fl_Label* o, int X, int Y, int W, int H, fltk3::Align align)
+fl_normal_label(const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
{
fl_font(o->font, o->size);
fl_color((fltk3::Color)o->color);
@@ -47,7 +47,7 @@
}
void
-fl_normal_measure(const Fl_Label* o, int& W, int& H) {
+fl_normal_measure(const fltk3::Label* o, int& W, int& H) {
fl_font(o->font, o->size);
fl_measure(o->value, W, H);
if (o->image) {
@@ -83,7 +83,7 @@
////////////////////////////////////////////////////////////////
/** Draws a label with arbitrary alignment in an arbitrary box. */
-void Fl_Label::draw(int X, int Y, int W, int H, fltk3::Align align) const {
+void fltk3::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);
}
@@ -92,7 +92,7 @@
\param[in,out] W, H : this is the requested size for the label text plus image;
on return, this will contain the size needed to fit the label
*/
-void Fl_Label::measure(int& W, int& H) const {
+void fltk3::Label::measure(int& W, int& H) const {
if (!value && !image) {
W = H = 0;
return;
@@ -126,7 +126,7 @@
*/
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_;
+ fltk3::Label l1 = label_;
if (!active_r()) {
l1.color = fltk3::inactive((fltk3::Color)l1.color);
if (l1.deimage) l1.image = l1.deimage;
Modified: branches/branch-3.0/src/fl_shortcut.cxx
===================================================================
--- branches/branch-3.0/src/fl_shortcut.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/fl_shortcut.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -53,7 +53,7 @@
/**
Tests the current event, which must be an fltk3::KEYBOARD or
- fltk3::SHORTCUT, against a shortcut value (described in Fl_Button).
+ fltk3::SHORTCUT, against a shortcut value (described in fltk3::Button).
Not to be confused with fltk3::Widget::test_shortcut().
@@ -166,7 +166,7 @@
/**
Get a human-readable string from a shortcut value.
- Unparse a shortcut value as used by Fl_Button or Fl_Menu_Item into
+ Unparse a shortcut value as used by fltk3::Button or Fl_Menu_Item into
a human-readable string like "Alt+N". This only works if the shortcut
is a character key or a numbered function key. If the shortcut is
zero then an empty string is returned. The return value points at
Modified: branches/branch-3.0/src/forms_compatability.cxx
===================================================================
--- branches/branch-3.0/src/forms_compatability.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/forms_compatability.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -151,8 +151,8 @@
#include <fltk3/ReturnButton.h>
#include <fltk3/RepeatButton.h>
-Fl_Button *fl_add_button(uchar t,int x,int y,int w,int h,const char *l) {
- Fl_Button *b;
+fltk3::Button *fl_add_button(uchar t,int x,int y,int w,int h,const char *l) {
+ fltk3::Button *b;
switch (t) {
case FL_RETURN_BUTTON:
case FL_HIDDEN_RET_BUTTON:
@@ -162,7 +162,7 @@
b = new Fl_Repeat_Button(x,y,w,h,l);
break;
default:
- b = new Fl_Button(x,y,w,h,l);
+ b = new fltk3::Button(x,y,w,h,l);
}
switch (t) {
case FL_TOGGLE_BUTTON:
Modified: branches/branch-3.0/src/glut_compatability.cxx
===================================================================
--- branches/branch-3.0/src/glut_compatability.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/glut_compatability.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -341,7 +341,7 @@
menu *m = &menus[glut_menu];
Fl_Menu_Item* i = additem(m);
i->text = label;
- i->callback_ = (Fl_Callback*)(m->cb);
+ i->callback_ = (fltk3::Callback*)(m->cb);
i->user_data_ = (void *)value;
}
@@ -358,7 +358,7 @@
menu *m = &menus[glut_menu];
Fl_Menu_Item* i = &m->m[item-1];
i->text = label;
- i->callback_ = (Fl_Callback*)(m->cb);
+ i->callback_ = (fltk3::Callback*)(m->cb);
i->user_data_ = (void *)value;
i->flags = 0;
}
Modified: branches/branch-3.0/src/print_panel.cxx
===================================================================
--- branches/branch-3.0/src/print_panel.cxx 2011-05-17 15:17:01 UTC (rev 8680)
+++ branches/branch-3.0/src/print_panel.cxx 2011-05-17 15:45:34 UTC (rev 8681)
@@ -52,7 +52,7 @@
static Fl_Double_Window *print_panel=(Fl_Double_Window *)0;
static fltk3::Group *print_panel_controls=(fltk3::Group *)0;
static Fl_Choice *print_choice=(Fl_Choice *)0;
-static Fl_Button *print_properties=(Fl_Button *)0;
+static fltk3::Button *print_properties=(fltk3::Button *)0;
static fltk3::Box *print_status=(fltk3::Box *)0;
static Fl_Round_Button *print_all=(Fl_Round_Button *)0;
static Fl_Round_Button *print_pages=(Fl_Round_Button *)0;
@@ -72,7 +72,7 @@
print_update_status();
}
-static void cb_print_properties(Fl_Button*, void*) {
+static void cb_print_properties(fltk3::Button*, void*) {
print_properties_panel->show();
}
@@ -109,7 +109,7 @@
print_collate_group[1 - i]->hide();
}
-static void cb_Cancel(Fl_Button*, void*) {
+static void cb_Cancel(fltk3::Button*, void*) {
print_start = 0;
print_panel->hide();
}
@@ -218,7 +218,7 @@
};
static Fl_Pixmap image_print_gray(idata_print_gray);
-static Fl_Button *print_output_mode[4]={(Fl_Button *)0};
+static fltk3::Button *print_output_mode[4]={(fltk3::Button *)0};
static void cb_Save(Fl_Return_Button*, void*) {
print_properties_panel->hide();
@@ -237,12 +237,12 @@
print_prefs.set(name, val);
}
-static void cb_Cancel1(Fl_Button*, void*) {
+static void cb_Cancel1(fltk3::Button*, void*) {
print_properties_panel->hide();
print_update_status();
}
-static void cb_Use(Fl_Button*, void*) {
+static void cb_Use(fltk3::Button*, void*) {
print_properties_panel->hide();
}
@@ -252,12 +252,12 @@
{ print_choice = new Fl_Choice(133, 10, 181, 25, Fl_Printer::dialog_printer);
print_choice->down_box(fltk3::BORDER_BOX);
print_choice->labelfont(1);
- print_choice->callback((Fl_Callback*)cb_print_choice);
+ print_choice->callback((fltk3::Callback*)cb_print_choice);
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_properties = new fltk3::Button(314, 10, 115, 25, Fl_Printer::dialog_properties);
+ print_properties->callback((fltk3::Callback*)cb_print_properties);
+ } // fltk3::Button* print_properties
{ print_status = new fltk3::Box(0, 41, print_panel_controls->w(), 17, "printer/job status");
print_status->align(fltk3::Align(fltk3::ALIGN_CLIP|fltk3::ALIGN_INSIDE|fltk3::ALIGN_LEFT));
} // fltk3::Box* print_status
@@ -269,17 +269,17 @@
print_all->type(102);
print_all->down_box(fltk3::ROUND_DOWN_BOX);
print_all->value(1);
- print_all->callback((Fl_Callback*)cb_print_all);
+ print_all->callback((fltk3::Callback*)cb_print_all);
} // Fl_Round_Button* print_all
{ print_pages = new Fl_Round_Button(20, 126, 64, 25, Fl_Printer::dialog_pages);
print_pages->type(102);
print_pages->down_box(fltk3::ROUND_DOWN_BOX);
- print_pages->callback((Fl_Callback*)cb_print_pages);
+ print_pages->callback((fltk3::Callback*)cb_print_pages);
} // Fl_Round_Button* print_pages
{ print_selection = new Fl_Round_Button(20, 156, 82, 25, "Selection");
print_selection->type(102);
print_selection->down_box(fltk3::ROUND_DOWN_BOX);
- print_selection->callback((Fl_Callback*)cb_print_selection);
+ print_selection->callback((fltk3::Callback*)cb_print_selection);
} // Fl_Round_Button* print_selection
{ print_from = new Fl_Int_Input(136, 126, 28, 25, Fl_Printer::dialog_from);
print_from->type(2);
@@ -298,12 +298,12 @@
o->labelfont(1);
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->callback((fltk3::Callback*)cb_print_copies);
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->callback((fltk3::Callback*)cb_print_collate_button);
print_collate_button->when(fltk3::WHEN_CHANGED);
print_collate_button->deactivate();
} // Fl_Check_Button* print_collate_button
@@ -436,11 +436,11 @@
o->end();
} // fltk3::Group* o
{ Fl_Return_Button* o = new Fl_Return_Button(279, 201, 100, 25, Fl_Printer::dialog_print_button);
- o->callback((Fl_Callback*)print_cb);
+ o->callback((fltk3::Callback*)print_cb);
} // Fl_Return_Button* o
- { Fl_Button* o = new Fl_Button(389, 201, 68, 25, Fl_Printer::dialog_cancel_button);
- o->callback((Fl_Callback*)cb_Cancel);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(389, 201, 68, 25, Fl_Printer::dialog_cancel_button);
+ o->callback((fltk3::Callback*)cb_Cancel);
+ } // fltk3::Button* o
print_panel_controls->end();
} // fltk3::Group* print_panel_controls
{ print_progress = new Fl_Progress(10, 203, 289, 21);
@@ -451,7 +451,7 @@
print_panel->end();
} // Fl_Double_Window* print_panel
{ print_properties_panel = new Fl_Double_Window(290, 130, Fl_Printer::property_title);
- print_properties_panel->callback((Fl_Callback*)cb_print_properties_panel);
+ print_properties_panel->callback((fltk3::Callback*)cb_print_properties_panel);
{ print_page_size = new Fl_Choice(150, 10, 80, 25, Fl_Printer::property_pagesize);
print_page_size->down_box(fltk3::BORDER_BOX);
print_page_size->labelfont(fltk3::HELVETICA);
@@ -460,7 +460,7 @@
{ fltk3::Group* o = new fltk3::Group(110, 45, 170, 40, Fl_Printer::property_mode);
o->labelfont(fltk3::HELVETICA);
o->align(fltk3::Align(fltk3::ALIGN_LEFT));
- { print_output_mode[0] = new Fl_Button(110, 45, 30, 40);
+ { print_output_mode[0] = new fltk3::Button(110, 45, 30, 40);
print_output_mode[0]->type(102);
print_output_mode[0]->box(fltk3::BORDER_BOX);
print_output_mode[0]->down_box(fltk3::BORDER_BOX);
@@ -468,42 +468,42 @@
print_output_mode[0]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[0]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[0]->image(image_print_color);
- } // Fl_Button* print_output_mode[0]
- { print_output_mode[1] = new Fl_Button(150, 50, 40, 30);
+ } // fltk3::Button* print_output_mode[0]
+ { print_output_mode[1] = new fltk3::Button(150, 50, 40, 30);
print_output_mode[1]->type(102);
print_output_mode[1]->box(fltk3::BORDER_BOX);
print_output_mode[1]->down_box(fltk3::BORDER_BOX);
print_output_mode[1]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[1]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[1]->image(image_print_color);
- } // Fl_Button* print_output_mode[1]
- { print_output_mode[2] = new Fl_Button(200, 45, 30, 40);
+ } // fltk3::Button* print_output_mode[1]
+ { print_output_mode[2] = new fltk3::Button(200, 45, 30, 40);
print_output_mode[2]->type(102);
print_output_mode[2]->box(fltk3::BORDER_BOX);
print_output_mode[2]->down_box(fltk3::BORDER_BOX);
print_output_mode[2]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[2]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[2]->image(image_print_gray);
- } // Fl_Button* print_output_mode[2]
- { print_output_mode[3] = new Fl_Button(240, 50, 40, 30);
+ } // fltk3::Button* print_output_mode[2]
+ { print_output_mode[3] = new fltk3::Button(240, 50, 40, 30);
print_output_mode[3]->type(102);
print_output_mode[3]->box(fltk3::BORDER_BOX);
print_output_mode[3]->down_box(fltk3::BORDER_BOX);
print_output_mode[3]->color(fltk3::BACKGROUND2_COLOR);
print_output_mode[3]->selection_color(fltk3::FOREGROUND_COLOR);
print_output_mode[3]->image(image_print_gray);
- } // Fl_Button* print_output_mode[3]
+ } // fltk3::Button* print_output_mode[3]
o->end();
} // fltk3::Group* o
{ Fl_Return_Button* o = new Fl_Return_Button(93, 95, 99, 25, Fl_Printer::property_save);
- o->callback((Fl_Callback*)cb_Save);
+ o->callback((fltk3::Callback*)cb_Save);
} // Fl_Return_Button* o
- { Fl_Button* o = new Fl_Button(202, 95, 78, 25, Fl_Printer::property_cancel);
- o->callback((Fl_Callback*)cb_Cancel1);
- } // Fl_Button* o
- { Fl_Button* o = new Fl_Button(10, 95, 73, 25, Fl_Printer::property_use);
- o->callback((Fl_Callback*)cb_Use);
- } // Fl_Button* o
+ { fltk3::Button* o = new fltk3::Button(202, 95, 78, 25, Fl_Printer::property_cancel);
+ o->callback((fltk3::Callback*)cb_Cancel1);
+ } // fltk3::Button* o
+ { fltk3::Button* o = new fltk3::Button(10, 95, 73, 25, Fl_Printer::property_use);
+ o->callback((fltk3::Callback*)cb_Use);
+ } // fltk3::Button* o
print_properties_panel->set_modal();
print_properties_panel->end();
} // Fl_Double_Window* print_properties_panel
[ Direct Link to Message ] | |
