diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2001-03-20 18:02:52 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2001-03-20 18:02:52 +0000 |
| commit | 339b9cd8a044039e1a2deadc0e765f65ba91f6a4 (patch) | |
| tree | 85bbaa1b39ef0a45a079abc03a798522f6b8df91 /src/Fl_arg.cxx | |
| parent | 3a9d945d0701afbffa02e3331271103c6ce93f0a (diff) | |
can_do_overlay was missing from WIN32 version
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1417 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_arg.cxx')
| -rw-r--r-- | src/Fl_arg.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx index 830cd3e68..f531b575d 100644 --- a/src/Fl_arg.cxx +++ b/src/Fl_arg.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_arg.cxx,v 1.5.2.7 2001/01/22 15:13:40 easysw Exp $" +// "$Id: Fl_arg.cxx,v 1.5.2.8 2001/03/20 18:02:52 spitzak Exp $" // // Optional argument initialization code for the Fast Light Tool Kit (FLTK). // @@ -147,8 +147,6 @@ void Fl_Window::show(int argc, char **argv) { // set colors first, so background_pixel is correct: static char beenhere; if (!beenhere) { - beenhere = 1; - Fl::get_system_colors(); // opens display! May call Fl::fatal() if (geometry) { int flags = 0, gx = x(), gy = y(); unsigned int gw = w(), gh = h(); flags = XParseGeometry(geometry, &gx, &gy, &gw, &gh); @@ -168,12 +166,19 @@ void Fl_Window::show(int argc, char **argv) { } } + // set the class, which is used by X version of get_system_colors: if (name) {xclass(name); name = 0;} else if (!xclass()) xclass(filename_name(argv[0])); + if (title) {label(title); title = 0;} else if (!label()) label(xclass()); show(); + if (!beenhere) { + beenhere = 1; + Fl::get_system_colors(); // opens display! May call Fl::fatal() + } + #ifndef WIN32 // set the command string, used by state-saving window managers: int j; @@ -352,5 +357,5 @@ int XParseGeometry(const char* string, int* x, int* y, #endif // ifdef WIN32 // -// End of "$Id: Fl_arg.cxx,v 1.5.2.7 2001/01/22 15:13:40 easysw Exp $". +// End of "$Id: Fl_arg.cxx,v 1.5.2.8 2001/03/20 18:02:52 spitzak Exp $". // |