moving string conversions at one place

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

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 7e527aa59b5eb0221f84f7cd39d36a5a57c2ce73..6e84b6a118ace22e93fde7e61da6fbb933ae4f03 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -36,15 +36,15 @@
 // 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__
+#ifndef __WXUNIVERSAL__
     {
         // As a start, all GUI are desktops.
         ms_screen = wxSYS_SCREEN_DESKTOP;
@@ -52,9 +52,7 @@ wxSystemScreen wxSystemSettings::GetScreen()
 #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;
             
@@ -72,7 +70,7 @@ wxSystemScreen wxSystemSettings::GetScreen()
     return ms_screen;
 }
     
-void wxSystemSettings::SetScreen( wxSystemScreen screen )
+void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }