mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Starting to consolidate all bits used in Fl_Widget::flags_

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6904 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2009-09-27 11:39:02 +00:00
parent bc063e345f
commit a735162e98
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Group.H
View File

@ -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();

17
FL/Fl_Widget.H
View File

@ -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;

8
src/Fl_Menu_.cxx
View File

@ -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);

3
src/Fl_Window.cxx
View File

@ -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);
}