From 984152a6be8295008b868e0a1b9d82172aa69aef Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 8 Jan 2002 23:35:42 +0000 Subject: [PATCH] compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/settings.cpp | 6 +++--- src/gtk1/settings.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index d9fb52626c..eab86263f5 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -117,7 +117,7 @@ enum wxGtkColourType wxGTK_BASE }; -// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+ +// wxSystemSettings::GetColour() helper: get the colours from a GTK+ // widget style, return true if we did get them, false to use defaults static bool GetColourFromGTKWidget(int& red, int& green, int& blue, wxGtkWidgetType type = wxGTK_BUTTON, @@ -223,7 +223,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) //case wxSYS_COLOUR_3DSHADOW: if (!g_systemBtnShadowColour) { - wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); + wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE)); g_systemBtnShadowColour = new wxColour((unsigned char) (faceColour.Red() * 0.666), (unsigned char) (faceColour.Green() * 0.666), @@ -315,7 +315,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_HIGHLIGHTTEXT: if (!g_systemHighlightTextColour) { - wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) g_systemHighlightTextColour = new wxColour(*wxBLACK); else diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index d9fb52626c..eab86263f5 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -117,7 +117,7 @@ enum wxGtkColourType wxGTK_BASE }; -// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+ +// wxSystemSettings::GetColour() helper: get the colours from a GTK+ // widget style, return true if we did get them, false to use defaults static bool GetColourFromGTKWidget(int& red, int& green, int& blue, wxGtkWidgetType type = wxGTK_BUTTON, @@ -223,7 +223,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) //case wxSYS_COLOUR_3DSHADOW: if (!g_systemBtnShadowColour) { - wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); + wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE)); g_systemBtnShadowColour = new wxColour((unsigned char) (faceColour.Red() * 0.666), (unsigned char) (faceColour.Green() * 0.666), @@ -315,7 +315,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_HIGHLIGHTTEXT: if (!g_systemHighlightTextColour) { - wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) g_systemHighlightTextColour = new wxColour(*wxBLACK); else -- 2.47.2