diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-03 02:28:32 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-03 02:28:32 +0000 |
| commit | 0771e7cc7d5f6008260058511bfc2d273282d926 (patch) | |
| tree | 0e47ee7c63ba885df5e76c81356034bbdba8186c /FL | |
| parent | 85533d11be0b32799d1baf343a13a633cb041ea2 (diff) | |
Update WIN32 projects and config file.
Fix sign of Fl::e_dy to match screen coordinate directions under WIN32.
Note: tooltips not working under WIN32...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1546 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Tooltip.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/FL/Fl_Tooltip.H b/FL/Fl_Tooltip.H index 62875dc38..19dba0cf7 100644 --- a/FL/Fl_Tooltip.H +++ b/FL/Fl_Tooltip.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tooltip.H,v 1.16.2.2 2001/08/02 15:31:59 easysw Exp $" +// "$Id: Fl_Tooltip.H,v 1.16.2.3 2001/08/03 02:28:32 easysw Exp $" // // Tooltip header file for the Fast Light Tool Kit (FLTK). // @@ -33,7 +33,7 @@ class Fl_TooltipBox; class Fl_Menu_Window; -FL_EXPORT class Fl_Tooltip { +class FL_EXPORT Fl_Tooltip { friend class Fl_TooltipBox; friend class Fl_Widget; @@ -57,7 +57,7 @@ public: // These functions are user-called functions static float delay() { return delay_; } - static void delay(float f) { delay_ = (f < 0.1) ? 0.1 : f; } + static void delay(float f) { delay_ = (f < 0.1f) ? 0.1f : f; } static int font() { return font_; } static int size() { return size_; } static void font(int i) { font_ = i; } @@ -76,5 +76,5 @@ public: #endif // -// End of "$Id: Fl_Tooltip.H,v 1.16.2.2 2001/08/02 15:31:59 easysw Exp $". +// End of "$Id: Fl_Tooltip.H,v 1.16.2.3 2001/08/03 02:28:32 easysw Exp $". // diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 9fbdc862b..5ca21e3bb 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.2 2001/08/02 15:31:59 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.3 2001/08/03 02:28:32 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -46,7 +46,7 @@ struct Fl_Label { FL_EXPORT void measure(int&, int&) const ; }; -FL_EXPORT class Fl_Widget { +class FL_EXPORT Fl_Widget { friend class Fl_Group; Fl_Widget* parent_; @@ -67,11 +67,11 @@ FL_EXPORT class Fl_Widget { // "de-implement" the copy constructors: Fl_Widget & operator=(const Fl_Widget &); - FL_EXPORT Fl_Widget(const Fl_Widget &); + Fl_Widget(const Fl_Widget &); protected: - FL_EXPORT Fl_Widget(int,int,int,int,const char* =0); + Fl_Widget(int,int,int,int,const char* =0); void x(int v) {x_ = v;} void y(int v) {y_ = v;} @@ -83,11 +83,11 @@ protected: void clear_flag(int c) {flags_ &= ~c;} enum {INACTIVE=1, INVISIBLE=2, OUTPUT=4, SHORTCUT_LABEL=64, CHANGED=128}; - FL_EXPORT void draw_box() const; - FL_EXPORT void draw_box(Fl_Boxtype, Fl_Color) const; - FL_EXPORT void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const; - FL_EXPORT void draw_label() const; - FL_EXPORT void draw_label(int, int, int, int) const; + void draw_box() const; + void draw_box(Fl_Boxtype, Fl_Color) const; + void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const; + void draw_label() const; + void draw_label(int, int, int, int) const; public: @@ -195,5 +195,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.2 2001/08/02 15:31:59 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.3 2001/08/03 02:28:32 easysw Exp $". // |