From 3523b9cf8d3f6fac1f264e57a42d5858d3ac1d04 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 20 Aug 2001 14:46:09 +0000 Subject: [PATCH] fix for wxSYS_COLOUR_LISTBOX colour detection git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/settings.cpp | 14 +++++++++----- src/gtk1/settings.cpp | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index ac4b1ef494..73ad0b87b3 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: gtk/settings.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -106,9 +106,13 @@ static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state, bool ok; if ( def ) { - red = def->bg[state].red; - green = def->bg[state].green; - blue = def->bg[state].blue; + // ok, it's a hack: we really should have different functions to + // access GtkStyle::bg and ::base but as we only use base for listbox + // for now, this code works too + GdkColor *col = type == GTK_BUTTON ? def->bg : def->base; + red = col[state].red; + green = col[state].green; + blue = col[state].blue; ok = TRUE; } diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index ac4b1ef494..73ad0b87b3 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: gtk/settings.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -106,9 +106,13 @@ static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state, bool ok; if ( def ) { - red = def->bg[state].red; - green = def->bg[state].green; - blue = def->bg[state].blue; + // ok, it's a hack: we really should have different functions to + // access GtkStyle::bg and ::base but as we only use base for listbox + // for now, this code works too + GdkColor *col = type == GTK_BUTTON ? def->bg : def->base; + red = col[state].red; + green = col[state].green; + blue = col[state].blue; ok = TRUE; } -- 2.47.2