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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Menu_.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_Window.cxx | 3 |
2 files changed, 5 insertions, 6 deletions
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); } |