X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/733b9547537671474f633a86b06afc21b6a443fc..2db3b9a6a40343d0a2b6c5008e5ed9768f4a7358:/src/mgl/settings.cpp diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index fb58cf7745..107eb14b12 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 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows licence +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "settings.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,9 +14,13 @@ #endif #include "wx/settings.h" -#include "wx/colour.h" -#include "wx/font.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 @@ -32,11 +31,10 @@ 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; - gs_fontDefault = NULL; + wxDELETE(gs_fontDefault); } private: @@ -47,13 +45,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule) -wxColour wxSystemSettings::GetSystemColour(int WXUNUSED(index)) +wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index)) { - // FIXME_MGL + // overridden by wxSystemSettings::GetColour in wxUniversal return wxColour(0,0,0); } -wxFont wxSystemSettings::GetSystemFont(int index) +wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) { switch (index) { @@ -69,18 +67,21 @@ wxFont wxSystemSettings::GetSystemFont(int 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 wxSystemSettings::GetSystemMetric(int index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) { int val; - + switch (index) { case wxSYS_SCREEN_X: @@ -89,25 +90,26 @@ int wxSystemSettings::GetSystemMetric(int index) case wxSYS_SCREEN_Y: wxDisplaySize(NULL, &val); return val; - case wxSYS_VSCROLL_X: - case wxSYS_HSCROLL_Y: - return 15; - break; default: - wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented")); - return 0; + { + } } + + return -1; // unsupported metric } -bool wxSystemSettings::GetCapability(int index) +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( wxT("unknown feature") ); } + + return false; }