X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..07fa75bc31fd49da3e4bd4a8bf056a96493bf26b:/src/gtk/settings.cpp diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index b3e40b850b..2b774f2a8b 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -2,9 +2,8 @@ // Name: settings.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,6 +13,10 @@ #endif #include "wx/settings.h" +#include "wx/debug.h" + +#include "gdk/gdk.h" +#include "gtk/gtk.h" /* #define wxSYS_COLOUR_SCROLLBAR 0 @@ -60,12 +63,13 @@ wxColour *g_systemHighlightColour = (wxColour *) NULL; wxFont *g_systemFont = (wxFont *) NULL; -void wxSystemSettings::Done() { - wxDELETE(g_systemBtnFaceColour); - wxDELETE(g_systemBtnShadowColour); - wxDELETE(g_systemBtnHighlightColour); - wxDELETE(g_systemHighlightColour); - wxDELETE(g_systemFont); +void wxSystemSettings::Done() +{ + wxDELETE(g_systemBtnFaceColour); + wxDELETE(g_systemBtnShadowColour); + wxDELETE(g_systemBtnHighlightColour); + wxDELETE(g_systemHighlightColour); + wxDELETE(g_systemFont); } wxColour wxSystemSettings::GetSystemColour( int index ) @@ -93,6 +97,7 @@ wxColour wxSystemSettings::GetSystemColour( int index ) } return *g_systemBtnFaceColour; } + case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNSHADOW: { GtkStyle *style = gtk_widget_get_default_style(); @@ -105,7 +110,6 @@ wxColour wxSystemSettings::GetSystemColour( int index ) } return *g_systemBtnShadowColour; } - case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNHIGHLIGHT: { GtkStyle *style = gtk_widget_get_default_style(); @@ -134,6 +138,7 @@ wxColour wxSystemSettings::GetSystemColour( int index ) case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: + case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_INFOTEXT: { return *wxBLACK; @@ -153,36 +158,39 @@ wxColour wxSystemSettings::GetSystemColour( int index ) wxFont wxSystemSettings::GetSystemFont( int index ) { - switch (index) - { - 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: + switch (index) { - if (!g_systemFont) - g_systemFont = new wxFont( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" ); - return *g_systemFont; + 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 (!g_systemFont) + g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); + return *g_systemFont; + } } - } - return wxNullFont; + return wxNullFont; } int wxSystemSettings::GetSystemMetric( int index ) { - switch (index) - { - case wxSYS_SCREEN_X: - return gdk_screen_width(); - case wxSYS_SCREEN_Y: - return gdk_screen_height(); - } - return 0; + switch (index) + { + case wxSYS_SCREEN_X: return gdk_screen_width(); + case wxSYS_SCREEN_Y: return gdk_screen_height(); + case wxSYS_HSCROLL_Y: return 15; + case wxSYS_VSCROLL_X: return 15; + } + + wxCHECK_MSG( index, 0, _T("wxSystemSettings::GetSystemMetric not fully implemented") ); + + return 0; }