diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-09-27 11:39:02 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-09-27 11:39:02 +0000 |
| commit | a735162e981a57d629dd7fe460328dbc36287996 (patch) | |
| tree | 0713b04452746bcac5253a7e51b69e6713b2efb3 | |
| parent | bc063e345f3d1f872dc2290433362752db88fa17 (diff) | |
Starting to consolidate all bits used in Fl_Widget::flags_
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6904 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Group.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 17 | ||||
| -rw-r--r-- | src/Fl_Menu_.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_Window.cxx | 3 |
4 files changed, 14 insertions, 16 deletions
diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index c3898db03..b1514f2c0 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -58,8 +58,6 @@ class FL_EXPORT Fl_Group : public Fl_Widget { Fl_Group& operator=(const Fl_Group&); protected: - enum { CLIP_CHILDREN = 2048 }; - void draw(); void draw_child(Fl_Widget& widget) const; void draw_children(); diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 23035ed74..1da113787 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -144,14 +144,15 @@ protected: 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; diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx index 19abef626..5213d6886 100644 --- a/src/Fl_Menu_.cxx +++ b/src/Fl_Menu_.cxx @@ -172,11 +172,11 @@ void Fl_Menu_Item::setonly() { } } -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. -*/ + 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) : Fl_Widget(X,Y,W,H,l) { set_flag(SHORTCUT_LABEL); box(FL_UP_BOX); diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index c8870d81a..20fcab692 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -151,8 +151,7 @@ void Fl_Window::copy_label(const char *a) { 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); } |