X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2c0dabfa61fc435265f3dc71122592d359f0119..9f7948af90ec2e3b907944e7d979f0863910c5c8:/src/x11/settings.cpp diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp index f7d484b3d6..188217ba89 100644 --- a/src/x11/settings.cpp +++ b/src/x11/settings.cpp @@ -13,12 +13,13 @@ // per-user file, which can be edited using a Windows-control-panel clone. // Also they should be documented better. Some are very MS Windows-ish. -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "settings.h" #endif #include "wx/settings.h" #include "wx/gdicmn.h" +#include "wx/x11/private.h" wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) { @@ -123,11 +124,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index) // TODO return 0; case wxSYS_SCREEN_X: - // TODO - return 0; + return DisplayWidth( wxGlobalDisplay(), 0 ); + case wxSYS_SCREEN_Y: - // TODO - return 0; + return DisplayHeight( wxGlobalDisplay(), 0 ); + case wxSYS_FRAMESIZE_X: // TODO return 0;