Draw listctrls's headers right for themes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 949fe5da1ab740d58d75000a40c508f23984b809..da41f34eba72863cc1405bfe749286d8263793a1 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -101,16 +101,28 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 const wxRect& rect,
                                 int flags)
 {
+
+    static GtkWidget *s_button = NULL;
+    static GtkWidget *s_window = NULL;
+    if (s_button == NULL)
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+       gtk_widget_realize( s_window );
+       s_button = gtk_button_new();
+       gtk_container_add( GTK_CONTAINER(s_window), s_button );
+       gtk_widget_realize( s_button );
+    }
+
     gtk_paint_box
     (
-        win->m_wxwindow->style,
+       s_button->style,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
-        (GdkRectangle*) NULL,
-        win->m_wxwindow,
-        (char *)"button", // const_cast
-        dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2
+       NULL,
+        s_button,
+        "button",
+        dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
     );
 }
 

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 949fe5da1ab740d58d75000a40c508f23984b809..da41f34eba72863cc1405bfe749286d8263793a1 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -101,16 +101,28 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 const wxRect& rect,
                                 int flags)
 {
+
+    static GtkWidget *s_button = NULL;
+    static GtkWidget *s_window = NULL;
+    if (s_button == NULL)
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+       gtk_widget_realize( s_window );
+       s_button = gtk_button_new();
+       gtk_container_add( GTK_CONTAINER(s_window), s_button );
+       gtk_widget_realize( s_button );
+    }
+
     gtk_paint_box
     (
-        win->m_wxwindow->style,
+       s_button->style,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
-        (GdkRectangle*) NULL,
-        win->m_wxwindow,
-        (char *)"button", // const_cast
-        dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2
+       NULL,
+        s_button,
+        "button",
+        dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
     );
 }