X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b0b5ba76e7311091f473e5591cb74c05f6912d6..04fa04d8067d235ab45b5bc05b65f0679634b541:/src/x11/settings.cpp?ds=inline diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp index 89485acb90..c8016efec9 100644 --- a/src/x11/settings.cpp +++ b/src/x11/settings.cpp @@ -1,24 +1,27 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: src/x11/settings.cpp // Purpose: wxSettings // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + // TODO: these settings should probably be configurable from some central or // 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. -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "settings.h" +#include "wx/settings.h" + +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" #endif -#include "wx/settings.h" -#include "wx/gdicmn.h" #include "wx/x11/private.h" wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) @@ -27,11 +30,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) { case wxSYS_COLOUR_APPWORKSPACE: return wxColour( 0xc0c0c0 ); - + default: break; } - + // Overridden mostly by wxSystemSettings::GetColour in wxUniversal return *wxWHITE; } @@ -61,8 +64,8 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) // Get a system metric, e.g. scrollbar size int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) { - switch ( index) - { + switch ( index) + { // TODO case wxSYS_MOUSE_BUTTONS: // TODO case wxSYS_BORDER_X: // TODO case wxSYS_BORDER_Y: @@ -83,13 +86,13 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w // TODO case wxSYS_ICONSPACING_Y: // TODO case wxSYS_WINDOWMIN_X: // TODO case wxSYS_WINDOWMIN_Y: - + case wxSYS_SCREEN_X: return DisplayWidth( wxGlobalDisplay(), 0 ); - + case wxSYS_SCREEN_Y: return DisplayHeight( wxGlobalDisplay(), 0 ); - + // TODO case wxSYS_FRAMESIZE_X: // TODO case wxSYS_FRAMESIZE_Y: // TODO case wxSYS_SMALLICON_X: @@ -105,7 +108,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w // TODO case wxSYS_PENWINDOWS_PRESENT: // TODO case wxSYS_SHOW_SOUNDS: // TODO case wxSYS_SWAP_BUTTONS: - + default: return -1; // unsupported metric } @@ -115,11 +118,11 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) { switch (index) { - case wxSYS_CAN_ICONIZE_FRAME: + case wxSYS_CAN_ICONIZE_FRAME: case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return TRUE; - + return true; + default: - return FALSE; + return false; } }