fix setting background color in wxGTK3 with themes which use background images or gradients, fixes #14759

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-11-04 17:39:55 +00:00
parent b29c5ba981
commit 80a77e3c73
2 changed files with 55 additions and 20 deletions

View File

@@ -14,6 +14,7 @@
#ifdef __WXGTK3__
typedef struct _cairo cairo_t;
typedef struct _GtkStyleProvider GtkStyleProvider;
#define WXUNUSED_IN_GTK3(x)
#else
#define WXUNUSED_IN_GTK3(x) x
@@ -373,10 +374,8 @@ protected:
#ifndef __WXGTK3__
// Called by ApplyWidgetStyle (which is called by SetFont() and
// SetXXXColour etc to apply style changed to native widgets) to create
// modified GTK style with non-standard attributes. If forceStyle=true,
// creates empty GtkRcStyle if there are no modifications, otherwise
// returns NULL in such case.
GtkRcStyle *GTKCreateWidgetStyle(bool forceStyle = false);
// modified GTK style with non-standard attributes.
GtkRcStyle* GTKCreateWidgetStyle();
#endif
void GTKApplyWidgetStyle(bool forceStyle = false);
@@ -414,6 +413,8 @@ private:
#ifdef __WXGTK3__
// paint context is stashed here so wxPaintDC can use it
cairo_t* m_paintContext;
// style provider for "background-image"
GtkStyleProvider* m_styleProvider;
public:
cairo_t* GTKPaintContext() const