summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Menu_.cxx8
-rw-r--r--src/Fl_Window.cxx3
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);
}