diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-18 18:53:20 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-18 18:53:20 +0000 |
| commit | 9da85233f979b8c73f8714e094feb01e12bd0587 (patch) | |
| tree | 05129d7b3ccefb76a8f0a9307b7a3c5caa83178f /FL | |
| parent | 8638a3f5a571e64a3ba26fb34355fc0205a516e0 (diff) | |
Fl::belowmouse() was resetting the tooltip, causing the flashing
in the FLUID window and havoc for the KDE 2.2 window manager...
Changed the default tooltip position to be +10, +10 from the
mouse pointer, and the default tooltip background color to a
pale yellow to match other toolkit defaults.
Update Fl_Widget::flags_ to be an integer, to support more flag
bits.
Update Fl_Window to support override() and set_override() methods.
The configure script did not set the default library path to
/usr/lib32 under IRIX 6.2 and higher when prefix is /usr.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1637 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Widget.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Window.H | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index b9de751ce..103f23d14 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.6.2.4.2.6 2001/08/06 23:51:39 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.7 2001/10/18 18:53:20 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -58,7 +58,7 @@ class Fl_Widget { short x_,y_,w_,h_; Fl_Label label_; uchar type_; - uchar flags_; + int flags_; uchar damage_; uchar box_; uchar color_; @@ -81,7 +81,7 @@ protected: void w(int v) {w_ = v;} void h(int v) {h_ = v;} - uchar flags() const {return flags_;} + int flags() const {return flags_;} void set_flag(int c) {flags_ |= c;} void clear_flag(int c) {flags_ &= ~c;} enum {INACTIVE=1, INVISIBLE=2, OUTPUT=4, SHORTCUT_LABEL=64, CHANGED=128}; @@ -206,5 +206,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.6 2001/08/06 23:51:39 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.7 2001/10/18 18:53:20 easysw Exp $". // diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index e4b72bc6b..125cd8a3c 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window.H,v 1.12.2.6 2001/05/11 18:37:08 easysw Exp $" +// "$Id: Fl_Window.H,v 1.12.2.6.2.1 2001/10/18 18:53:20 easysw Exp $" // // Window header file for the Fast Light Tool Kit (FLTK). // @@ -49,7 +49,8 @@ class Fl_Window : public Fl_Group { FL_MODAL = 64, FL_NOBORDER = 8, FL_FORCE_POSITION = 16, - FL_NON_MODAL = 32 + FL_NON_MODAL = 32, + FL_OVERRIDE = 256 }; FL_EXPORT void _Fl_Window(); // constructor innards @@ -71,10 +72,12 @@ public: FL_EXPORT void border(int b); void clear_border() {set_flag(FL_NOBORDER);} int border() const {return !(flags() & FL_NOBORDER);} + void set_override() {set_flag(FL_NOBORDER|FL_OVERRIDE);} + int override() const { return flags()&FL_OVERRIDE; } void set_modal() {set_flag(FL_MODAL);} - uchar modal() const {return flags() & FL_MODAL;} + int modal() const {return flags() & FL_MODAL;} void set_non_modal() {set_flag(FL_NON_MODAL);} - uchar non_modal() const {return flags() & (FL_NON_MODAL|FL_MODAL);} + int non_modal() const {return flags() & (FL_NON_MODAL|FL_MODAL);} FL_EXPORT void hotspot(int x, int y, int offscreen = 0); FL_EXPORT void hotspot(const Fl_Widget*, int offscreen = 0); @@ -116,5 +119,5 @@ public: #endif // -// End of "$Id: Fl_Window.H,v 1.12.2.6 2001/05/11 18:37:08 easysw Exp $". +// End of "$Id: Fl_Window.H,v 1.12.2.6.2.1 2001/10/18 18:53:20 easysw Exp $". // |