Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better wxMGL wxSystemSettings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-25 23:34:49 +00:00
parent d0eb7e5699
commit 5acaf196e7
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/mgl/settings.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: settings.h // Name: settings.h
// Author: Vaclav Slavik // Author: Vaclav Slavik, Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence // Licence: wxWindows licence
@@ -55,29 +55,48 @@ wxColour wxSystemSettings::GetSystemColour(int WXUNUSED(index))
wxFont wxSystemSettings::GetSystemFont(int index) wxFont wxSystemSettings::GetSystemFont(int index)
{ {
bool isDefaultRequested = (index == wxSYS_DEFAULT_GUI_FONT); switch (index)
if ( isDefaultRequested && gs_fontDefault )
{ {
case wxSYS_OEM_FIXED_FONT:
case wxSYS_ANSI_FIXED_FONT:
case wxSYS_SYSTEM_FIXED_FONT:
{
return *wxNORMAL_FONT;
}
case wxSYS_ANSI_VAR_FONT:
case wxSYS_SYSTEM_FONT:
case wxSYS_DEVICE_DEFAULT_FONT:
case wxSYS_DEFAULT_GUI_FONT:
{
if ( !gs_fontDefault )
gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial");
return *gs_fontDefault; return *gs_fontDefault;
} }
default:
// FIXME_MGL return wxNullFont;
wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial");
if ( isDefaultRequested )
{
// if we got here it means we hadn't cached it yet - do now
gs_fontDefault = new wxFont(font);
} }
return font;
} }
int wxSystemSettings::GetSystemMetric(int WXUNUSED(index)) int wxSystemSettings::GetSystemMetric(int WXUNUSED(index))
{ {
// FIXME_MGL int val;
return 1;
switch (index)
{
case wxSYS_SCREEN_X:
wxDisplaySize(&val, NULL);
return val;
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;
}
} }
bool wxSystemSettings::GetCapability(int index) bool wxSystemSettings::GetCapability(int index)