Delay checking for the requested sash position until the first

[wxWidgets.git] / src / common / settcmn.cpp

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 7e527aa59b5eb0221f84f7cd39d36a5a57c2ce73..d8d68f8de0c9581447871f3a6cfc19e536001d03 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -15,7 +15,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "settings.h"
 #endif
 
@@ -36,25 +36,17 @@
 // static data
 // ----------------------------------------------------------------------------
 
-wxSystemScreen wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
+wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-wxSystemScreen wxSystemSettings::GetScreen()
+wxSystemScreenType wxSystemSettings::GetScreenType()
 {
     if (ms_screen == wxSYS_SCREEN_NONE)
-#ifndef __WXUNIV__
-    {
-        // As a start, all GUI are desktops.
-        ms_screen = wxSYS_SCREEN_DESKTOP;
-    }
-#else
     {
         // wxUniv will be used on small devices, too.
-        int x = 0;
-        int y = 0;
-        wxGetDisplaySize( &x, &y );
+        int x = GetMetric( wxSYS_SCREEN_X );
 
         ms_screen = wxSYS_SCREEN_DESKTOP;
             
@@ -66,13 +58,16 @@ wxSystemScreen wxSystemSettings::GetScreen()
             
         if (x < 200)
             ms_screen = wxSYS_SCREEN_TINY;
+            
+        // This is probably a bug, but VNC seems to report 0
+        if (x < 10)
+            ms_screen = wxSYS_SCREEN_DESKTOP;
     }
-#endif
 
     return ms_screen;
 }
     
-void wxSystemSettings::SetScreen( wxSystemScreen screen )
+void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }