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

compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-08 23:35:42 +00:00
parent 8a05370420
commit 984152a6be
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/settings.cpp
View File

@@ -117,7 +117,7 @@ enum wxGtkColourType
wxGTK_BASE 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 // widget style, return true if we did get them, false to use defaults
static bool GetColourFromGTKWidget(int& red, int& green, int& blue, static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
wxGtkWidgetType type = wxGTK_BUTTON, wxGtkWidgetType type = wxGTK_BUTTON,
@@ -223,7 +223,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
//case wxSYS_COLOUR_3DSHADOW: //case wxSYS_COLOUR_3DSHADOW:
if (!g_systemBtnShadowColour) if (!g_systemBtnShadowColour)
{ {
wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
g_systemBtnShadowColour = g_systemBtnShadowColour =
new wxColour((unsigned char) (faceColour.Red() * 0.666), new wxColour((unsigned char) (faceColour.Red() * 0.666),
(unsigned char) (faceColour.Green() * 0.666), (unsigned char) (faceColour.Green() * 0.666),
@@ -315,7 +315,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!g_systemHighlightTextColour) 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) if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
g_systemHighlightTextColour = new wxColour(*wxBLACK); g_systemHighlightTextColour = new wxColour(*wxBLACK);
else else

6
src/gtk1/settings.cpp
View File

@@ -117,7 +117,7 @@ enum wxGtkColourType
wxGTK_BASE 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 // widget style, return true if we did get them, false to use defaults
static bool GetColourFromGTKWidget(int& red, int& green, int& blue, static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
wxGtkWidgetType type = wxGTK_BUTTON, wxGtkWidgetType type = wxGTK_BUTTON,
@@ -223,7 +223,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
//case wxSYS_COLOUR_3DSHADOW: //case wxSYS_COLOUR_3DSHADOW:
if (!g_systemBtnShadowColour) if (!g_systemBtnShadowColour)
{ {
wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
g_systemBtnShadowColour = g_systemBtnShadowColour =
new wxColour((unsigned char) (faceColour.Red() * 0.666), new wxColour((unsigned char) (faceColour.Red() * 0.666),
(unsigned char) (faceColour.Green() * 0.666), (unsigned char) (faceColour.Green() * 0.666),
@@ -315,7 +315,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!g_systemHighlightTextColour) 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) if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
g_systemHighlightTextColour = new wxColour(*wxBLACK); g_systemHighlightTextColour = new wxColour(*wxBLACK);
else else