Move show() after scheme() call in Fl_Window::show(argc, argv) to

eliminate scheme flicker on startup.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4372 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index bcb015e7f..6afa212fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ CHANGES IN FLTK 1.1.7
 
 	- 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)
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx
index ba79f74ac..c6b2e60a7 100644
--- a/src/Fl_arg.cxx
+++ b/src/Fl_arg.cxx
@@ -233,13 +233,15 @@ void Fl_Window::show(int argc, char **argv) {
 
   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;