Author: matt Date: 2010-04-01 12:40:22 -0700 (Thu, 01 Apr 2010) New Revision: 7394 Log: Ported Fl_Radio_Button and Fl_Round_Button.
Added: branches/branch-3.0/fltk3/CheckButton.h branches/branch-3.0/fltk3/LightButton.h branches/branch-3.0/fltk3/RadioButton.h branches/branch-3.0/fltk3/RoundButton.h Removed: branches/branch-3.0/fltk3/Fl_Check_Button.H branches/branch-3.0/fltk3/Fl_Light_Button.H branches/branch-3.0/fltk3/Fl_Repeat_Button.H branches/branch-3.0/fltk3/Fl_Return_Button.H branches/branch-3.0/fltk3/Fl_Round_Button.H Modified: branches/branch-3.0/FL/Fl_Check_Button.H branches/branch-3.0/FL/Fl_Light_Button.H branches/branch-3.0/FL/Fl_Radio_Button.H branches/branch-3.0/FL/Fl_Round_Button.H branches/branch-3.0/fltk/CheckButton.h branches/branch-3.0/fltk/LightButton.h branches/branch-3.0/fltk/RadioButton.h branches/branch-3.0/fltk3/Fl_File_Chooser.H branches/branch-3.0/fltk3/Fl_Native_File_Chooser_FLTK.H branches/branch-3.0/fltk3/Fl_Radio_Button.H branches/branch-3.0/fltk3/Fl_Radio_Light_Button.H branches/branch-3.0/fltk3/Fl_Radio_Round_Button.H branches/branch-3.0/fltk3/Fl_Toggle_Light_Button.H branches/branch-3.0/fltk3/Fl_Toggle_Round_Button.H branches/branch-3.0/fltk3/forms.H branches/branch-3.0/src/Fl_Button.cxx branches/branch-3.0/src/Fl_Check_Button.cxx branches/branch-3.0/src/Fl_File_Chooser.cxx branches/branch-3.0/src/Fl_Light_Button.cxx branches/branch-3.0/src/Fl_Native_File_Chooser_FLTK.cxx branches/branch-3.0/src/Fl_Round_Button.cxx branches/branch-3.0/src/print_panel.cxx branches/branch-3.0/src/print_panel.h branches/branch-3.0/test/buttons.cxx branches/branch-3.0/test/buttons1.cxx branches/branch-3.0/test/buttons2.cxx Modified: branches/branch-3.0/FL/Fl_Check_Button.H =================================================================== --- branches/branch-3.0/FL/Fl_Check_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/FL/Fl_Check_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,56 +1,20 @@ // // "$Id$" // -// Check button header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2009 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// -/* \file - Fl_Check_Button widget . */ - #ifndef Fl_Check_Button_H #define Fl_Check_Button_H +#include <fltk3/CheckButton.h> + #include "Fl_Light_Button.H" -/** - \class Fl_Check_Button - \brief A button with an "checkmark" to show its status. - - \image html Fl_Check_Button.gif - \image latex Fl_Check_Button.eps "Fl_Check_Button" width=4cm - Buttons generate callbacks when they are clicked by the user. You control - exactly when and how by changing the values for type() and when(). - - The Fl_Check_Button subclass displays its "ON" state by showing a "checkmark" - rather than drawing itself pushed in. - - \todo Refactor Fl_Check_Button doxygen comments (add color() info etc?) - \todo Generate Fl_Check_Button.gif with visible checkmark. - */ class FL_EXPORT Fl_Check_Button : public Fl_Light_Button { public: - Fl_Check_Button(int X, int Y, int W, int H, const char *L = 0); + Fl_Check_Button(int X, int Y, int W, int H, const char *L = 0) { + _p = new fltk3::CheckButton(X, Y, W, H, L); + _p->wrapper(this); + } }; #endif Modified: branches/branch-3.0/FL/Fl_Light_Button.H =================================================================== --- branches/branch-3.0/FL/Fl_Light_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/FL/Fl_Light_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,55 +1,24 @@ // // "$Id$" // -// Lighted button header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2009 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// -/* \file - Fl_Light_Button widget . */ +#ifndef Fltk1_Light_Button_H +#define Fltk1_Light_Button_H -#ifndef Fl_Light_Button_H -#define Fl_Light_Button_H +#include <fltk3/LightButton.h> #include "Fl_Button.H" -/** - <P>This subclass displays the "on" state by turning on a light, - rather than drawing pushed in. The shape of the "light" - is initially set to FL_DOWN_BOX. The color of the light when - on is controlled with selection_color(), which defaults to FL_YELLOW. - - Buttons generate callbacks when they are clicked by the user. You - control exactly when and how by changing the values for type() and when(). - <P ALIGN=CENTER>\image html Fl_Light_Button.gif</P> - \image latex Fl_Light_Button.eps "Fl_Light_Button" width=4cm -*/ class FL_EXPORT Fl_Light_Button : public Fl_Button { protected: - virtual void draw(); + Fl_Light_Button() {} + // fltk123: virtual void draw(); public: - virtual int handle(int); - Fl_Light_Button(int x,int y,int w,int h,const char *l = 0); + // fltk123: virtual int handle(int); + Fl_Light_Button(int x,int y,int w,int h,const char *l = 0) { + _p = new fltk3::LightButton(x, y, w, h, l); + _p->wrapper(this); + } }; #endif Modified: branches/branch-3.0/FL/Fl_Radio_Button.H =================================================================== --- branches/branch-3.0/FL/Fl_Radio_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/FL/Fl_Radio_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,42 +1,25 @@ // // "$Id$" // -// Radio button header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2009 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// /* \file Fl_Radio_Button widget . */ -#ifndef Fl_Radio_Button_H -#define Fl_Radio_Button_H +#ifndef Fltk1_Radio_Button_H +#define Fltk1_Radio_Button_H +#include <fltk3/RadioButton.h> + #include "Fl_Button.H" class Fl_Radio_Button : public Fl_Button { +protected: + Fl_Radio_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);} + Fl_Radio_Button(int x,int y,int w,int h,const char *l=0) { + _p = new fltk3::RadioButton(x, y, w, h, l); + _p->wraper(this); + } }; #endif Modified: branches/branch-3.0/FL/Fl_Round_Button.H =================================================================== --- branches/branch-3.0/FL/Fl_Round_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/FL/Fl_Round_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,53 +1,22 @@ // // "$Id$" // -// Round button header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2009 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// -/* \file - Fl_Round_Button widget . */ +#ifndef Fltk1_Round_Button_H +#define Fltk1_Round_Button_H -#ifndef Fl_Round_Button_H -#define Fl_Round_Button_H +#include <fltk3/RoundButton.h> #include "Fl_Light_Button.H" -/** - Buttons generate callbacks when they are clicked by the user. You - control exactly when and how by changing the values for type() - and when(). - <P ALIGN=CENTER>\image html Fl_Round_Button.gif</P> - \image latex Fl_Round_Button.eps " Fl_Round_Button" width=4cm - <P>The Fl_Round_Button subclass display the "on" state by - turning on a light, rather than drawing pushed in. The shape of the - "light" is initially set to FL_ROUND_DOWN_BOX. The color of the light - when on is controlled with selection_color(), which defaults to - FL_RED. -*/ class FL_EXPORT Fl_Round_Button : public Fl_Light_Button { +protected: + Fl_Round_Button() {} public: - Fl_Round_Button(int x,int y,int w,int h,const char *l = 0); + Fl_Round_Button(int x,int y,int w,int h,const char *l = 0) { + _p = new fltk3::RoundButton(x, y, w, h, l); + _p->wrapper(this); + } }; #endif Modified: branches/branch-3.0/fltk/CheckButton.h =================================================================== --- branches/branch-3.0/fltk/CheckButton.h 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk/CheckButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,40 +1,26 @@ // // "$Id: CheckButton.h 4910 2006-04-06 19:26:22Z fabien $" // -// Button with a checkmark to the left of it. -// -// Copyright 2002 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems to "[email protected]". #ifndef fltk_CheckButton_h #define fltk_CheckButton_h +#include <fltk3/CheckButton.h> + #include "Button.h" namespace fltk { class FL_API CheckButton : public Button { +protected: + CheckButton() {} public: - CheckButton(int x,int y,int w,int h,const char *l = 0); - static NamedStyle* default_style; - - virtual void draw(); + CheckButton(int x,int y,int w,int h,const char *l = 0) { + _p = new fltk3::CheckButton(x, y, w, h, l); + _p->wrapper(this); + } + // fltk123: static NamedStyle* default_style; + // fltk123: virtual void draw(); }; } Modified: branches/branch-3.0/fltk/LightButton.h =================================================================== --- branches/branch-3.0/fltk/LightButton.h 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk/LightButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,40 +1,26 @@ // // "$Id: LightButton.h 4886 2006-03-30 09:55:32Z fabien $" // -// Forms/XForms/Flame style button with indicator light on left -// -// Copyright 1998-2006 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems to "[email protected]". -// -#ifndef fltk_Light_Button_h -#define fltk_Light_Button_h +#ifndef fltk2_Light_Button_h +#define fltk2_Light_Button_h +#include <fltk3/CheckButton.h> + #include "CheckButton.h" namespace fltk { class FL_API LightButton : public CheckButton { +protected: + LightButton() {} public: - LightButton(int x,int y,int w,int h,const char *l = 0); - static NamedStyle* default_style; - static void default_glyph(const Widget*, int, int,int,int,int, Flags); + LightButton(int x,int y,int w,int h,const char *l = 0) { + _p = new fltk3::LightButton(x, y, w, h, l); + _p->wrapper(this); + } + // fltk123: static NamedStyle* default_style; + // fltk123: static void default_glyph(const Widget*, int, int,int,int,int, Flags); }; } Modified: branches/branch-3.0/fltk/RadioButton.h =================================================================== --- branches/branch-3.0/fltk/RadioButton.h 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk/RadioButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,40 +1,23 @@ // // "$Id: RadioButton.h 4886 2006-03-30 09:55:32Z fabien $" // -// Button with a circle indicator to it's left, turning it on turns -// off all other radio buttons in the same Group. -// -// Copyright 1998-2006 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems to "[email protected]". -// -#ifndef fltk_RadioButton_h -#define fltk_RadioButton_h +#ifndef fltk2_RadioButton_h +#define fltk2_RadioButton_h +#include <fltk3/RadioButton.h> + #include "CheckButton.h" namespace fltk { class FL_API RadioButton : public CheckButton { public: - RadioButton(int x, int y, int w, int h, const char *l=0); - static NamedStyle* default_style; + RadioButton(int x, int y, int w, int h, const char *l=0) { + _p = new fltk3::RadioButton(x, y, w, h, l); + _p->wrapper(this); + } + // fltk123: static NamedStyle* default_style; }; } Copied: branches/branch-3.0/fltk3/CheckButton.h (from rev 7370, branches/branch-3.0/fltk3/Fl_Check_Button.H) =================================================================== --- branches/branch-3.0/fltk3/CheckButton.h (rev 0) +++ branches/branch-3.0/fltk3/CheckButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -0,0 +1,64 @@ +// +// "$Id: CheckButton.h 6614 2009-01-01 16:11:32Z matt $" +// +// Check button header file for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2009 by Bill Spitzak and others. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public +// License as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +// USA. +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +/* \file + CheckButton widget . */ + +#ifndef Fltk3_Check_Button_H +#define Fltk3_Check_Button_H + +#include "LightButton.H" + +namespace fltk3 { + +/** + \class CheckButton + \brief A button with an "checkmark" to show its status. + + \image html fltk3::CheckButton.gif + \image latex fltk3::CheckButton.eps "fltk3::CheckButton" width=4cm + Buttons generate callbacks when they are clicked by the user. You control + exactly when and how by changing the values for type() and when(). + + The CheckButton subclass displays its "ON" state by showing a "checkmark" + rather than drawing itself pushed in. + + \todo Refactor CheckButton doxygen comments (add color() info etc?) + \todo Generate fltk3::CheckButton.gif with visible checkmark. + */ +class FL_EXPORT CheckButton : public LightButton { +public: + CheckButton(int X, int Y, int W, int H, const char *L = 0); +}; + +} + +#endif + +// +// End of "$Id: CheckButton.h 6614 2009-01-01 16:11:32Z matt $". +// Deleted: branches/branch-3.0/fltk3/Fl_Check_Button.H Modified: branches/branch-3.0/fltk3/Fl_File_Chooser.H =================================================================== --- branches/branch-3.0/fltk3/Fl_File_Chooser.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_File_Chooser.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -42,7 +42,7 @@ #include <fltk3/Fl_Tile.H> #include <fltk3/Fl_File_Browser.H> #include <fltk3/Fl_Box.H> -#include <fltk3/Fl_Check_Button.H> +#include <fltk3/CheckButton.h> #include <fltk3/Fl_File_Input.H> #include <fltk3/ReturnButton.h> #include <fltk3/ask.h> @@ -91,10 +91,10 @@ static void cb_fileList(Fl_File_Browser*, void*); Fl_Box *previewBox; public: - Fl_Check_Button *previewButton; + fltk3::CheckButton *previewButton; private: - void cb_previewButton_i(Fl_Check_Button*, void*); - static void cb_previewButton(Fl_Check_Button*, void*); + void cb_previewButton_i(fltk3::CheckButton*, void*); + static void cb_previewButton(fltk3::CheckButton*, void*); Fl_File_Input *fileName; void cb_fileName_i(Fl_File_Input*, void*); static void cb_fileName(Fl_File_Input*, void*); Deleted: branches/branch-3.0/fltk3/Fl_Light_Button.H Modified: branches/branch-3.0/fltk3/Fl_Native_File_Chooser_FLTK.H =================================================================== --- branches/branch-3.0/fltk3/Fl_Native_File_Chooser_FLTK.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_Native_File_Chooser_FLTK.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -98,9 +98,9 @@ // added by MG Fl_File_Browser *my_fileList; - Fl_Check_Button *show_hidden; + fltk3::CheckButton *show_hidden; int prev_filtervalue; - static void show_hidden_cb(Fl_Check_Button *o, void *data); + static void show_hidden_cb(fltk3::CheckButton *o, void *data); static void remove_hidden_files(Fl_File_Browser *my_fileList); // Private methods Modified: branches/branch-3.0/fltk3/Fl_Radio_Button.H =================================================================== --- branches/branch-3.0/fltk3/Fl_Radio_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_Radio_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -1,5 +1,5 @@ // -// "$Id: Fl_Radio_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: RadioButton.h 6614 2009-01-01 16:11:32Z matt $" // // Radio button header file for the Fast Light Tool Kit (FLTK). // @@ -26,21 +26,21 @@ // /* \file - Fl_Radio_Button widget . */ + fltk3::RadioButton widget . */ #ifndef Fl_Radio_Button_H #define Fl_Radio_Button_H #include "Button.h" -class Fl_Radio_Button : public fltk3::Button { +class fltk3::RadioButton : public fltk3::Button { public: - Fl_Radio_Button(int x,int y,int w,int h,const char *l=0) + fltk3::RadioButton(int x,int y,int w,int h,const char *l=0) : fltk3::Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);} }; #endif // -// End of "$Id: Fl_Radio_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: RadioButton.h 6614 2009-01-01 16:11:32Z matt $". // Modified: branches/branch-3.0/fltk3/Fl_Radio_Light_Button.H =================================================================== --- branches/branch-3.0/fltk3/Fl_Radio_Light_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_Radio_Light_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -31,12 +31,12 @@ #ifndef Fl_Radio_Light_Button_H #define Fl_Radio_Light_Button_H -#include "Fl_Light_Button.H" +#include "LightButton.h" -class Fl_Radio_Light_Button : public Fl_Light_Button { +class Fl_Radio_Light_Button : public fltk3::LightButton { public: Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0) - : Fl_Light_Button(X,Y,W,H,l) {type(FL_RADIO_BUTTON);} + : fltk3::LightButton(X,Y,W,H,l) {type(FL_RADIO_BUTTON);} }; #endif Modified: branches/branch-3.0/fltk3/Fl_Radio_Round_Button.H =================================================================== --- branches/branch-3.0/fltk3/Fl_Radio_Round_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_Radio_Round_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -31,12 +31,12 @@ #ifndef Fl_Radio_Round_Button_H #define Fl_Radio_Round_Button_H -#include "Fl_Round_Button.H" +#include "RoundButton.h" -class Fl_Radio_Round_Button : public Fl_Round_Button { +class Fl_Radio_Round_Button : public fltk3::RoundButton { public: Fl_Radio_Round_Button(int x,int y,int w,int h,const char *l=0) - : Fl_Round_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);} + : fltk3::RoundButton(x,y,w,h,l) {type(FL_RADIO_BUTTON);} }; #endif Deleted: branches/branch-3.0/fltk3/Fl_Repeat_Button.H Deleted: branches/branch-3.0/fltk3/Fl_Return_Button.H Deleted: branches/branch-3.0/fltk3/Fl_Round_Button.H Modified: branches/branch-3.0/fltk3/Fl_Toggle_Light_Button.H =================================================================== --- branches/branch-3.0/fltk3/Fl_Toggle_Light_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_Toggle_Light_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -28,8 +28,8 @@ // provided for back-compatibility only #ifndef Fl_Toggle_Light_Button -#include "Fl_Light_Button.H" -#define Fl_Toggle_Light_Button Fl_Light_Button +#include "LightButton.h" +#define Fl_Toggle_Light_Button fltk3::LightButton #endif // Modified: branches/branch-3.0/fltk3/Fl_Toggle_Round_Button.H =================================================================== --- branches/branch-3.0/fltk3/Fl_Toggle_Round_Button.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/Fl_Toggle_Round_Button.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -28,8 +28,8 @@ // provided for back-compatibility only #ifndef Fl_Toggle_Round_Button -#include "Fl_Round_Button.H" -#define Fl_Toggle_Round_Button Fl_Round_Button +#include "RoundButton.h" +#define Fl_Toggle_Round_Button fltk3::RoundButton #endif // Copied: branches/branch-3.0/fltk3/LightButton.h (from rev 7384, branches/branch-3.0/fltk3/Fl_Light_Button.H) =================================================================== --- branches/branch-3.0/fltk3/LightButton.h (rev 0) +++ branches/branch-3.0/fltk3/LightButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -0,0 +1,63 @@ +// +// "$Id: LightButton.h 6614 2009-01-01 16:11:32Z matt $" +// +// Lighted button header file for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2009 by Bill Spitzak and others. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public +// License as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +// USA. +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +/* \file + LightButton widget . */ + +#ifndef Fltk3_Light_Button_H +#define Fltk3_Light_Button_H + +#include "Button.h" + +namespace fltk3 { + +/** + <P>This subclass displays the "on" state by turning on a light, + rather than drawing pushed in. The shape of the "light" + is initially set to fltk3::DOWN_BOX. The color of the light when + on is controlled with selection_color(), which defaults to FL_YELLOW. + + Buttons generate callbacks when they are clicked by the user. You + control exactly when and how by changing the values for type() and when(). + <P ALIGN=CENTER>\image html fltk3::LightButton.gif</P> + \image latex fltk3::LightButton.eps "fltk3::LightButton" width=4cm +*/ +class FL_EXPORT LightButton : public Button { +protected: + virtual void draw(); +public: + virtual int handle(int); + LightButton(int x,int y,int w,int h,const char *l = 0); +}; + +} + +#endif + +// +// End of "$Id: LightButton.h 6614 2009-01-01 16:11:32Z matt $". +// Copied: branches/branch-3.0/fltk3/RadioButton.h (from rev 7370, branches/branch-3.0/fltk3/Fl_Round_Button.H) =================================================================== --- branches/branch-3.0/fltk3/RadioButton.h (rev 0) +++ branches/branch-3.0/fltk3/RadioButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -0,0 +1,27 @@ +// +// "$Id: RadioButton.h 6614 2009-01-01 16:11:32Z matt $" +// + +/* \file + RadioButton widget . */ + +#ifndef Fltk3_Radio_Button_H +#define Fltk3_Radio_Button_H + +#include "Button.h" + +namespace fltk3 { + +class RadioButton : public Button { +public: + RadioButton(int x,int y,int w,int h,const char *l=0) + : Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);} +}; + +} + +#endif + +// +// End of "$Id: RadioButton.h 6614 2009-01-01 16:11:32Z matt $". +// Added: branches/branch-3.0/fltk3/RoundButton.h =================================================================== --- branches/branch-3.0/fltk3/RoundButton.h (rev 0) +++ branches/branch-3.0/fltk3/RoundButton.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -0,0 +1,61 @@ +// +// "$Id: RoundButton.h 6614 2009-01-01 16:11:32Z matt $" +// +// Round button header file for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2009 by Bill Spitzak and others. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public +// License as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +// USA. +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +/* \file + RoundButton widget . */ + +#ifndef Fltk3_Round_Button_H +#define Fltk3_Round_Button_H + +#include "LightButton.H" + +namespace fltk3 { + +/** + Buttons generate callbacks when they are clicked by the user. You + control exactly when and how by changing the values for type() + and when(). + <P ALIGN=CENTER>\image html fltk3::RoundButton.gif</P> + \image latex fltk3::RoundButton.eps " fltk3::RoundButton" width=4cm + <P>The fltk3::RoundButton subclass display the "on" state by + turning on a light, rather than drawing pushed in. The shape of the + "light" is initially set to FL_ROUND_DOWN_BOX. The color of the light + when on is controlled with selection_color(), which defaults to + FL_RED. +*/ +class FL_EXPORT RoundButton : public LightButton { +public: + RoundButton(int x,int y,int w,int h,const char *l = 0); +}; + +} + +#endif + +// +// End of "$Id: RoundButton.h 6614 2009-01-01 16:11:32Z matt $". +// Modified: branches/branch-3.0/fltk3/forms.H =================================================================== --- branches/branch-3.0/fltk3/forms.H 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/fltk3/forms.H 2010-04-01 19:40:22 UTC (rev 7394) @@ -490,15 +490,15 @@ ((fltk3::Button*)b)->shortcut(s);} //#define fl_set_object_shortcut(b,s) fl_set_button_shortcut(b,s) -#include "Fl_Light_Button.H" -forms_constructor(Fl_Light_Button, fl_add_lightbutton) +#include "LightButton.h" +forms_constructor(fltk3::LightButton, fl_add_lightbutton) -#include "Fl_Round_Button.H" -forms_constructor(Fl_Round_Button, fl_add_roundbutton) -forms_constructor(Fl_Round_Button, fl_add_round3dbutton) +#include "RoundButton.h" +forms_constructor(fltk3::RoundButton, fl_add_roundbutton) +forms_constructor(fltk3::RoundButton, fl_add_round3dbutton) -#include "Fl_Check_Button.H" -forms_constructor(Fl_Check_Button, fl_add_checkbutton) +#include "CheckButton.h" +forms_constructor(fltk3::CheckButton, fl_add_checkbutton) inline fltk3::Widget* fl_add_bitmapbutton(int t,int x,int y,int w,int h,const char* l) {fltk3::Widget* o = fl_add_button(t,x,y,w,h,l); return o;} inline void fl_set_bitmapbutton_data(fltk3::Widget* o,int a,int b,uchar* c) { Modified: branches/branch-3.0/src/Fl_Button.cxx =================================================================== --- branches/branch-3.0/src/Fl_Button.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/Fl_Button.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -32,7 +32,7 @@ // There are a lot of subclasses, named Fl_*_Button. Some of // them are implemented by setting the type() value and testing it -// here. This includes Fl_Radio_Button and Fl_Toggle_Button +// here. This includes fltk3::RadioButton and Fl_Toggle_Button /** Sets the current value of the button. Modified: branches/branch-3.0/src/Fl_Check_Button.cxx =================================================================== --- branches/branch-3.0/src/Fl_Check_Button.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/Fl_Check_Button.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -26,21 +26,21 @@ // #include <fltk3/run.h> -#include <fltk3/Fl_Check_Button.H> +#include <fltk3/CheckButton.h> -// TODO Correct incorrect Fl_Check_Button comments. +// TODO Correct incorrect fltk3::CheckButton comments. // 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. /** - Creates a new Fl_Check_Button widget using the given position, size and + Creates a new fltk3::CheckButton widget using the given position, size and label string. \param[in] X, Y, W, H position and size of the widget \param[in] L widget label, default is no label */ -Fl_Check_Button::Fl_Check_Button(int X, int Y, int W, int H, const char *L) -: Fl_Light_Button(X, Y, W, H, L) { +fltk3::CheckButton::CheckButton(int X, int Y, int W, int H, const char *L) +: fltk3::LightButton(X, Y, W, H, L) { box(fltk3::NO_BOX); down_box(fltk3::DOWN_BOX); selection_color(FL_FOREGROUND_COLOR); Modified: branches/branch-3.0/src/Fl_File_Chooser.cxx =================================================================== --- branches/branch-3.0/src/Fl_File_Chooser.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/Fl_File_Chooser.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -81,10 +81,10 @@ ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_fileList_i(o,v); } -void Fl_File_Chooser::cb_previewButton_i(Fl_Check_Button*, void*) { +void Fl_File_Chooser::cb_previewButton_i(fltk3::CheckButton*, void*) { preview(previewButton->value()); } -void Fl_File_Chooser::cb_previewButton(Fl_Check_Button* o, void* v) { +void Fl_File_Chooser::cb_previewButton(fltk3::CheckButton* o, void* v) { ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_previewButton_i(o,v); } @@ -201,13 +201,13 @@ } // Fl_Tile* o { fltk3::Group* o = new fltk3::Group(10, 275, 470, 95); { fltk3::Group* o = new fltk3::Group(10, 275, 470, 20); - { previewButton = new Fl_Check_Button(10, 275, 73, 20, "Preview"); + { previewButton = new fltk3::CheckButton(10, 275, 73, 20, "Preview"); previewButton->shortcut(0x80070); previewButton->down_box(fltk3::DOWN_BOX); previewButton->value(1); previewButton->callback((fltk3::Callback*)cb_previewButton); previewButton->label(preview_label); - } // Fl_Check_Button* previewButton + } // fltk3::CheckButton* previewButton { Fl_Box* o = new Fl_Box(115, 275, 365, 20); fltk3::Group::current()->resizable(o); } // Fl_Box* o Modified: branches/branch-3.0/src/Fl_Light_Button.cxx =================================================================== --- branches/branch-3.0/src/Fl_Light_Button.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/Fl_Light_Button.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -33,11 +33,11 @@ // just like Flame's buttons. #include <fltk3/run.h> -#include <fltk3/Fl_Light_Button.H> +#include <fltk3/LightButton.h> #include <fltk3/fl_draw.H> #include "flstring.h" -void Fl_Light_Button::draw() { +void fltk3::LightButton::draw() { if (box()) draw_box(this==fltk3::pushed() ? fl_down(box()) : box(), color()); Fl_Color col = value() ? (active_r() ? selection_color() : fl_inactive(selection_color())) : color(); @@ -148,7 +148,7 @@ if (fltk3::focus() == this) draw_focus(); } -int Fl_Light_Button::handle(int event) { +int fltk3::LightButton::handle(int event) { switch (event) { case fltk3::RELEASE: if (box()) redraw(); @@ -158,11 +158,11 @@ } /** - Creates a new Fl_Light_Button widget using the given + Creates a new fltk3::LightButton widget using the given position, size, and label string. <P>The destructor deletes the check button. */ -Fl_Light_Button::Fl_Light_Button(int X, int Y, int W, int H, const char* l) +fltk3::LightButton::LightButton(int X, int Y, int W, int H, const char* l) : fltk3::Button(X, Y, W, H, l) { type(FL_TOGGLE_BUTTON); selection_color(FL_YELLOW); Modified: branches/branch-3.0/src/Fl_Native_File_Chooser_FLTK.cxx =================================================================== --- branches/branch-3.0/src/Fl_Native_File_Chooser_FLTK.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/Fl_Native_File_Chooser_FLTK.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -69,7 +69,7 @@ fltk3::Button *b = _file_chooser->previewButton; fltk3::Window *w = b->window(); fltk3::Group::current(w); // adds a "Show hidden files" check button in _file_chooser's window - show_hidden = new Fl_Check_Button(b->x() + b->w() + 10, b->y(), 145, b->h(), "Show hidden files"); + show_hidden = new fltk3::CheckButton(b->x() + b->w() + 10, b->y(), 145, b->h(), "Show hidden files"); show_hidden->callback((fltk3::Callback*)show_hidden_cb, this); my_fileList = _file_chooser->browser(); _old_dir = 0; // to detect directory changes @@ -471,7 +471,7 @@ return(_preset_file); } -void Fl_Native_File_Chooser::show_hidden_cb(Fl_Check_Button *o, void *data) +void Fl_Native_File_Chooser::show_hidden_cb(fltk3::CheckButton *o, void *data) { Fl_Native_File_Chooser *mychooser = (Fl_Native_File_Chooser *)data; if (o->value()) { Modified: branches/branch-3.0/src/Fl_Round_Button.cxx =================================================================== --- branches/branch-3.0/src/Fl_Round_Button.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/Fl_Round_Button.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -30,14 +30,14 @@ // another box type, for compatibility with Forms. #include <fltk3/run.h> -#include <fltk3/Fl_Round_Button.H> +#include <fltk3/RoundButton.h> /** - Creates a new Fl_Round_Button widget using the given + Creates a new fltk3::RoundButton widget using the given position, size, and label string. */ -Fl_Round_Button::Fl_Round_Button(int X,int Y,int W,int H, const char *l) -: Fl_Light_Button(X,Y,W,H,l) { +fltk3::RoundButton::RoundButton(int X,int Y,int W,int H, const char *l) +: fltk3::LightButton(X,Y,W,H,l) { box(fltk3::NO_BOX); down_box(fltk3::ROUND_DOWN_BOX); selection_color(FL_FOREGROUND_COLOR); Modified: branches/branch-3.0/src/print_panel.cxx =================================================================== --- branches/branch-3.0/src/print_panel.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/print_panel.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -54,10 +54,10 @@ static Fl_Choice *print_choice=(Fl_Choice *)0; static fltk3::Button *print_properties=(fltk3::Button *)0; static Fl_Box *print_status=(Fl_Box *)0; -static Fl_Round_Button *print_all=(Fl_Round_Button *)0; -static Fl_Round_Button *print_pages=(Fl_Round_Button *)0; -static Fl_Round_Button *print_selection=(Fl_Round_Button *)0; -static Fl_Check_Button *print_collate_button=(Fl_Check_Button *)0; +static fltk3::RoundButton *print_all=(fltk3::RoundButton *)0; +static fltk3::RoundButton *print_pages=(fltk3::RoundButton *)0; +static fltk3::RoundButton *print_selection=(fltk3::RoundButton *)0; +static fltk3::CheckButton *print_collate_button=(fltk3::CheckButton *)0; static fltk3::Group *print_collate_group[2]={(fltk3::Group *)0}; static Fl_Progress *print_progress=(Fl_Progress *)0; static fltk3::DoubleBufferWindow *print_properties_panel=(fltk3::DoubleBufferWindow *)0; @@ -98,17 +98,17 @@ print_properties_panel->show(); } -static void cb_print_all(Fl_Round_Button*, void*) { +static void cb_print_all(fltk3::RoundButton*, void*) { print_from->deactivate(); print_to->deactivate(); } -static void cb_print_pages(Fl_Round_Button*, void*) { +static void cb_print_pages(fltk3::RoundButton*, void*) { print_from->activate(); print_to->activate(); } -static void cb_print_selection(Fl_Round_Button*, void*) { +static void cb_print_selection(fltk3::RoundButton*, void*) { print_from->deactivate(); print_to->deactivate(); } @@ -125,7 +125,7 @@ }; } -static void cb_print_collate_button(Fl_Check_Button*, void*) { +static void cb_print_collate_button(fltk3::CheckButton*, void*) { int i = print_collate_button->value() != 0; print_collate_group[i]->show(); print_collate_group[1 - i]->hide(); @@ -287,22 +287,22 @@ o->box(fltk3::THIN_DOWN_BOX); o->labelfont(1); o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT)); - { print_all = new Fl_Round_Button(20, 96, 38, 25, Fl_Printer::dialog_all); + { print_all = new fltk3::RoundButton(20, 96, 38, 25, Fl_Printer::dialog_all); print_all->type(102); print_all->down_box(FL_ROUND_DOWN_BOX); print_all->value(1); 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); + } // fltk3::RoundButton* print_all + { print_pages = new fltk3::RoundButton(20, 126, 64, 25, Fl_Printer::dialog_pages); print_pages->type(102); print_pages->down_box(FL_ROUND_DOWN_BOX); print_pages->callback((fltk3::Callback*)cb_print_pages); - } // Fl_Round_Button* print_pages - { print_selection = new Fl_Round_Button(20, 156, 82, 25, "Selection"); + } // fltk3::RoundButton* print_pages + { print_selection = new fltk3::RoundButton(20, 156, 82, 25, "Selection"); print_selection->type(102); print_selection->down_box(FL_ROUND_DOWN_BOX); print_selection->callback((fltk3::Callback*)cb_print_selection); - } // Fl_Round_Button* print_selection + } // fltk3::RoundButton* print_selection { print_from = new Fl_Int_Input(136, 126, 28, 25, Fl_Printer::dialog_from); print_from->type(2); print_from->textfont(4); @@ -323,12 +323,12 @@ print_copies->callback((fltk3::Callback*)cb_print_copies); print_copies->when(FL_WHEN_CHANGED); } // Fl_Spinner* print_copies - { print_collate_button = new Fl_Check_Button(376, 96, 64, 25, "Collate"); + { print_collate_button = new fltk3::CheckButton(376, 96, 64, 25, "Collate"); print_collate_button->down_box(fltk3::DOWN_BOX); print_collate_button->callback((fltk3::Callback*)cb_print_collate_button); print_collate_button->when(FL_WHEN_CHANGED); print_collate_button->deactivate(); - } // Fl_Check_Button* print_collate_button + } // fltk3::CheckButton* print_collate_button { print_collate_group[0] = new fltk3::Group(257, 131, 191, 50); print_collate_group[0]->deactivate(); { Fl_Box* o = new Fl_Box(287, 141, 30, 40, "1"); Modified: branches/branch-3.0/src/print_panel.h =================================================================== --- branches/branch-3.0/src/print_panel.h 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/src/print_panel.h 2010-04-01 19:40:22 UTC (rev 7394) @@ -38,10 +38,10 @@ #include <fltk3/Fl_Choice.H> #include <fltk3/Button.h> #include <fltk3/Fl_Box.H> -#include <fltk3/Fl_Round_Button.H> +#include <fltk3/RoundButton.h> #include <fltk3/Fl_Input.H> #include <fltk3/Fl_Spinner.H> -#include <fltk3/Fl_Check_Button.H> +#include <fltk3/CheckButton.h> #include <fltk3/ReturnButton.h> #include <fltk3/Fl_Progress.H> static fltk3::DoubleBufferWindow* make_print_panel(); Modified: branches/branch-3.0/test/buttons.cxx =================================================================== --- branches/branch-3.0/test/buttons.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/test/buttons.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -32,9 +32,9 @@ #include <fltk3/Button.h> #include <fltk3/ReturnButton.h> #include <fltk3/RepeatButton.h> -// fltk123: #include <fltk3/CheckButton.h> -// fltk123: #include <fltk3/LightButton.h> -// fltk123: #include <fltk3/Fl_Round_Button.h> +#include <fltk3/CheckButton.h> +#include <fltk3/LightButton.h> +#include <fltk3/RoundButton.h> // fltk123: #include <fltk3/Tooltip.h> using namespace fltk3; @@ -46,9 +46,9 @@ (new Button(10, 10, 130, 30, "Button"))->tooltip("This is a Tooltip."); new ReturnButton(150, 10, 160, 30, "ReturnButton"); new RepeatButton(10,50,130,30,"RepeatButton"); - // fltk123: new LightButton(10,90,130,30,"LightButton"); - // fltk123: new Fl_Round_Button(150,50,160,30,"Fl_Round_Button"); - // fltk123: new CheckButton(150,90,160,30,"CheckButton"); + new LightButton(10,90,130,30,"LightButton"); + new RoundButton(150,50,160,30,"RoundButton"); + new CheckButton(150,90,160,30,"CheckButton"); } window->end(); window->show(argc,argv); Modified: branches/branch-3.0/test/buttons1.cxx =================================================================== --- branches/branch-3.0/test/buttons1.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/test/buttons1.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -32,9 +32,9 @@ #include <FL/Fl_Button.H> #include <FL/Fl_Return_Button.H> #include <FL/Fl_Repeat_Button.H> -// fltk123: #include <FL/Fl_Check_Button.H> -// fltk123: #include <FL/Fl_Light_Button.H> -// fltk123: #include <FL/Fl_Round_Button.H> +#include <FL/Fl_Check_Button.H> +#include <FL/Fl_Light_Button.H> +#include <FL/Fl_Round_Button.H> // fltk123: #include <FL/Fl_Tooltip.H> int main(int argc, char ** argv) { @@ -42,9 +42,9 @@ (new Fl_Button(10, 10, 130, 30, "Fl_Button"))->tooltip("This is a Tooltip."); new Fl_Return_Button(150, 10, 160, 30, "Fl_Return_Button"); new Fl_Repeat_Button(10,50,130,30,"Fl_Repeat_Button"); - // fltk123: new Fl_Light_Button(10,90,130,30,"Fl_Light_Button"); - // fltk123: new Fl_Round_Button(150,50,160,30,"Fl_Round_Button"); - // fltk123: new Fl_Check_Button(150,90,160,30,"Fl_Check_Button"); + new Fl_Light_Button(10,90,130,30,"Fl_Light_Button"); + new Fl_Round_Button(150,50,160,30,"Fl_Round_Button"); + new Fl_Check_Button(150,90,160,30,"Fl_Check_Button"); window->end(); window->show(argc,argv); return Fl::run(); Modified: branches/branch-3.0/test/buttons2.cxx =================================================================== --- branches/branch-3.0/test/buttons2.cxx 2010-04-01 16:08:15 UTC (rev 7393) +++ branches/branch-3.0/test/buttons2.cxx 2010-04-01 19:40:22 UTC (rev 7394) @@ -31,9 +31,9 @@ // fltk123: #include <fltk/ToggleButton.h> #include <fltk/ReturnButton.h> #include <fltk/RepeatButton.h> -// fltk123: #include <fltk/CheckButton.h> -// fltk123: #include <fltk/RadioButton.h> -// fltk123: #include <fltk/LightButton.h> +#include <fltk/CheckButton.h> +#include <fltk/RadioButton.h> +#include <fltk/LightButton.h> // fltk123: #include <fltk/HighlightButton.h> // fltk123: #include <fltk/MultiImage.h> // fltk123: #include <fltk/xpmImage.h> @@ -104,13 +104,13 @@ rb->tooltip("Push this to revert style to fltk defaults"); Y += H+B; // fltk123: (void) new ToggleButton(X0, Y, W, H, "ToggleButton"); - // fltk123: (void) new RadioButton(X1, Y, W, H, "RadioButton"); + (void) new RadioButton(X1, Y, W, H, "RadioButton"); Y += H+B; (void) new RepeatButton(X0, Y, W, H, "RepeatButton"); - // fltk123: (void) new RadioButton(X1, Y, W, H, "RadioButton"); + (void) new RadioButton(X1, Y, W, H, "RadioButton"); Y += H+B; - // fltk123: (void) new LightButton(X0, Y, W, H, "LightButton"); - // fltk123: (void) new RadioButton(X1, Y, W, H, "RadioButton"); + (void) new LightButton(X0, Y, W, H, "LightButton"); + (void) new RadioButton(X1, Y, W, H, "RadioButton"); Y += H+B; // The box of the higlight button will appear when belowmouse // when combined with image() as below, you get the border + the image appearing when belowmouse() @@ -118,7 +118,7 @@ //HighlightButton* hb = // fltk123: new HighlightButton(X0, Y, W, H, "HighlightButton"); - // fltk123: new CheckButton(X1, Y, W, H, "CheckButton"); + new CheckButton(X1, Y, W, H, "CheckButton"); Y += H+B; Button * b = new Button(X0, Y, W, H, "push/release img"); _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
