GetLabelTop should return the stripped label, for compatibility.

[wxWidgets.git] / src / gtk / renderer.cpp

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 3fd5b8722514eb9cd2148e3d6043d0605de79116..7323cb5c04b58d7882d30868be4b49f1f8b3dcc7 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -181,20 +181,22 @@ wxRendererGTK::GetTreeWidget()
 }
 
 
 }
 
 

-// This one just makes a button be a child of a tree widget.  This is
-// apparently how gtk themes decide to draw column headers differently than
-// normal buttons.
+// This one just gets the button used by the column header.  Although it's
+// still a gtk_button the themes will typically differentiate and draw them
+// differently if the button is in a treeview.

 GtkWidget *
 wxRendererGTK::GetHeaderButtonWidget()
 {
     static GtkWidget *s_button = NULL;
 GtkWidget *
 wxRendererGTK::GetHeaderButtonWidget()
 {
     static GtkWidget *s_button = NULL;

-
+    

     if ( !s_button )
     {
     if ( !s_button )
     {

+        // Get the dummy tree widget, give it a column, and then use the
+        // widget in the column header for the rendering code.

         GtkWidget* treewidget = GetTreeWidget();
         GtkWidget* treewidget = GetTreeWidget();

-        s_button = gtk_button_new();
-        gtk_widget_set_parent( s_button, treewidget );
-        gtk_widget_realize( s_button );
+        GtkTreeViewColumn*  column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+        s_button = column->button;

     }
 
     return s_button;
     }
 
     return s_button;