summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-12-20 14:41:44 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-12-20 14:41:44 +0000
commitdf9acaafea434e12d21077a7806867c99217a57d (patch)
treef0939ab6eea3bb92acadf6d483938d28d8391df4 /FL
parent0215c7986c4f255d92753daddc0237f4e5a1a73b (diff)
Implement Fl::scheme() and Fl::reload_scheme() (this includes support
for new FLTK_SCHEME environment variable, which should get added to FLTK 2.0 CVS, as well as the -scheme option...) Revert Fl_Group/Fl_Widget destructor change - it doesn't work for statically initialized widgets (like the widgets in a color chooser...) Export fl_round_up_box() and fl_round_down_box() so they can be restored in Fl::reload_scheme(). Use FL_DOWN_BOX and FL_ROUND_DOWN_BOX in menu drawing code. Use a static string for the display environment variable in Fl::display(). Updated MacOS README file... Added window tile image... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1883 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl.H13
1 files changed, 11 insertions, 2 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 34c0730d9..31e83cad8 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.H,v 1.8.2.11.2.10 2001/12/19 18:15:33 easysw Exp $"
+// "$Id: Fl.H,v 1.8.2.11.2.11 2001/12/20 14:41:44 easysw Exp $"
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
@@ -33,6 +33,7 @@
class Fl_Widget;
class Fl_Window;
+class Fl_Image;
struct Fl_Label;
typedef void (Fl_Label_Draw_F)(const Fl_Label*, int,int,int,int, Fl_Align);
typedef void (Fl_Label_Measure_F)(const Fl_Label*, int&, int&);
@@ -67,6 +68,9 @@ public: // should be private!
static FL_EXPORT void (*idle)();
+ static const char* scheme_;
+ static Fl_Image* scheme_bg_;
+
public:
// API version number
@@ -88,6 +92,11 @@ public:
static FL_EXPORT void background(uchar, uchar, uchar);
static FL_EXPORT void background2(uchar, uchar, uchar);
+ // schemes:
+ static int scheme(const char*);
+ static const char* scheme() {return scheme_;}
+ static int reload_scheme();
+
// execution:
static FL_EXPORT int wait();
static FL_EXPORT double wait(double time);
@@ -234,5 +243,5 @@ public:
#endif // !Fl_H
//
-// End of "$Id: Fl.H,v 1.8.2.11.2.10 2001/12/19 18:15:33 easysw Exp $".
+// End of "$Id: Fl.H,v 1.8.2.11.2.11 2001/12/20 14:41:44 easysw Exp $".
//