diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-20 14:41:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-20 14:41:44 +0000 |
| commit | df9acaafea434e12d21077a7806867c99217a57d (patch) | |
| tree | f0939ab6eea3bb92acadf6d483938d28d8391df4 /src/Fl_arg.cxx | |
| parent | 0215c7986c4f255d92753daddc0237f4e5a1a73b (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 'src/Fl_arg.cxx')
| -rw-r--r-- | src/Fl_arg.cxx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx index da5e89e5a..b80f3d499 100644 --- a/src/Fl_arg.cxx +++ b/src/Fl_arg.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_arg.cxx,v 1.5.2.8.2.4 2001/12/11 16:03:12 easysw Exp $" +// "$Id: Fl_arg.cxx,v 1.5.2.8.2.5 2001/12/20 14:41:44 easysw Exp $" // // Optional argument initialization code for the Fast Light Tool Kit (FLTK). // @@ -87,7 +87,7 @@ int Fl::arg(int argc, char **argv, int &i) { Fl::visible_focus(1); i++; return 1; - } else if (match(s, "nokbd")) { + } else if (match(s, "nokbd", 3)) { Fl::visible_focus(0); i++; return 1; @@ -124,6 +124,9 @@ int Fl::arg(int argc, char **argv, int &i) { } else if (match(s, "fg") || match(s, "foreground")) { fl_fg = v; + } else if (match(s, "scheme")) { + Fl::scheme(v); + } else return 0; // unrecognized i += 2; @@ -184,7 +187,7 @@ void Fl_Window::show(int argc, char **argv) { if (!beenhere) { beenhere = 1; - Fl::get_system_colors(); // opens display! May call Fl::fatal() + Fl::scheme(Fl::scheme()); // opens display! May call Fl::fatal() } #if !defined(WIN32) && !defined(__APPLE__) @@ -204,15 +207,17 @@ void Fl_Window::show(int argc, char **argv) { static const char * const helpmsg = "options are:\n" +" -bg2 color\n" +" -bg color\n" " -d[isplay] host:n.n\n" +" -fg color\n" " -g[eometry] WxH+X+Y\n" -" -t[itle] windowtitle\n" -" -n[ame] classname\n" " -i[conic]\n" -" -fg color\n" -" -bg color\n" -" -bg2 color\n" -" -nokbd"; +" -k[bd]\n" +" -n[ame] classname\n" +" -nok[bd]\n" +" -s[cheme] scheme\n" +" -t[itle] windowtitle"; const char * const Fl::help = helpmsg+13; @@ -359,5 +364,5 @@ int XParseGeometry(const char* string, int* x, int* y, #endif // ifdef WIN32 // -// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.4 2001/12/11 16:03:12 easysw Exp $". +// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.5 2001/12/20 14:41:44 easysw Exp $". // |