fix for HP and IBM compilers, calls to static template functions must be qualified

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 3fd5b8722514eb9cd2148e3d6043d0605de79116..1eec14354d61deecb977d03052a9ffdab23ab689 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -92,6 +92,8 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 private:
@@ -181,9 +183,9 @@ 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()
 {
@@ -191,10 +193,12 @@ wxRendererGTK::GetHeaderButtonWidget()
 
     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();
-        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;
@@ -214,7 +218,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 {
 
     GtkWidget *button = GetHeaderButtonWidget();
-    
+
     GdkWindow* gdk_window = dc.GetGDKWindow();
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -575,3 +579,27 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                          rect.height );
     }
 }
+
+void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    GtkStateType state;
+    if (flags & wxCONTROL_SELECTED)
+        state = GTK_STATE_SELECTED;
+    else
+        state = GTK_STATE_NORMAL;
+
+    gtk_paint_focus( win->m_widget->style,
+                     gdk_window,
+                     state,
+                     NULL,
+                     win->m_wxwindow,
+                     NULL,
+                     dc.LogicalToDeviceX(rect.x),
+                     dc.LogicalToDeviceY(rect.y),
+                     rect.width,
+                     rect.height );
+}