X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/mgl/settings.cpp?ds=sidebyside diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index 76868a7369..93224a6c29 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -1,16 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.h +// Name: src/mgl/settings.cpp // Author: Vaclav Slavik, Robert Roebling // Id: $Id$ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "settings.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,10 +14,13 @@ #endif #include "wx/settings.h" -#include "wx/colour.h" -#include "wx/font.h" -#include "wx/gdicmn.h" -#include "wx/module.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" + #include "wx/font.h" + #include "wx/gdicmn.h" + #include "wx/module.h" +#endif // ---------------------------------------------------------------------------- // global data @@ -33,7 +31,7 @@ static wxFont *gs_fontDefault = NULL; class wxSystemSettingsModule : public wxModule { public: - virtual bool OnInit() { return TRUE; } + virtual bool OnInit() { return true; } virtual void OnExit() { delete gs_fontDefault; @@ -50,7 +48,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule) wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index)) { - // not implemented, the mean is in wxUniversal + // overridden by wxSystemSettings::GetColour in wxUniversal return wxColour(0,0,0); } @@ -70,18 +68,21 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) case wxSYS_DEFAULT_GUI_FONT: { if ( !gs_fontDefault ) - gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial"); + gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial"); return *gs_fontDefault; } default: - return wxNullFont; + { + } } + + return wxNullFont; } -int wxSystemSettingsNative::GetMetric(wxSystemMetric index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) { int val; - + switch (index) { case wxSYS_SCREEN_X: @@ -92,23 +93,27 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index) return val; case wxSYS_VSCROLL_X: case wxSYS_HSCROLL_Y: - return 15; - break; + return 15; default: - wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetMetric not fully implemented")); - return 0; + { + } } + + return -1; // unsupported metric } bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) { switch (index) { - case wxSYS_CAN_ICONIZE_FRAME: - return FALSE; break; + case wxSYS_CAN_ICONIZE_FRAME: case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return FALSE; break; + case wxSYS_TABLET_PRESENT: + return false; + default: - return FALSE; + wxFAIL_MSG( _T("unknown feature") ); } + + return false; }