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

fixed detection of listbox background

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-17 15:17:31 +00:00
parent ee6e1b1d9c
commit 410207c3b3
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/settings.cpp
View File

@@ -168,9 +168,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
def = gtk_widget_get_default_style(); def = gtk_widget_get_default_style();
if (def) if (def)
{ {
int red = def->bg[GTK_STATE_NORMAL].red; int red = def->base[GTK_STATE_NORMAL].red;
int green = def->bg[GTK_STATE_NORMAL].green; int green = def->base[GTK_STATE_NORMAL].green;
int blue = def->bg[GTK_STATE_NORMAL].blue; int blue = def->base[GTK_STATE_NORMAL].blue;
g_systemListBoxColour = g_systemListBoxColour =
new wxColour( red >> SHIFT, new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
@@ -179,7 +179,6 @@ wxColour wxSystemSettings::GetSystemColour( int index )
else else
g_systemListBoxColour = new wxColour(*wxWHITE); g_systemListBoxColour = new wxColour(*wxWHITE);
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
} }
return *g_systemListBoxColour; return *g_systemListBoxColour;
} }

7
src/gtk1/settings.cpp
View File

@@ -168,9 +168,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
def = gtk_widget_get_default_style(); def = gtk_widget_get_default_style();
if (def) if (def)
{ {
int red = def->bg[GTK_STATE_NORMAL].red; int red = def->base[GTK_STATE_NORMAL].red;
int green = def->bg[GTK_STATE_NORMAL].green; int green = def->base[GTK_STATE_NORMAL].green;
int blue = def->bg[GTK_STATE_NORMAL].blue; int blue = def->base[GTK_STATE_NORMAL].blue;
g_systemListBoxColour = g_systemListBoxColour =
new wxColour( red >> SHIFT, new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
@@ -179,7 +179,6 @@ wxColour wxSystemSettings::GetSystemColour( int index )
else else
g_systemListBoxColour = new wxColour(*wxWHITE); g_systemListBoxColour = new wxColour(*wxWHITE);
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
} }
return *g_systemListBoxColour; return *g_systemListBoxColour;
} }