Merge branch 'master' into devel

1 files changed, 34 insertions, 35 deletions

diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index db15813..00c50b3 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -401,6 +401,38 @@ wm title $ds9(top) "SAOImage $ds9(title)"
 wm iconname $ds9(top) "SAOImage $ds9(title)"
 wm protocol $ds9(top) WM_DELETE_WINDOW QuitDS9
 
+# set the visual
+set ds9(visual) [winfo visual .]
+set ds9(depth) [winfo depth .]
+
+switch $ds9(wm) {
+    x11 {
+	if {$ds9(depth)==15} {
+	    set ds9(depth) 16
+	}
+	if {$ds9(depth)==32} {
+	    set ds9(depth) 24
+	}
+    } 
+    aqua {
+	if {$ds9(depth)==15} {
+	    set ds9(depth) 16
+	}
+    }
+    win32 {
+	if {$ds9(depth)==32} {
+	    set ds9(depth) 24
+	}
+    }
+}
+
+switch -- $ds9(visual)$ds9(depth) {
+    truecolor8 {}
+    truecolor16 {}
+    truecolor24 {}
+    default {BadVisualError}
+}
+
 # Init Temporary Dir before prefs
 InitTempDir
 
@@ -419,7 +451,7 @@ if {$ds9(prefs)} {
 SetDefaultFont false
 SetDefaultTextFont false
 
-# we need to set certain variables such as color, title, language
+# we need to set certain variables such as debug, title, language, xpa
 ProcessCommandLineSecond
 
 # initialize language
@@ -449,38 +481,6 @@ switch $pds9(language) {
     default {SetLanguage $pds9(language)}
 }
 
-# set the visual
-set ds9(visual) [winfo visual .]
-set ds9(depth) [winfo depth .]
-
-switch $ds9(wm) {
-    x11 {
-	if {$ds9(depth)==15} {
-	    set ds9(depth) 16
-	}
-	if {$ds9(depth)==32} {
-	    set ds9(depth) 24
-	}
-    } 
-    aqua {
-	if {$ds9(depth)==15} {
-	    set ds9(depth) 16
-	}
-    }
-    win32 {
-	if {$ds9(depth)==32} {
-	    set ds9(depth) 24
-	}
-    }
-}
-
-switch -- $ds9(visual)$ds9(depth) {
-    truecolor8 {}
-    truecolor16 {}
-    truecolor24 {}
-    default {BadVisualError}
-}
-
 # create our main frame
 set ds9(main) [ttk::frame ${ds9(top)}ds9]
 pack $ds9(main) -fill both -expand true
@@ -488,8 +488,7 @@ pack $ds9(main) -fill both -expand true
 # Create image canvas
 CreateCanvas
 
-# Create Colorbar-- Create this first, so in case of a private colormap,
-# gui colors will be allocated in the new colormap, not the default colormap
+# Create Colorbar
 CreateColorbar
 
 # Create other parts of the display