don't test for things which bakefile already tests for (STRIP, RANLIB, INSTALL, WINDR...

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 86ebfa8b4a95c3791b0afafdbd55cb756efb819a..7323cb5c04b58d7882d30868be4b49f1f8b3dcc7 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -97,7 +97,7 @@ public:
 private:
     // FIXME: shouldn't we destroy these windows somewhere?
 
 private:
     // FIXME: shouldn't we destroy these windows somewhere?
 

-    // used by DrawHeaderButton and DrawPushButton
+    // used by DrawPushButton and DrawDropArrow

     static GtkWidget *GetButtonWidget();
 
     // used by DrawTreeItemButton()
     static GtkWidget *GetButtonWidget();
 
     // used by DrawTreeItemButton()


@@ -105,6 +105,9 @@ private:
 
     // used by DrawCheckBox()
     static GtkWidget *GetCheckButtonWidget();
 
     // used by DrawCheckBox()
     static GtkWidget *GetCheckButtonWidget();

+
+    // Used by DrawHeaderButton
+    static GtkWidget *GetHeaderButtonWidget();

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -177,6 +180,28 @@ wxRendererGTK::GetTreeWidget()
     return s_tree;
 }
 
     return s_tree;
 }
 

+
+// 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;
+    
+    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();
+        GtkTreeViewColumn*  column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+        s_button = column->button;
+    }
+
+    return s_button;
+}
+

 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------


@@ -190,8 +215,8 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxHeaderButtonParams* params)
 {
 
                                 wxHeaderButtonParams* params)
 {
 

-    GtkWidget *button = GetButtonWidget();
-
+    GtkWidget *button = GetHeaderButtonWidget();
+    

     GdkWindow* gdk_window = dc.GetGDKWindow();
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
     GdkWindow* gdk_window = dc.GetGDKWindow();
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );


@@ -199,7 +224,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;

-        
+

     gtk_paint_box
     (
         button->style,
     gtk_paint_box
     (
         button->style,


@@ -334,7 +359,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.height = full_size;
         rect.width = w;
     }
         rect.height = full_size;
         rect.width = w;
     }

-    
+

     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;


@@ -533,12 +558,16 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                         rect.width,
                         rect.height );
     }
                         rect.width,
                         rect.height );
     }

+    else // !wxCONTROL_SELECTED
+    {
+        state = GTK_STATE_NORMAL;
+    }

 
     if (flags & wxCONTROL_CURRENT)
     {
 
     if (flags & wxCONTROL_CURRENT)
     {

-        gtk_paint_focus( win->m_widget->style, 
+        gtk_paint_focus( win->m_widget->style,

                          gdk_window,
                          gdk_window,

-                         GTK_STATE_SELECTED,
+                         state,

                          NULL,
                          win->m_wxwindow,
                          "treeview",
                          NULL,
                          win->m_wxwindow,
                          "treeview",