1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 7e527aa59b5eb0221f84f7cd39d36a5a57c2ce73..90cacfeb9dabb2908a20522ff38e55fa41d0b7da 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -3,8 +3,8 @@
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -15,10 +15,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "settings.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -36,44 +32,57 @@
 // static data
 // ----------------------------------------------------------------------------
 
 // 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)
 {
     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.
     {
         // 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;
 
         ms_screen = wxSYS_SCREEN_DESKTOP;

-            
+

         if (x < 800)
             ms_screen = wxSYS_SCREEN_SMALL;
         if (x < 800)
             ms_screen = wxSYS_SCREEN_SMALL;

-            
+

         if (x < 640)
             ms_screen = wxSYS_SCREEN_PDA;
         if (x < 640)
             ms_screen = wxSYS_SCREEN_PDA;

-            
+

         if (x < 200)
             ms_screen = wxSYS_SCREEN_TINY;
         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;
 }
 
     return ms_screen;
 }

-    
-void wxSystemSettings::SetScreen( wxSystemScreen screen )
+
+void wxSystemSettings::SetScreenType( wxSystemScreenType screen )

 {
     ms_screen = screen;
 }
 
 {
     ms_screen = screen;
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+
+wxColour wxSystemSettings::GetSystemColour(int index)
+{
+    return GetColour((wxSystemColour)index);
+}
+
+wxFont wxSystemSettings::GetSystemFont(int index)
+{
+    return GetFont((wxSystemFont)index);
+}
+
+int wxSystemSettings::GetSystemMetric(int index)
+{
+    return GetMetric((wxSystemMetric)index);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4