use image mask colour if any instead of guessing that (0, 0) is always transparent...

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

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 34af54211852539efad3c6b417b6ce21a91deaa0..f5862ba7afb8734bf80cc9f1bceefc21d7d467ed 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -49,16 +49,16 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
         int x = GetMetric( wxSYS_SCREEN_X );
 
         ms_screen = wxSYS_SCREEN_DESKTOP;
         int x = GetMetric( wxSYS_SCREEN_X );
 
         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;
         // This is probably a bug, but VNC seems to report 0
         if (x < 10)
             ms_screen = wxSYS_SCREEN_DESKTOP;


@@ -66,9 +66,27 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
 
     return ms_screen;
 }
 
     return ms_screen;
 }

-    
+

 void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }
 
 void wxSystemSettings::SetScreenType( wxSystemScreenType 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