Removed treelay sample

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

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 93ebe6286de871bd81a4d367cdb8131161bdbf0a..977bc712076ee10aa88a8c1979eebfbf6f01e69c 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
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -44,7 +44,7 @@ wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
 wxSystemScreenType wxSystemSettings::GetScreenType()
 {
     if (ms_screen == wxSYS_SCREEN_NONE)
 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;
     {
         // As a start, all GUI are desktops.
         ms_screen = wxSYS_SCREEN_DESKTOP;


@@ -52,9 +52,7 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
 #else
     {
         // wxUniv will be used on small devices, too.
 #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;
             
 
         ms_screen = wxSYS_SCREEN_DESKTOP;