X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f91f3a333110fd08795ac3c0551725dd61956a1..02b51ae521db06ef12a3c2a37a5378a9f715e707:/src/gtk/renderer.cpp

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index a25541fe4c..86855f31d5 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -157,6 +157,11 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
         gdk_window = dc.GetGDKWindow();
 #endif
     }
+
+#if !wxUSE_GRAPHICS_CONTEXT
+    wxUnusedVar(win);
+#endif
+
     return gdk_window;
 }
 
@@ -525,6 +530,8 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
                                      const wxRect& rect,
                                      int flags )
 {
+    GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
+    
     GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -533,14 +540,15 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 
-    GtkStateType state;
+    GtkStateType state = GTK_STATE_NORMAL;
+    
     if (flags & wxCONTROL_SELECTED)
     {
         // the wxCONTROL_FOCUSED state is deduced
         // directly from the m_wxwindow by GTK+
         state = GTK_STATE_SELECTED;
 
-        gtk_paint_flat_box( win->m_widget->style,
+        gtk_paint_flat_box( tree->style, // win->m_widget->style,
                         gdk_window,
                         state,
                         GTK_SHADOW_NONE,
@@ -559,7 +567,10 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
 
     if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
     {
-        gtk_paint_focus( win->m_widget->style,
+        if (flags & wxCONTROL_SELECTED)
+            state = GTK_STATE_SELECTED;
+            
+        gtk_paint_focus( tree->style,
                          gdk_window,
                          state,
                          NULL,
@@ -569,7 +580,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
                          // Using "treeview-middle" would fix the warning, but the right
                          // edge of the focus rect is not getting erased properly either.
                          // Better to not specify this detail unless the drawing is fixed.
-                         NULL,
+                         "",
                          dc.LogicalToDeviceX(rect.x),
                          dc.LogicalToDeviceY(rect.y),
                          rect.width,