fixed some pesky compile warnings, hope this doesn't nuke some

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

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 7e527aa59b5eb0221f84f7cd39d36a5a57c2ce73..93ebe6286de871bd81a4d367cdb8131161bdbf0a 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -36,12 +36,12 @@
 // 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)
 #ifndef __WXUNIV__
 {
     if (ms_screen == wxSYS_SCREEN_NONE)
 #ifndef __WXUNIV__


@@ -72,7 +72,7 @@ wxSystemScreen wxSystemSettings::GetScreen()
     return ms_screen;
 }
     
     return ms_screen;
 }
     

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

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