Author: matt
Date: 2011-05-20 07:08:09 -0700 (Fri, 20 May 2011)
New Revision: 8697
Log:
123: and more...
Modified:
branches/branch-3.0/fltk3/Browser.h
branches/branch-3.0/fltk3/Browser_.h
branches/branch-3.0/fltk3/HoldBrowser.h
branches/branch-3.0/fltk3/InputChoice.h
branches/branch-3.0/fltk3/MultiBrowser.h
branches/branch-3.0/fltk3/SelectBrowser.h
branches/branch-3.0/fluid/Fl_Menu_Type.cxx
branches/branch-3.0/fluid/Fl_Type.cxx
branches/branch-3.0/fluid/Fl_Type.h
branches/branch-3.0/fluid/Fl_Widget_Type.cxx
branches/branch-3.0/fluid/factory.cxx
branches/branch-3.0/fluid/function_panel.cxx
branches/branch-3.0/src/Fl_Browser_.cxx
branches/branch-3.0/src/Fl_Check_Browser.cxx
branches/branch-3.0/src/Fl_File_Chooser.cxx
branches/branch-3.0/test/boxtype.cxx
branches/branch-3.0/test/browser.cxx
branches/branch-3.0/test/forms.cxx
branches/branch-3.0/test/input_choice.cxx
branches/branch-3.0/test/unittest_scrollbarsize.cxx
Modified: branches/branch-3.0/fltk3/Browser.h
===================================================================
--- branches/branch-3.0/fltk3/Browser.h 2011-05-20 13:49:27 UTC (rev 8696)
+++ branches/branch-3.0/fltk3/Browser.h 2011-05-20 14:08:09 UTC (rev 8697)
@@ -61,7 +61,7 @@
The base class does nothing when the user clicks on it. The
subclasses
- Fl_Select_Browser,
+ fltk3::SelectBrowser,
fltk3::HoldBrowser, and
Fl_Multi_Browser react to user clicks to select lines in
the browser and do callbacks.
Modified: branches/branch-3.0/fltk3/Browser_.h
===================================================================
--- branches/branch-3.0/fltk3/Browser_.h 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fltk3/Browser_.h 2011-05-20 14:08:09 UTC (rev
8697)
@@ -39,16 +39,16 @@
#include "Scrollbar.h"
#include <fltk3/run.h> // fltk3::scrollbar_size()
-#define FL_NORMAL_BROWSER 0 /**< type() of fltk3::Browser */
-#define FL_SELECT_BROWSER 1 /**< type() of FL_Select_Browser */
-#define FL_HOLD_BROWSER 2 /**< type() of
fltk3::HoldBrowser */
-#define FL_MULTI_BROWSER 3 /**< type() of Fl_Multi_Browser */
+namespace fltk3 {
+
+ const uchar NORMAL_BROWSER = 0; /**< type() of fltk3::Browser */
+ const uchar SELECT_BROWSER = 1; /**< type() of FL_Select_Browser */
+ const uchar HOLD_BROWSER = 2; /**< type() of fltk3::HoldBrowser */
+ const uchar MULTI_BROWSER = 3; /**< type() of Fl_Multi_Browser */
-#define FL_SORT_ASCENDING 0 /**< sort browser items in ascending
alphabetic order. */
-#define FL_SORT_DESCENDING 1 /**< sort in descending order */
+ const uchar SORT_ASCENDING = 0; /**< sort browser items in ascending
alphabetic order. */
+ const uchar SORT_DESCENDING = 1; /**< sort in descending order */
-namespace fltk3 {
-
/**
This is the base class for browsers. To be useful it must be
subclassed and several virtual functions defined. The Forms-compatible
@@ -78,7 +78,7 @@
fltk3::Fontsize textsize_;
fltk3::Color textcolor_;
void* top_; // which item scrolling position is in
- void* selection_; // which is selected (except for FL_MULTI_BROWSER)
+ void* selection_; // which is selected (except for fltk3::MULTI_BROWSER)
void *redraw1,*redraw2; // minimal update pointers
void* max_width_item; // which item has max_width_
int scrollbar_size_; // size of scrollbar trough
Modified: branches/branch-3.0/fltk3/HoldBrowser.h
===================================================================
--- branches/branch-3.0/fltk3/HoldBrowser.h 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fltk3/HoldBrowser.h 2011-05-20 14:08:09 UTC (rev
8697)
@@ -49,11 +49,11 @@
/**
Creates a new fltk3::HoldBrowser widget using the given
position, size, and label string. The default boxtype is fltk3::DOWN_BOX.
- The constructor specializes fltk3::Browser() by setting the type to
FL_HOLD_BROWSER.
+ The constructor specializes fltk3::Browser() by setting the type to
fltk3::HOLD_BROWSER.
The destructor destroys the widget and frees all memory that has been
allocated.
*/
HoldBrowser(int X,int Y,int W,int H,const char *l=0)
- : fltk3::Browser(X,Y,W,H,l) {type(FL_HOLD_BROWSER);}
+ : fltk3::Browser(X,Y,W,H,l) {type(fltk3::HOLD_BROWSER);}
};
}
Modified: branches/branch-3.0/fltk3/InputChoice.h
===================================================================
--- branches/branch-3.0/fltk3/InputChoice.h 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fltk3/InputChoice.h 2011-05-20 14:08:09 UTC (rev
8697)
@@ -31,7 +31,7 @@
//
/* \file
- Fl_Input_Choice widget . */
+ fltk3::InputChoice widget . */
@@ -45,175 +45,180 @@
#include <fltk3/draw.h>
#include <string.h>
-/**
- A combination of the input widget and a menu button.
- The user can either type into the input area, or use the
- menu button chooser on the right, which loads the input area
- with predefined text. Normally it is drawn with an inset box
- and a white background.
- <P>
- The application can directly access both the input and menu
- widgets directly, using the menubutton()
- and input() accessor methods.
-*/
-class FLTK3_EXPORT Fl_Input_Choice : public fltk3::Group {
- // Private class to handle slightly 'special' behavior of menu button
- class InputMenuButton : public fltk3::MenuButton {
- void draw() {
- draw_box(fltk3::UP_BOX, color());
- fltk3::color(active_r() ? labelcolor() : fltk3::inactive(labelcolor()));
- int xc = x()+w()/2, yc=y()+h()/2;
- fltk3::polygon(xc-5,yc-3,xc+5,yc-3,xc,yc+3);
- if (fltk3::focus() == this) draw_focus();
- }
- public:
- InputMenuButton(int x,int y,int w,int h,const char*l=0) :
- fltk3::MenuButton(x,y,w,h,l) { box(fltk3::UP_BOX); }
- };
- fltk3::Input *inp_;
- InputMenuButton *menu_;
-
- static void menu_cb(fltk3::Widget*, void *data) {
- Fl_Input_Choice *o=(Fl_Input_Choice *)data;
- fltk3::WidgetTracker wp(o);
- const fltk3::MenuItem *item = o->menubutton()->mvalue();
- if (item && item->flags & (fltk3::SUBMENU|fltk3::SUBMENU_POINTER)) return;
// ignore submenus
- if (!strcmp(o->inp_->value(), o->menu_->text()))
- {
- o->fltk3::Widget::clear_changed();
- if (o->when() & fltk3::WHEN_NOT_CHANGED)
- o->do_callback();
+namespace fltk3 {
+
+ /**
+ A combination of the input widget and a menu button.
+ The user can either type into the input area, or use the
+ menu button chooser on the right, which loads the input area
+ with predefined text. Normally it is drawn with an inset box
+ and a white background.
+ <P>
+ The application can directly access both the input and menu
+ widgets directly, using the menubutton()
+ and input() accessor methods.
+ */
+ class FLTK3_EXPORT InputChoice : public fltk3::Group {
+ // Private class to handle slightly 'special' behavior of menu button
+ class InputMenuButton : public fltk3::MenuButton {
+ void draw() {
+ draw_box(fltk3::UP_BOX, color());
+ fltk3::color(active_r() ? labelcolor() :
fltk3::inactive(labelcolor()));
+ int xc = x()+w()/2, yc=y()+h()/2;
+ fltk3::polygon(xc-5,yc-3,xc+5,yc-3,xc,yc+3);
+ if (fltk3::focus() == this) draw_focus();
+ }
+ public:
+ InputMenuButton(int x,int y,int w,int h,const char*l=0) :
+ fltk3::MenuButton(x,y,w,h,l) { box(fltk3::UP_BOX); }
+ };
+
+ fltk3::Input *inp_;
+ InputMenuButton *menu_;
+
+ static void menu_cb(fltk3::Widget*, void *data) {
+ fltk3::InputChoice *o=(fltk3::InputChoice *)data;
+ fltk3::WidgetTracker wp(o);
+ const fltk3::MenuItem *item = o->menubutton()->mvalue();
+ if (item && item->flags & (fltk3::SUBMENU|fltk3::SUBMENU_POINTER))
return; // ignore submenus
+ if (!strcmp(o->inp_->value(), o->menu_->text()))
+ {
+ o->fltk3::Widget::clear_changed();
+ if (o->when() & fltk3::WHEN_NOT_CHANGED)
+ o->do_callback();
+ }
+ else
+ {
+ o->inp_->value(o->menu_->text());
+ o->inp_->set_changed();
+ o->fltk3::Widget::set_changed();
+ if (o->when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE))
+ o->do_callback();
+ }
+
+ if (wp.deleted()) return;
+
+ if (o->callback() != default_callback)
+ {
+ o->fltk3::Widget::clear_changed();
+ o->inp_->clear_changed();
+ }
}
- else
- {
- o->inp_->value(o->menu_->text());
- o->inp_->set_changed();
- o->fltk3::Widget::set_changed();
- if (o->when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE))
- o->do_callback();
+
+ static void inp_cb(fltk3::Widget*, void *data) {
+ fltk3::InputChoice *o=(fltk3::InputChoice *)data;
+ fltk3::WidgetTracker wp(o);
+ if (o->inp_->changed()) {
+ o->fltk3::Widget::set_changed();
+ if (o->when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE))
+ o->do_callback();
+ } else {
+ o->fltk3::Widget::clear_changed();
+ if (o->when() & fltk3::WHEN_NOT_CHANGED)
+ o->do_callback();
+ }
+
+ if (wp.deleted()) return;
+
+ if (o->callback() != default_callback)
+ o->fltk3::Widget::clear_changed();
}
- if (wp.deleted()) return;
-
- if (o->callback() != default_callback)
- {
- o->fltk3::Widget::clear_changed();
- o->inp_->clear_changed();
+ // Custom resize behavior -- input stretches, menu button doesn't
+ inline int inp_x() { return(x() + fltk3::box_dx(box())); }
+ inline int inp_y() { return(y() + fltk3::box_dy(box())); }
+ inline int inp_w() { return(w() - fltk3::box_dw(box()) - 20); }
+ inline int inp_h() { return(h() - fltk3::box_dh(box())); }
+
+ inline int menu_x() { return(x() + w() - 20 - fltk3::box_dx(box())); }
+ inline int menu_y() { return(y() + fltk3::box_dy(box())); }
+ inline int menu_w() { return(20); }
+ inline int menu_h() { return(h() - fltk3::box_dh(box())); }
+
+ public:
+ /**
+ Creates a new fltk3::InputChoice widget using the given position, size,
+ and label string.
+ <P> Inherited destructor Destroys the widget and any value associated
with it.
+ */
+ InputChoice (int x,int y,int w,int h,const char*l=0) :
fltk3::Group(x,y,w,h,l) {
+ fltk3::Group::box(fltk3::DOWN_BOX);
+ align(fltk3::ALIGN_LEFT); // default like
fltk3::Input
+ inp_ = new fltk3::Input(inp_x(), inp_y(),
+ inp_w(), inp_h());
+ inp_->callback(inp_cb, (void*)this);
+ inp_->box(fltk3::FLAT_BOX); // cosmetic
+ inp_->when(fltk3::WHEN_CHANGED|fltk3::WHEN_NOT_CHANGED);
+ menu_ = new InputMenuButton(menu_x(), menu_y(),
+ menu_w(), menu_h());
+ menu_->callback(menu_cb, (void*)this);
+ menu_->box(fltk3::FLAT_BOX); // cosmetic
+ end();
}
- }
-
- static void inp_cb(fltk3::Widget*, void *data) {
- Fl_Input_Choice *o=(Fl_Input_Choice *)data;
- fltk3::WidgetTracker wp(o);
- if (o->inp_->changed()) {
- o->fltk3::Widget::set_changed();
- if (o->when() & (fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE))
- o->do_callback();
- } else {
- o->fltk3::Widget::clear_changed();
- if (o->when() & fltk3::WHEN_NOT_CHANGED)
- o->do_callback();
+
+ /** Adds an item to the menu.*/
+ void add(const char *s) { menu_->add(s); }
+ int changed() const { return inp_->changed() | fltk3::Widget::changed();}
+ void clear_changed() {
+ inp_->clear_changed();
+ fltk3::Widget::clear_changed();
}
-
- if (wp.deleted()) return;
-
- if (o->callback() != default_callback)
- o->fltk3::Widget::clear_changed();
- }
-
- // Custom resize behavior -- input stretches, menu button doesn't
- inline int inp_x() { return(x() + fltk3::box_dx(box())); }
- inline int inp_y() { return(y() + fltk3::box_dy(box())); }
- inline int inp_w() { return(w() - fltk3::box_dw(box()) - 20); }
- inline int inp_h() { return(h() - fltk3::box_dh(box())); }
-
- inline int menu_x() { return(x() + w() - 20 - fltk3::box_dx(box())); }
- inline int menu_y() { return(y() + fltk3::box_dy(box())); }
- inline int menu_w() { return(20); }
- inline int menu_h() { return(h() - fltk3::box_dh(box())); }
-
-public:
- /**
- Creates a new Fl_Input_Choice widget using the given position, size,
- and label string.
- <P> Inherited destructor Destroys the widget and any value associated with
it.
- */
- Fl_Input_Choice (int x,int y,int w,int h,const char*l=0) :
fltk3::Group(x,y,w,h,l) {
- fltk3::Group::box(fltk3::DOWN_BOX);
- align(fltk3::ALIGN_LEFT); // default like
fltk3::Input
- inp_ = new fltk3::Input(inp_x(), inp_y(),
- inp_w(), inp_h());
- inp_->callback(inp_cb, (void*)this);
- inp_->box(fltk3::FLAT_BOX); // cosmetic
- inp_->when(fltk3::WHEN_CHANGED|fltk3::WHEN_NOT_CHANGED);
- menu_ = new InputMenuButton(menu_x(), menu_y(),
- menu_w(), menu_h());
- menu_->callback(menu_cb, (void*)this);
- menu_->box(fltk3::FLAT_BOX); // cosmetic
- end();
- }
+ void set_changed() {
+ inp_->set_changed();
+ // no need to call fltk3::Widget::set_changed()
+ }
+ /** Removes all items from the menu. */
+ void clear() { menu_->clear(); }
+ /** Gets the box type of the menu button */
+ fltk3::Boxtype down_box() const { return (menu_->down_box()); }
+ /** Sets the box type of the menu button */
+ void down_box(fltk3::Boxtype b) { menu_->down_box(b); }
+ /** Gets the fltk3::MenuItem array used for the menu. */
+ const fltk3::MenuItem *menu() { return (menu_->menu()); }
+ /** Sets the fltk3::MenuItem array used for the menu. */
+ void menu(const fltk3::MenuItem *m) { menu_->menu(m); }
+ void resize(int X, int Y, int W, int H) {
+ fltk3::Group::resize(X,Y,W,H);
+ inp_->resize(inp_x(), inp_y(), inp_w(), inp_h());
+ menu_->resize(menu_x(), menu_y(), menu_w(), menu_h());
+ }
+ /** Gets the encapsulated input text color attributes */
+ fltk3::Color textcolor() const { return (inp_->textcolor());}
+ /** Sets the encapsulated input text color attributes */
+ void textcolor(fltk3::Color c) { inp_->textcolor(c);}
+ /** Gets the encapsulated input text font attributes */
+ fltk3::Font textfont() const { return (inp_->textfont());}
+ /** Sets the encapsulated input text font attributes */
+ void textfont(fltk3::Font f) { inp_->textfont(f);}
+ /** Gets the encapsulated input size attributes */
+ fltk3::Fontsize textsize() const { return (inp_->textsize()); }
+ /** Sets the encapsulated input size attributes */
+ void textsize(fltk3::Fontsize s) { inp_->textsize(s); }
+ /** See void fltk3::InputChoice::value(const char *s) */
+ const char* value() const { return (inp_->value()); }
+ /**
+ Sets or returns the input widget's current contents. The
+ second form sets the contents using the index into the menu
+ which you can set as an integer. Setting the value effectively
+ 'chooses' this menu item, and sets it as the new input text,
+ deleting the previous text.
+ */
+ void value(const char *val) { inp_->value(val); }
+ /** See void fltk3::InputChoice::value(const char *s) */
+ void value(int val) {
+ menu_->value(val);
+ inp_->value(menu_->text(val));
+ }
+ /** Returns a reference to the internal fltk3::MenuButton widget. */
+ fltk3::MenuButton *menubutton() { return menu_; }
+ /**
+ Returns a reference to the internal fltk3::Input widget.</p>
+ */
+ fltk3::Input *input() { return inp_; }
+ };
- /** Adds an item to the menu.*/
- void add(const char *s) { menu_->add(s); }
- int changed() const { return inp_->changed() | fltk3::Widget::changed();}
- void clear_changed() {
- inp_->clear_changed();
- fltk3::Widget::clear_changed();
- }
- void set_changed() {
- inp_->set_changed();
- // no need to call fltk3::Widget::set_changed()
- }
- /** Removes all items from the menu. */
- void clear() { menu_->clear(); }
- /** Gets the box type of the menu button */
- fltk3::Boxtype down_box() const { return (menu_->down_box()); }
- /** Sets the box type of the menu button */
- void down_box(fltk3::Boxtype b) { menu_->down_box(b); }
- /** Gets the fltk3::MenuItem array used for the menu. */
- const fltk3::MenuItem *menu() { return (menu_->menu()); }
- /** Sets the fltk3::MenuItem array used for the menu. */
- void menu(const fltk3::MenuItem *m) { menu_->menu(m); }
- void resize(int X, int Y, int W, int H) {
- fltk3::Group::resize(X,Y,W,H);
- inp_->resize(inp_x(), inp_y(), inp_w(), inp_h());
- menu_->resize(menu_x(), menu_y(), menu_w(), menu_h());
- }
- /** Gets the encapsulated input text color attributes */
- fltk3::Color textcolor() const { return (inp_->textcolor());}
- /** Sets the encapsulated input text color attributes */
- void textcolor(fltk3::Color c) { inp_->textcolor(c);}
- /** Gets the encapsulated input text font attributes */
- fltk3::Font textfont() const { return (inp_->textfont());}
- /** Sets the encapsulated input text font attributes */
- void textfont(fltk3::Font f) { inp_->textfont(f);}
- /** Gets the encapsulated input size attributes */
- fltk3::Fontsize textsize() const { return (inp_->textsize()); }
- /** Sets the encapsulated input size attributes */
- void textsize(fltk3::Fontsize s) { inp_->textsize(s); }
- /** See void Fl_Input_Choice::value(const char *s) */
- const char* value() const { return (inp_->value()); }
- /**
- Sets or returns the input widget's current contents. The
- second form sets the contents using the index into the menu
- which you can set as an integer. Setting the value effectively
- 'chooses' this menu item, and sets it as the new input text,
- deleting the previous text.
- */
- void value(const char *val) { inp_->value(val); }
- /** See void Fl_Input_Choice::value(const char *s) */
- void value(int val) {
- menu_->value(val);
- inp_->value(menu_->text(val));
- }
- /** Returns a reference to the internal fltk3::MenuButton widget. */
- fltk3::MenuButton *menubutton() { return menu_; }
- /**
- Returns a reference to the internal fltk3::Input widget.</p>
- */
- fltk3::Input *input() { return inp_; }
-};
+}
#endif // !Fl_Input_Choice_H
Modified: branches/branch-3.0/fltk3/MultiBrowser.h
===================================================================
--- branches/branch-3.0/fltk3/MultiBrowser.h 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fltk3/MultiBrowser.h 2011-05-20 14:08:09 UTC (rev
8697)
@@ -48,11 +48,11 @@
/**
Creates a new Fl_Multi_Browser widget using the given
position, size, and label string. The default boxtype is fltk3::DOWN_BOX.
- The constructor specializes fltk3::Browser() by setting the type to
FL_MULTI_BROWSER.
+ The constructor specializes fltk3::Browser() by setting the type to
fltk3::MULTI_BROWSER.
The destructor destroys the widget and frees all memory that has been
allocated.
*/
Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0)
- : fltk3::Browser(X,Y,W,H,L) {type(FL_MULTI_BROWSER);}
+ : fltk3::Browser(X,Y,W,H,L) {type(fltk3::MULTI_BROWSER);}
};
#endif
Modified: branches/branch-3.0/fltk3/SelectBrowser.h
===================================================================
--- branches/branch-3.0/fltk3/SelectBrowser.h 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fltk3/SelectBrowser.h 2011-05-20 14:08:09 UTC (rev
8697)
@@ -26,32 +26,36 @@
//
/* \file
- Fl_Select_Browser widget . */
+ fltk3::SelectBrowser widget . */
#ifndef Fltk3_Select_Browser_H
#define Fltk3_Select_Browser_H
#include "Browser.h"
-/**
- The class is a subclass of fltk3::Browser
- which lets the user select a single item, or no items by clicking on
- the empty space. As long as the mouse button is held down on an
- unselected item it is highlighted. Normally the callback is done when the
- user presses the mouse, but you can change this with when().
- <P>See fltk3::Browser for methods to add and remove lines from the browser.
-*/
-class FLTK3_EXPORT Fl_Select_Browser : public fltk3::Browser {
-public:
- /**
- Creates a new Fl_Select_Browser widget using the given
- position, size, and label string. The default boxtype is fltk3::DOWN_BOX.
- The constructor specializes fltk3::Browser() by setting the type to
FL_SELECT_BROWSER.
- The destructor destroys the widget and frees all memory that has been
allocated.
- */
- Fl_Select_Browser(int X,int Y,int W,int H,const char *l=0)
- : fltk3::Browser(X,Y,W,H,l) {type(FL_SELECT_BROWSER);}
-};
+namespace fltk3 {
+
+ /**
+ The class is a subclass of fltk3::Browser
+ which lets the user select a single item, or no items by clicking on
+ the empty space. As long as the mouse button is held down on an
+ unselected item it is highlighted. Normally the callback is done when the
+ user presses the mouse, but you can change this with when().
+ <P>See fltk3::Browser for methods to add and remove lines from the browser.
+ */
+ class FLTK3_EXPORT SelectBrowser : public fltk3::Browser {
+ public:
+ /**
+ Creates a new fltk3::SelectBrowser widget using the given
+ position, size, and label string. The default boxtype is fltk3::DOWN_BOX.
+ The constructor specializes fltk3::Browser() by setting the type to
fltk3::SELECT_BROWSER.
+ The destructor destroys the widget and frees all memory that has been
allocated.
+ */
+ SelectBrowser(int X,int Y,int W,int H,const char *l=0)
+ : fltk3::Browser(X,Y,W,H,l) {type(fltk3::SELECT_BROWSER);}
+ };
+
+}
#endif
Modified: branches/branch-3.0/fluid/Fl_Menu_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -60,7 +60,7 @@
static char submenuflag;
void Fl_Input_Choice_Type::build_menu() {
- Fl_Input_Choice* w = (Fl_Input_Choice*)o;
+ fltk3::InputChoice* w = (fltk3::InputChoice*)o;
// count how many fltk3::MenuItem structures needed:
int n = 0;
Fl_Type* q;
@@ -537,7 +537,7 @@
void Fl_Input_Choice_Type::copy_properties() {
Fl_Widget_Type::copy_properties();
- Fl_Input_Choice *s = (Fl_Input_Choice*)o, *d = (Fl_Input_Choice*)live_widget;
+ fltk3::InputChoice *s = (fltk3::InputChoice*)o, *d =
(fltk3::InputChoice*)live_widget;
d->menu(s->menu());
d->down_box(s->down_box());
d->textcolor(s->textcolor());
@@ -547,7 +547,7 @@
Fl_Type* Fl_Input_Choice_Type::click_test(int, int) {
if (selected) return 0; // let user move the widget
- fltk3::Menu_* w = ((Fl_Input_Choice*)o)->menubutton();
+ fltk3::Menu_* w = ((fltk3::InputChoice*)o)->menubutton();
if (!menusize) return 0;
const fltk3::MenuItem* save = w->mvalue();
w->value((fltk3::MenuItem*)0);
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -224,7 +224,7 @@
Widget_Browser::Widget_Browser(int X,int Y,int W,int H,const char*l)
: fltk3::Browser_(X,Y,W,H,l) {
- type(FL_MULTI_BROWSER);
+ type(fltk3::MULTI_BROWSER);
fltk3::Widget::callback(Widget_Browser_callback);
when(fltk3::WHEN_RELEASE);
}
Modified: branches/branch-3.0/fluid/Fl_Type.h
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.h 2011-05-20 13:49:27 UTC (rev 8696)
+++ branches/branch-3.0/fluid/Fl_Type.h 2011-05-20 14:08:09 UTC (rev 8697)
@@ -744,7 +744,7 @@
#include <fltk3/InputChoice.h>
class Fl_Input_Choice_Type : public Fl_Menu_Type {
int textstuff(int w, fltk3::Font& f, int& s, fltk3::Color& c) {
- Fl_Input_Choice *myo = (Fl_Input_Choice*)(w==4 ?
((Fl_Widget_Type*)this->factory)->o : this->o);
+ fltk3::InputChoice *myo = (fltk3::InputChoice*)(w==4 ?
((Fl_Widget_Type*)this->factory)->o : this->o);
switch (w) {
case 4:
case 0: f = (fltk3::Font)myo->textfont(); s = myo->textsize(); c =
myo->textcolor(); break;
@@ -756,7 +756,7 @@
}
public:
virtual void ideal_size(int &w, int &h) {
- Fl_Input_Choice *myo = (Fl_Input_Choice *)o;
+ fltk3::InputChoice *myo = (fltk3::InputChoice *)o;
fltk3::font(myo->textfont(), myo->textsize());
h = fltk3::height() + myo->textsize() - 6;
w = o->w() - 20 - fltk3::box_dw(o->box());
@@ -765,11 +765,11 @@
if (h < 15) h = 15;
if (w < (15 + h)) w = 15 + h;
}
- virtual const char *type_name() {return "Fl_Input_Choice";}
+ virtual const char *type_name() {return "fltk3::InputChoice";}
virtual const char *alt_type_name() {return "fltk::ComboBox";}
virtual Fl_Type* click_test(int,int);
fltk3::Widget *widget(int X,int Y,int W,int H) {
- Fl_Input_Choice *myo = new Fl_Input_Choice(X,Y,W,H,"input choice:");
+ fltk3::InputChoice *myo = new fltk3::InputChoice(X,Y,W,H,"input choice:");
myo->menu(dummymenu);
myo->value("input");
return myo;
Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-20 13:49:27 UTC
(rev 8696)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-20 14:08:09 UTC
(rev 8697)
@@ -753,8 +753,8 @@
int n;
if (current_widget->is_button() && !current_widget->is_menu_item())
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 (!strcmp(current_widget->type_name(), "fltk3::InputChoice"))
+ n = ((fltk3::InputChoice*)(current_widget->o))->down_box();
else if (current_widget->is_menu_button())
n = ((fltk3::Menu_*)(current_widget->o))->down_box();
else {
@@ -776,9 +776,9 @@
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
((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")) {
+ } else if (!strcmp(o->type_name(), "fltk3::InputChoice")) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
- ((Fl_Input_Choice*)(q->o))->down_box((fltk3::Boxtype)n);
+ ((fltk3::InputChoice*)(q->o))->down_box((fltk3::Boxtype)n);
} else if (o->is_menu_button()) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
((fltk3::Menu_*)(q->o))->down_box((fltk3::Boxtype)n);
@@ -2258,8 +2258,8 @@
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);
- } else if (!strcmp(type_name(), "Fl_Input_Choice")) {
- Fl_Input_Choice* b = (Fl_Input_Choice*)o;
+ } else if (!strcmp(type_name(), "fltk3::InputChoice")) {
+ fltk3::InputChoice* b = (fltk3::InputChoice*)o;
if (b->down_box()) write_c("%s%s->down_box(FL_%s);\n", indent(), var,
boxname(b->down_box()));
} else if (is_menu_button()) {
@@ -2434,8 +2434,8 @@
write_string("down_box"); write_word(boxname(b->down_box()));}
if (b->shortcut()) write_string("shortcut 0x%x", b->shortcut());
if (b->value()) write_string("value 1");
- } else if (!strcmp(type_name(), "Fl_Input_Choice")) {
- Fl_Input_Choice* b = (Fl_Input_Choice*)o;
+ } else if (!strcmp(type_name(), "fltk3::InputChoice")) {
+ fltk3::InputChoice* b = (fltk3::InputChoice*)o;
if (b->down_box()) {
write_string("down_box"); write_word(boxname(b->down_box()));}
} else if (is_menu_button()) {
@@ -2546,11 +2546,11 @@
if (x == ZERO_ENTRY) x = 0;
((fltk3::Button*)o)->down_box((fltk3::Boxtype)x);
}
- } else if (!strcmp(type_name(), "Fl_Input_Choice") && !strcmp(c,"down_box"))
{
+ } else if (!strcmp(type_name(), "fltk3::InputChoice") &&
!strcmp(c,"down_box")) {
const char* value = read_word();
if ((x = boxnumber(value))) {
if (x == ZERO_ENTRY) x = 0;
- ((Fl_Input_Choice*)o)->down_box((fltk3::Boxtype)x);
+ ((fltk3::InputChoice*)o)->down_box((fltk3::Boxtype)x);
}
} else if (is_menu_button() && !strcmp(c,"down_box")) {
const char* value = read_word();
Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/fluid/factory.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -209,10 +209,10 @@
#include <fltk3/FileBrowser.h>
static fltk3::MenuItem browser_type_menu[] = {
- {"No Select",0,0,(void*)FL_NORMAL_BROWSER},
- {"Select",0,0,(void*)FL_SELECT_BROWSER},
- {"Hold",0,0,(void*)FL_HOLD_BROWSER},
- {"Multi",0,0,(void*)FL_MULTI_BROWSER},
+ {"No Select",0,0,(void*)fltk3::NORMAL_BROWSER},
+ {"Select",0,0,(void*)fltk3::SELECT_BROWSER},
+ {"Hold",0,0,(void*)fltk3::HOLD_BROWSER},
+ {"Multi",0,0,(void*)fltk3::MULTI_BROWSER},
{0}};
class fltk3::Browser_Type : public Fl_Widget_Type {
fltk3::MenuItem *subtypes() {return browser_type_menu;}
@@ -1249,9 +1249,9 @@
{"PUSH_BUTTON", fltk3::TOGGLE_BUTTON},
{"RADIO_BUTTON", fltk3::RADIO_BUTTON},
{"HIDDEN_BUTTON", fltk3::HIDDEN_BUTTON},
- {"SELECT_BROWSER", FL_SELECT_BROWSER},
- {"HOLD_BROWSER", FL_HOLD_BROWSER},
- {"MULTI_BROWSER", FL_MULTI_BROWSER},
+ {"SELECT_BROWSER", fltk3::SELECT_BROWSER},
+ {"HOLD_BROWSER", fltk3::HOLD_BROWSER},
+ {"MULTI_BROWSER", fltk3::MULTI_BROWSER},
{"SIMPLE_COUNTER", FL_SIMPLE_COUNTER},
{"LINE_DIAL", FL_LINE_DIAL},
{"FILL_DIAL", FL_FILL_DIAL},
Modified: branches/branch-3.0/fluid/function_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/function_panel.cxx 2011-05-20 13:49:27 UTC
(rev 8696)
+++ branches/branch-3.0/fluid/function_panel.cxx 2011-05-20 14:08:09 UTC
(rev 8697)
@@ -967,7 +967,7 @@
{ fltk3::Button* o = new fltk3::Button(425, 5, 24, 24);
o->tooltip("Input Choice");
o->box(fltk3::THIN_UP_BOX);
- o->callback((fltk3::Callback*)type_make_cb,
(void*)("Fl_Input_Choice"));
+ o->callback((fltk3::Callback*)type_make_cb,
(void*)("fltk3::InputChoice"));
o->image(pixmap[15]);
} // fltk3::Button* o
{ fltk3::Button* o = new fltk3::Button(400, 30, 24, 24);
Modified: branches/branch-3.0/src/Fl_Browser_.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Browser_.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/src/Fl_Browser_.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -612,7 +612,7 @@
\returns 1 if state was changed, 0 if not.
*/
int fltk3::Browser_::select(void* item, int val, int docallbacks) {
- if (type() == FL_MULTI_BROWSER) {
+ if (type() == fltk3::MULTI_BROWSER) {
if (selection_ != item) {
if (selection_) redraw_line(selection_);
selection_ = item;
@@ -654,7 +654,7 @@
If 0, doesn't do callback (default).
*/
int fltk3::Browser_::deselect(int docallbacks) {
- if (type() == FL_MULTI_BROWSER) {
+ if (type() == fltk3::MULTI_BROWSER) {
int change = 0;
for (void* p = item_first(); p; p = item_next(p))
change |= select(p, 0, docallbacks);
@@ -679,7 +679,7 @@
if (!item) return deselect(docallbacks);
int change = 0;
fltk3::WidgetTracker wp(this);
- if (type() == FL_MULTI_BROWSER) {
+ if (type() == fltk3::MULTI_BROWSER) {
for (void* p = item_first(); p; p = item_next(p)) {
if (p != item) change |= select(p, 0, docallbacks);
if (wp.deleted()) return change;
@@ -713,11 +713,11 @@
// must do shortcuts first or the scrollbar will get them...
if (event == fltk3::ENTER || event == fltk3::LEAVE) return 1;
- if (event == fltk3::KEYBOARD && type() >= FL_HOLD_BROWSER) {
+ if (event == fltk3::KEYBOARD && type() >= fltk3::HOLD_BROWSER) {
void* l1 = selection_;
void* l = l1; if (!l) l = top_; if (!l) l = item_first();
if (l) {
- if (type()==FL_HOLD_BROWSER) {
+ if (type()==fltk3::HOLD_BROWSER) {
switch (fltk3::event_key()) {
case fltk3::DownKey:
while ((l = item_next(l)))
@@ -807,9 +807,9 @@
}
my = py = fltk3::event_y();
change = 0;
- if (type() == FL_NORMAL_BROWSER || !top_)
+ if (type() == fltk3::NORMAL_BROWSER || !top_)
;
- else if (type() != FL_MULTI_BROWSER) {
+ else if (type() != fltk3::MULTI_BROWSER) {
change = select_only(find_item(my), 0);
if (wp.deleted()) return 1;
if (change && (when() & fltk3::WHEN_CHANGED)) {
@@ -885,9 +885,9 @@
if (p<0) p = 0;
position(p);
}
- if (type() == FL_NORMAL_BROWSER || !top_)
+ if (type() == fltk3::NORMAL_BROWSER || !top_)
;
- else if (type() == FL_MULTI_BROWSER) {
+ else if (type() == fltk3::MULTI_BROWSER) {
void* l = find_item(my);
void* t; void* b; // this will be the range to change
if (my > py) { // go down
@@ -921,7 +921,7 @@
py = my;
return 1;
case fltk3::RELEASE:
- if (type() == FL_SELECT_BROWSER) {
+ if (type() == fltk3::SELECT_BROWSER) {
void* t = selection_;
deselect();
if (wp.deleted()) return 1;
@@ -943,7 +943,7 @@
return 1;
case fltk3::FOCUS:
case fltk3::UNFOCUS:
- if (type() >= FL_HOLD_BROWSER && fltk3::visible_focus()) {
+ if (type() >= fltk3::HOLD_BROWSER && fltk3::visible_focus()) {
redraw();
return 1;
} else return 0;
@@ -989,8 +989,8 @@
/**
Sort the items in the browser based on \p flags.
item_swap(void*, void*) and item_text(void*) must be implemented for this
call.
- \param[in] flags FL_SORT_ASCENDING -- sort in ascending order\n
- FL_SORT_DESCENDING -- sort in descending order\n
+ \param[in] flags fltk3::SORT_ASCENDING -- sort in ascending order\n
+ fltk3::SORT_DESCENDING -- sort in descending order\n
Values other than the above will cause undefined behavior\n
Other flags may appear in the future.
\todo Add a flag to ignore case
@@ -999,7 +999,7 @@
//
// Simple bubble sort - pure lazyness on my side.
//
- int i, j, n = -1, desc = ((flags&FL_SORT_DESCENDING)==FL_SORT_DESCENDING);
+ int i, j, n = -1, desc =
((flags&fltk3::SORT_DESCENDING)==fltk3::SORT_DESCENDING);
void *a =item_first(), *b, *c;
if (!a) return;
while (a) {
Modified: branches/branch-3.0/src/Fl_Check_Browser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Check_Browser.cxx 2011-05-20 13:49:27 UTC
(rev 8696)
+++ branches/branch-3.0/src/Fl_Check_Browser.cxx 2011-05-20 14:08:09 UTC
(rev 8697)
@@ -87,7 +87,7 @@
Fl_Check_Browser::Fl_Check_Browser(int X, int Y, int W, int H, const char *l)
/** The constructor makes an empty browser.*/
: fltk3::Browser_(X, Y, W, H, l) {
- type(FL_SELECT_BROWSER);
+ type(fltk3::SELECT_BROWSER);
when(fltk3::WHEN_NEVER);
first = last = 0;
nitems_ = nchecked_ = 0;
Modified: branches/branch-3.0/src/Fl_File_Chooser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Chooser.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/src/Fl_File_Chooser.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -441,9 +441,9 @@
void Fl_File_Chooser::type(int t) {
type_ = t;
if (t & MULTI)
- fileList->type(FL_MULTI_BROWSER);
+ fileList->type(fltk3::MULTI_BROWSER);
else
- fileList->type(FL_HOLD_BROWSER);
+ fileList->type(fltk3::HOLD_BROWSER);
if (t & CREATE)
newButton->activate();
else
Modified: branches/branch-3.0/test/boxtype.cxx
===================================================================
--- branches/branch-3.0/test/boxtype.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/test/boxtype.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <fltk3/run.h>
-#include <fltk3/Double_Window.h>
+#include <fltk3/DoubleWindow.h>
#include <fltk3/Box.h>
int N = 0;
@@ -36,87 +36,87 @@
#define H 50
#define ROWS 14
-Fl_Double_Window *window;
+fltk3::DoubleWindow *window;
-void bt(const char *name, Fl_Boxtype type, int square=0) {
+void bt(const char *name, fltk3::Boxtype type, int square=0) {
int x = N%4;
int y = N/4;
N++;
x = x*W+10;
y = y*H+10;
- Fl_Box *b = new Fl_Box(type,x,y,square ? H-20 : W-20,H-20,name);
+ fltk3::Box *b = new fltk3::Box(type,x,y,square ? H-20 : W-20,H-20,name);
b->labelsize(11);
- if (square) b->align(FL_ALIGN_RIGHT);
+ if (square) b->align(fltk3::ALIGN_RIGHT);
}
int main(int argc, char ** argv) {
- window = new Fl_Double_Window(4*W,ROWS*H);
- window->box(FL_FLAT_BOX);
+ window = new fltk3::DoubleWindow(4*W,ROWS*H);
+ window->box(fltk3::FLAT_BOX);
#if 0 // this code uses the command line arguments to set arbitrary color
schemes
- Fl::args(argc, argv);
- Fl::get_system_colors();
+ fltk3::args(argc, argv);
+ fltk3::get_system_colors();
#elif 0 // this code uses a single color to define a scheme
- Fl::args(argc, argv);
- Fl::get_system_colors();
- Fl::background(113,113,198);
+ fltk3::args(argc, argv);
+ fltk3::get_system_colors();
+ fltk3::background(113,113,198);
#else // this code uses the nice bright blue background to show box vs. frame
types
- Fl::args(argc, argv);
- Fl::get_system_colors();
+ fltk3::args(argc, argv);
+ fltk3::get_system_colors();
window->color(12);// light blue
#endif
- bt("FL_NO_BOX",FL_NO_BOX);
- bt("FL_FLAT_BOX",FL_FLAT_BOX);
+ bt("fltk3::NO_BOX",fltk3::NO_BOX);
+ bt("fltk3::FLAT_BOX",fltk3::FLAT_BOX);
N += 2; // go to start of next row to line up boxes & frames
- bt("FL_UP_BOX",FL_UP_BOX);
- bt("FL_DOWN_BOX",FL_DOWN_BOX);
- bt("FL_UP_FRAME",FL_UP_FRAME);
- bt("FL_DOWN_FRAME",FL_DOWN_FRAME);
- bt("FL_THIN_UP_BOX",FL_THIN_UP_BOX);
- bt("FL_THIN_DOWN_BOX",FL_THIN_DOWN_BOX);
- bt("FL_THIN_UP_FRAME",FL_THIN_UP_FRAME);
- bt("FL_THIN_DOWN_FRAME",FL_THIN_DOWN_FRAME);
- bt("FL_ENGRAVED_BOX",FL_ENGRAVED_BOX);
- bt("FL_EMBOSSED_BOX",FL_EMBOSSED_BOX);
- bt("FL_ENGRAVED_FRAME",FL_ENGRAVED_FRAME);
- bt("FL_EMBOSSED_FRAME",FL_EMBOSSED_FRAME);
- bt("FL_BORDER_BOX",FL_BORDER_BOX);
- bt("FL_SHADOW_BOX",FL_SHADOW_BOX);
- bt("FL_BORDER_FRAME",FL_BORDER_FRAME);
- bt("FL_SHADOW_FRAME",FL_SHADOW_FRAME);
- bt("FL_ROUNDED_BOX",FL_ROUNDED_BOX);
- bt("FL_RSHADOW_BOX",FL_RSHADOW_BOX);
- bt("FL_ROUNDED_FRAME",FL_ROUNDED_FRAME);
- bt("FL_RFLAT_BOX",FL_RFLAT_BOX);
- bt("FL_OVAL_BOX",FL_OVAL_BOX);
- bt("FL_OSHADOW_BOX",FL_OSHADOW_BOX);
- bt("FL_OVAL_FRAME",FL_OVAL_FRAME);
- bt("FL_OFLAT_BOX",FL_OFLAT_BOX);
- bt("FL_ROUND_UP_BOX",FL_ROUND_UP_BOX);
- bt("FL_ROUND_DOWN_BOX",FL_ROUND_DOWN_BOX);
- bt("FL_DIAMOND_UP_BOX",FL_DIAMOND_UP_BOX);
- bt("FL_DIAMOND_DOWN_BOX",FL_DIAMOND_DOWN_BOX);
+ bt("fltk3::UP_BOX",fltk3::UP_BOX);
+ bt("fltk3::DOWN_BOX",fltk3::DOWN_BOX);
+ bt("fltk3::UP_FRAME",fltk3::UP_FRAME);
+ bt("fltk3::DOWN_FRAME",fltk3::DOWN_FRAME);
+ bt("fltk3::THIN_UP_BOX",fltk3::THIN_UP_BOX);
+ bt("fltk3::THIN_DOWN_BOX",fltk3::THIN_DOWN_BOX);
+ bt("fltk3::THIN_UP_FRAME",fltk3::THIN_UP_FRAME);
+ bt("fltk3::THIN_DOWN_FRAME",fltk3::THIN_DOWN_FRAME);
+ bt("fltk3::ENGRAVED_BOX",fltk3::ENGRAVED_BOX);
+ bt("fltk3::EMBOSSED_BOX",fltk3::EMBOSSED_BOX);
+ bt("fltk3::ENGRAVED_FRAME",fltk3::ENGRAVED_FRAME);
+ bt("fltk3::EMBOSSED_FRAME",fltk3::EMBOSSED_FRAME);
+ bt("fltk3::BORDER_BOX",fltk3::BORDER_BOX);
+ bt("fltk3::SHADOW_BOX",fltk3::SHADOW_BOX);
+ bt("fltk3::BORDER_FRAME",fltk3::BORDER_FRAME);
+ bt("fltk3::SHADOW_FRAME",fltk3::SHADOW_FRAME);
+ bt("fltk3::ROUNDED_BOX",fltk3::ROUNDED_BOX);
+ bt("fltk3::RSHADOW_BOX",fltk3::RSHADOW_BOX);
+ bt("fltk3::ROUNDED_FRAME",fltk3::ROUNDED_FRAME);
+ bt("fltk3::RFLAT_BOX",fltk3::RFLAT_BOX);
+ bt("fltk3::OVAL_BOX",fltk3::OVAL_BOX);
+ bt("fltk3::OSHADOW_BOX",fltk3::OSHADOW_BOX);
+ bt("fltk3::OVAL_FRAME",fltk3::OVAL_FRAME);
+ bt("fltk3::OFLAT_BOX",fltk3::OFLAT_BOX);
+ bt("fltk3::ROUND_UP_BOX",fltk3::ROUND_UP_BOX);
+ bt("fltk3::ROUND_DOWN_BOX",fltk3::ROUND_DOWN_BOX);
+ bt("fltk3::DIAMOND_UP_BOX",fltk3::DIAMOND_UP_BOX);
+ bt("fltk3::DIAMOND_DOWN_BOX",fltk3::DIAMOND_DOWN_BOX);
- bt("FL_PLASTIC_UP_BOX",FL_PLASTIC_UP_BOX);
- bt("FL_PLASTIC_DOWN_BOX",FL_PLASTIC_DOWN_BOX);
- bt("FL_PLASTIC_UP_FRAME",FL_PLASTIC_UP_FRAME);
- bt("FL_PLASTIC_DOWN_FRAME",FL_PLASTIC_DOWN_FRAME);
- bt("FL_PLASTIC_THIN_UP_BOX",FL_PLASTIC_THIN_UP_BOX);
- bt("FL_PLASTIC_THIN_DOWN_BOX",FL_PLASTIC_THIN_DOWN_BOX);
+ bt("fltk3::PLASTIC_UP_BOX",fltk3::PLASTIC_UP_BOX);
+ bt("fltk3::PLASTIC_DOWN_BOX",fltk3::PLASTIC_DOWN_BOX);
+ bt("fltk3::PLASTIC_UP_FRAME",fltk3::PLASTIC_UP_FRAME);
+ bt("fltk3::PLASTIC_DOWN_FRAME",fltk3::PLASTIC_DOWN_FRAME);
+ bt("fltk3::PLASTIC_THIN_UP_BOX",fltk3::PLASTIC_THIN_UP_BOX);
+ bt("fltk3::PLASTIC_THIN_DOWN_BOX",fltk3::PLASTIC_THIN_DOWN_BOX);
N += 2;
- bt("FL_PLASTIC_ROUND_UP_BOX",FL_PLASTIC_ROUND_UP_BOX);
- bt("FL_PLASTIC_ROUND_DOWN_BOX",FL_PLASTIC_ROUND_DOWN_BOX);
+ bt("fltk3::PLASTIC_ROUND_UP_BOX",fltk3::PLASTIC_ROUND_UP_BOX);
+ bt("fltk3::PLASTIC_ROUND_DOWN_BOX",fltk3::PLASTIC_ROUND_DOWN_BOX);
N += 2;
- bt("FL_GTK_UP_BOX",FL_GTK_UP_BOX);
- bt("FL_GTK_DOWN_BOX",FL_GTK_DOWN_BOX);
- bt("FL_GTK_UP_FRAME",FL_GTK_UP_FRAME);
- bt("FL_GTK_DOWN_FRAME",FL_GTK_DOWN_FRAME);
- bt("FL_GTK_THIN_UP_BOX",FL_GTK_THIN_UP_BOX);
- bt("FL_GTK_THIN_DOWN_BOX",FL_GTK_THIN_DOWN_BOX);
- bt("FL_GTK_THIN_UP_FRAME",FL_GTK_THIN_UP_FRAME);
- bt("FL_GTK_THIN_DOWN_FRAME",FL_GTK_THIN_DOWN_FRAME);
- bt("FL_GTK_ROUND_UP_BOX",FL_GTK_ROUND_UP_BOX);
- bt("FL_GTK_ROUND_DOWN_BOX",FL_GTK_ROUND_DOWN_BOX);
+ bt("fltk3::GTK_UP_BOX",fltk3::GTK_UP_BOX);
+ bt("fltk3::GTK_DOWN_BOX",fltk3::GTK_DOWN_BOX);
+ bt("fltk3::GTK_UP_FRAME",fltk3::GTK_UP_FRAME);
+ bt("fltk3::GTK_DOWN_FRAME",fltk3::GTK_DOWN_FRAME);
+ bt("fltk3::GTK_THIN_UP_BOX",fltk3::GTK_THIN_UP_BOX);
+ bt("fltk3::GTK_THIN_DOWN_BOX",fltk3::GTK_THIN_DOWN_BOX);
+ bt("fltk3::GTK_THIN_UP_FRAME",fltk3::GTK_THIN_UP_FRAME);
+ bt("fltk3::GTK_THIN_DOWN_FRAME",fltk3::GTK_THIN_DOWN_FRAME);
+ bt("fltk3::GTK_ROUND_UP_BOX",fltk3::GTK_ROUND_UP_BOX);
+ bt("fltk3::GTK_ROUND_DOWN_BOX",fltk3::GTK_ROUND_DOWN_BOX);
window->resizable(window);
window->end();
window->show();
Modified: branches/branch-3.0/test/browser.cxx
===================================================================
--- branches/branch-3.0/test/browser.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/test/browser.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -55,25 +55,25 @@
@C4Blue
You should try different browser types:
- Fl_Browser
- Fl_Select_Browser
- Fl_Hold_Browser
- Fl_Multi_Browser
+ fltk3::Browser
+ fltk3::Select_Browser
+ fltk3::Hold_Browser
+ fltk3::Multi_Browser
*/
#include <fltk3/run.h>
-#include <fltk3/Select_Browser.h>
-#include <fltk3/Double_Window.h>
+#include <fltk3/SelectBrowser.h>
+#include <fltk3/DoubleWindow.h>
#include <fltk3/Button.h>
-#include <fltk3/Int_Input.h>
+#include <fltk3/IntInput.h>
#include <fltk3/ask.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-Fl_Select_Browser *browser;
-Fl_Button *top,
+fltk3::SelectBrowser *browser;
+fltk3::Button *top,
*bottom,
*middle,
*visible,
@@ -81,16 +81,16 @@
*sort;
fltk3::IntInput *field;
-void b_cb(Fl_Widget* o, void*) {
+void b_cb(fltk3::Widget* o, void*) {
printf("callback, selection = %d, event_clicks = %d\n",
- ((Fl_Browser*)o)->value(), Fl::event_clicks());
+ ((fltk3::Browser*)o)->value(), fltk3::event_clicks());
}
-void show_cb(Fl_Widget *o, void *) {
+void show_cb(fltk3::Widget *o, void *) {
int line = atoi(field->value());
if (!line) {
- fl_alert("Please enter a number in the text field\n"
+ fltk3::alert("Please enter a number in the text field\n"
"before clicking on the buttons.");
return;
}
@@ -105,7 +105,7 @@
browser->make_visible(line);
}
-void swap_cb(Fl_Widget *, void *) {
+void swap_cb(fltk3::Widget *, void *) {
int a = -1, b = -1;
for ( int t=0; t<browser->size(); t++ ) { // find two selected items
if ( browser->selected(t) ) {
@@ -118,22 +118,22 @@
browser->swap(a, b); // swap them
}
-void sort_cb(Fl_Widget *, void *) {
- browser->sort(FL_SORT_ASCENDING);
+void sort_cb(fltk3::Widget *, void *) {
+ browser->sort(fltk3::SORT_ASCENDING);
}
int main(int argc, char **argv) {
int i;
- if (!Fl::args(argc,argv,i)) Fl::fatal(Fl::help);
+ if (!fltk3::args(argc,argv,i)) fltk3::fatal(fltk3::help);
const char* fname = (i < argc) ? argv[i] : "browser.cxx";
- Fl_Double_Window window(480,400,fname);
- browser = new Fl_Select_Browser(0,0,480,350,0);
- browser->type(FL_MULTI_BROWSER);
- //browser->type(FL_HOLD_BROWSER);
+ fltk3::DoubleWindow window(480,400,fname);
+ browser = new fltk3::SelectBrowser(0,0,480,350,0);
+ browser->type(fltk3::MULTI_BROWSER);
+ //browser->type(fltk3::HOLD_BROWSER);
//browser->color(42);
browser->callback(b_cb);
// browser->scrollbar_right();
- //browser->has_scrollbar(Fl_Browser::BOTH_ALWAYS);
+ //browser->has_scrollbar(fltk3::Browser::BOTH_ALWAYS);
if (!browser->load(fname)) {
int done = 0;
#ifdef _MSC_VER
@@ -158,7 +158,7 @@
#endif
if ( !done )
{
- fl_message("Can't load %s, %s\n", fname, strerror(errno));
+ fltk3::message("Can't load %s, %s\n", fname, strerror(errno));
exit(1);
}
}
@@ -167,23 +167,23 @@
field = new fltk3::IntInput(50, 350, 430, 25, "Line #:");
field->callback(show_cb);
- top = new Fl_Button(0, 375, 80, 25, "Top");
+ top = new fltk3::Button(0, 375, 80, 25, "Top");
top->callback(show_cb);
- bottom = new Fl_Button(80, 375, 80, 25, "Bottom");
+ bottom = new fltk3::Button(80, 375, 80, 25, "Bottom");
bottom->callback(show_cb);
- middle = new Fl_Button(160, 375, 80, 25, "Middle");
+ middle = new fltk3::Button(160, 375, 80, 25, "Middle");
middle->callback(show_cb);
- visible = new Fl_Button(240, 375, 80, 25, "Make Vis.");
+ visible = new fltk3::Button(240, 375, 80, 25, "Make Vis.");
visible->callback(show_cb);
- swap = new Fl_Button(320, 375, 80, 25, "Swap");
+ swap = new fltk3::Button(320, 375, 80, 25, "Swap");
swap->callback(swap_cb);
swap->tooltip("Swaps two selected lines\n(Use CTRL-click to select two
lines)");
- sort = new Fl_Button(400, 375, 80, 25, "Sort");
+ sort = new fltk3::Button(400, 375, 80, 25, "Sort");
sort->callback(sort_cb);
window.resizable(browser);
Modified: branches/branch-3.0/test/forms.cxx
===================================================================
--- branches/branch-3.0/test/forms.cxx 2011-05-20 13:49:27 UTC (rev 8696)
+++ branches/branch-3.0/test/forms.cxx 2011-05-20 14:08:09 UTC (rev 8697)
@@ -153,7 +153,7 @@
tobj[15]=obj=fl_add_choice (FL_NORMAL_CHOICE, 580, 250, 110, 30, "Choice");
tobj[16]=obj=fl_add_timer (FL_VALUE_TIMER, 580, 210, 110, 30, "Timer");
//fl_set_object_dblbuffer(tobj[16], 1); // removed for fltk
- tobj[17]=obj=fl_add_browser (FL_NORMAL_BROWSER,450,300,240, 180, "Browser");
+ tobj[17]=obj=fl_add_browser (fltk3::NORMAL_BROWSER,450,300,240, 180,
"Browser");
exitob=obj= fl_add_button (FL_NORMAL_BUTTON, 590, 30, 100, 30, "Exit");
btypeob=obj= fl_add_choice (FL_NORMAL_CHOICE,110,30, 130, 30, "Boxtype");
fl_set_object_callback (obj, boxtype_cb, 0);
Modified: branches/branch-3.0/test/input_choice.cxx
===================================================================
--- branches/branch-3.0/test/input_choice.cxx 2011-05-20 13:49:27 UTC (rev
8696)
+++ branches/branch-3.0/test/input_choice.cxx 2011-05-20 14:08:09 UTC (rev
8697)
@@ -1,7 +1,7 @@
//
// "$Id$"
//
-// Test program for Fl_Input_Choice
+// Test program for fltk3::Input_Choice
//
// Copyright 1998-2010 by Bill Spitzak and others.
//
@@ -23,11 +23,11 @@
#include <stdio.h>
#include <fltk3/Button.h>
-#include <fltk3/Double_Window.h>
-#include <fltk3/Input_Choice.h>
+#include <fltk3/DoubleWindow.h>
+#include <fltk3/InputChoice.h>
-void buttcb(Fl_Widget*,void*data) {
- Fl_Input_Choice *in=(Fl_Input_Choice *)data;
+void buttcb(fltk3::Widget*,void*data) {
+ fltk3::InputChoice *in=(fltk3::InputChoice *)data;
static int flag = 1;
flag ^= 1;
if ( flag ) in->activate();
@@ -38,22 +38,22 @@
}
}
-void input_choice_cb(Fl_Widget*,void*data) {
- Fl_Input_Choice *in=(Fl_Input_Choice *)data;
+void input_choice_cb(fltk3::Widget*,void*data) {
+ fltk3::InputChoice *in=(fltk3::InputChoice *)data;
fprintf(stderr, "Value='%s'\n", (const char*)in->value());
}
int main(int argc, char **argv) {
- Fl_Double_Window win(300, 200);
+ fltk3::DoubleWindow win(300, 200);
- Fl_Input_Choice in(40,40,100,28,"Test");
+ fltk3::InputChoice in(40,40,100,28,"Test");
in.callback(input_choice_cb, (void*)&in);
in.add("one");
in.add("two");
in.add("three");
in.value(1);
- Fl_Button onoff(40,150,200,28,"Activate/Deactivate");
+ fltk3::Button onoff(40,150,200,28,"Activate/Deactivate");
onoff.callback(buttcb, (void*)&in);
win.end();
Modified: branches/branch-3.0/test/unittest_scrollbarsize.cxx
===================================================================
--- branches/branch-3.0/test/unittest_scrollbarsize.cxx 2011-05-20 13:49:27 UTC
(rev 8696)
+++ branches/branch-3.0/test/unittest_scrollbarsize.cxx 2011-05-20 14:08:09 UTC
(rev 8697)
@@ -39,7 +39,7 @@
Fl_Browser *makebrowser(int X,int Y,int W,int H,const char*L=0) {
Fl_Browser *b = new Fl_Browser(X,Y,W,H,L);
- b->type(FL_MULTI_BROWSER);
+ b->type(fltk3::MULTI_BROWSER);
b->align(FL_ALIGN_TOP);
b->add("Papa"); b->add("Delta"); b->add("Hotel");
b->add("Long entry will show h-bar");
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
