Author: mike
Date: 2005-05-26 10:03:44 -0400 (Thu, 26 May 2005)
New Revision: 4372

Modified:
   branches/branch-1.1/CHANGES
   branches/branch-1.1/src/Fl_arg.cxx
Log:
Move show() after scheme() call in Fl_Window::show(argc, argv) to
eliminate scheme flicker on startup.


Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES	2005-05-26 13:54:53 UTC (rev 4371)
+++ branches/branch-1.1/CHANGES	2005-05-26 14:03:44 UTC (rev 4372)
@@ -2,6 +2,10 @@
 
 	- Documentation fixes (STR #648, STR #692, STR #730, STR
 	  #744, STR #745)
+	- Fl_Window::show(argc, argv) now sets the scheme before
+	  showing the window; this should eliminate any
+	  flickering between the standard and plastic schemes on
+	  startup.
 	- Selected tabs are now drawn slightly larger than
 	  unselected tabs so they stand out more (STR #882)
 	- FL_PLASTIC_DOWN_BOX drew with artifacts (STR #852)

Modified: branches/branch-1.1/src/Fl_arg.cxx
===================================================================
--- branches/branch-1.1/src/Fl_arg.cxx	2005-05-26 13:54:53 UTC (rev 4371)
+++ branches/branch-1.1/src/Fl_arg.cxx	2005-05-26 14:03:44 UTC (rev 4372)
@@ -233,13 +233,15 @@
 
   if (title) {label(title); title = 0;}
   else if (!label()) label(xclass());
-  show();
 
   if (!beenhere) {
     beenhere = 1;
     Fl::scheme(Fl::scheme()); // opens display!  May call Fl::fatal()
   }
 
+  // Show the window AFTER we have set the colors and scheme.
+  show();
+
 #if !defined(WIN32) && !defined(__APPLE__)
   // set the command string, used by state-saving window managers:
   int j;