Author: spitzak
Date: 2007-08-02 07:18:25 -0700 (Thu, 02 Aug 2007)
New Revision: 5938
Log:
Removed the NORMAL enumeration as it conflicted with symbols in programs
using FLTK1. I just replaced it with zero, but maybe NORMAL_BUTTON might
be a good idea, same for the RADIO and TOGGLE ones.
Modified:
trunk/fltk/Widget.h
trunk/fltk/compat/FL/Fl_Button.H
trunk/src/Widget.cxx
Modified: trunk/fltk/Widget.h
===================================================================
--- trunk/fltk/Widget.h 2007-07-31 04:06:25 UTC (rev 5937)
+++ trunk/fltk/Widget.h 2007-08-02 14:18:25 UTC (rev 5938)
@@ -70,7 +70,6 @@
enum WidgetVisualType {
// Values for type() shared by Button and menu Item, and for fake RTTI:
- NORMAL = 0,
RESERVED_TYPE = 0x64,
TOGGLE = RESERVED_TYPE+1,
RADIO = RESERVED_TYPE+2,
Modified: trunk/fltk/compat/FL/Fl_Button.H
===================================================================
--- trunk/fltk/compat/FL/Fl_Button.H 2007-07-31 04:06:25 UTC (rev 5937)
+++ trunk/fltk/compat/FL/Fl_Button.H 2007-08-02 14:18:25 UTC (rev 5938)
@@ -6,7 +6,7 @@
typedef fltk::Button Fl_Button;
enum {
- FL_NORMAL_BUTTON = fltk::Button::NORMAL,
+ FL_NORMAL_BUTTON = 0,
FL_TOGGLE_BUTTON = fltk::Button::TOGGLE,
FL_RADIO_BUTTON = fltk::Button::RADIO,
FL_HIDDEN_BUTTON = fltk::Button::HIDDEN // may not work in 2.0
Modified: trunk/src/Widget.cxx
===================================================================
--- trunk/src/Widget.cxx 2007-07-31 04:06:25 UTC (rev 5937)
+++ trunk/src/Widget.cxx 2007-08-02 14:18:25 UTC (rev 5938)
@@ -76,7 +76,7 @@
#else
flags_ = TAB_TO_FOCUS;
#endif
- type_ = NORMAL;
+ type_ = 0;
damage_ = DAMAGE_ALL;
layout_damage_= LAYOUT_DAMAGE;
when_ = WHEN_RELEASE;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
