X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41fecb4451682f11e352fc5b9b7383f6335322a7..642067e02a202feddc97255f1229e4e7378541d9:/src/common/settcmn.cpp diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp index 93ebe6286d..977bc71207 100644 --- a/src/common/settcmn.cpp +++ b/src/common/settcmn.cpp @@ -4,7 +4,7 @@ // 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) -#ifndef __WXUNIV__ +#ifndef __WXUNIVERSAL__ { // 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. - int x = 0; - int y = 0; - wxGetDisplaySize( &x, &y ); + int x = GetMetric( wxSYS_SCREEN_X ); ms_screen = wxSYS_SCREEN_DESKTOP;