Author: matt
Date: 2009-09-27 04:39:02 -0700 (Sun, 27 Sep 2009)
New Revision: 6904
Log:
Starting to consolidate all bits used in Fl_Widget::flags_
Modified:
branches/branch-1.3/FL/Fl_Group.H
branches/branch-1.3/FL/Fl_Widget.H
branches/branch-1.3/src/Fl_Menu_.cxx
branches/branch-1.3/src/Fl_Window.cxx
Modified: branches/branch-1.3/FL/Fl_Group.H
===================================================================
--- branches/branch-1.3/FL/Fl_Group.H 2009-09-27 11:09:03 UTC (rev 6903)
+++ branches/branch-1.3/FL/Fl_Group.H 2009-09-27 11:39:02 UTC (rev 6904)
@@ -58,8 +58,6 @@
Fl_Group& operator=(const Fl_Group&);
protected:
- enum { CLIP_CHILDREN = 2048 };
-
void draw();
void draw_child(Fl_Widget& widget) const;
void draw_children();
Modified: branches/branch-1.3/FL/Fl_Widget.H
===================================================================
--- branches/branch-1.3/FL/Fl_Widget.H 2009-09-27 11:09:03 UTC (rev 6903)
+++ branches/branch-1.3/FL/Fl_Widget.H 2009-09-27 11:39:02 UTC (rev 6904)
@@ -144,14 +144,15 @@
See activate(), output(), visible(), changed(), set_visible_focus()
*/
enum {
- INACTIVE=1, ///< the widget can't receive focus, and is
disabled but potentially visible
- INVISIBLE=2, ///< the widget is not drawn but can receive events
- OUTPUT=4, ///< for output only
- SHORTCUT_LABEL=64, ///< the label contains a shortcut we need to draw
- CHANGED=128, ///< the widget value changed
- VISIBLE_FOCUS=512, ///< accepts keyboard focus navigation if the
widget can have the focus
- COPIED_LABEL=1024 ///< the widget label is internally copied, its
destruction is handled by the widget
- };
+ INACTIVE=1, ///< the widget can't receive focus, and is
disabled but potentially visible
+ INVISIBLE=2, ///< the widget is not drawn but can receive
events
+ OUTPUT=4, ///< for output only
+ SHORTCUT_LABEL=64, ///< the label contains a shortcut we need to
draw
+ CHANGED=128, ///< the widget value changed
+ VISIBLE_FOCUS=512, ///< accepts keyboard focus navigation if the
widget can have the focus
+ COPIED_LABEL=1024, ///< the widget label is internally copied, its
destruction is handled by the widget
+ CLIP_CHILDREN = 2048 ///< all drawing within this widget will be
clipped (Fl_Group)
+ };
void draw_box() const;
void draw_box(Fl_Boxtype t, Fl_Color c) const;
void draw_box(Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c) const;
Modified: branches/branch-1.3/src/Fl_Menu_.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Menu_.cxx 2009-09-27 11:09:03 UTC (rev
6903)
+++ branches/branch-1.3/src/Fl_Menu_.cxx 2009-09-27 11:39:02 UTC (rev
6904)
@@ -172,11 +172,11 @@
}
}
+/**
+ Creates a new Fl_Menu_ widget using the given position, size,
+ and label string. menu() is initialized to null.
+ */
Fl_Menu_::Fl_Menu_(int X,int Y,int W,int H,const char* l)
-/**
- Creates a new Fl_Menu_ widget using the given position, size,
- and label string. menu() is initialized to null.
-*/
: Fl_Widget(X,Y,W,H,l) {
set_flag(SHORTCUT_LABEL);
box(FL_UP_BOX);
Modified: branches/branch-1.3/src/Fl_Window.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Window.cxx 2009-09-27 11:09:03 UTC (rev
6903)
+++ branches/branch-1.3/src/Fl_Window.cxx 2009-09-27 11:39:02 UTC (rev
6904)
@@ -151,8 +151,7 @@
void Fl_Window::iconlabel(const char *iname) {
- // FIXME: 'flags' is 32 bit large!
- uchar saveflags = flags();
+ unsigned saveflags = flags();
label(label(), iname);
set_flag(saveflags);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
