X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0f09a2e88168989a36c53e95ed225e2cf3f9ff0..96f5fca9e4fbdea293199ddca960dabb127e270b:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index ada740b307..96af1ef03c 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -25,6 +25,11 @@
 #include "wx/generic/imaglist.h"
 #include "wx/dynarray.h"
 
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#include "wx/gtk/win_gtk.h"
+#endif
+
 #ifndef wxUSE_GENERIC_LIST_EXTENSIONS
 #define wxUSE_GENERIC_LIST_EXTENSIONS 1
 #endif
@@ -1190,6 +1195,15 @@ wxListHeaderWindow::~wxListHeaderWindow( void )
 
 void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 {
+#ifdef __WXGTK__
+    GtkStateType state = GTK_STATE_NORMAL;
+    if (!m_parent->IsEnabled()) state = GTK_STATE_INSENSITIVE;
+    
+    x = dc->XLOG2DEV( x );
+    
+	gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window, state, GTK_SHADOW_OUT,
+		(GdkRectangle*) NULL, m_wxwindow, "button", x-1, y-1, w+2, h+2);
+#else
     const int m_corner = 1;
 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
@@ -1209,6 +1223,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
     dc->DrawRectangle( x, y, 1, h );              // left (outer)
     dc->DrawLine( x, y+h-1, x+1, y+h-1 );
     dc->DrawLine( x+w-1, y, x+w-1, y+1 );
+#endif
 }
 
 // shift the DC origin to match the position of the main window horz
@@ -3004,7 +3019,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     else
     {
         m_lines.Add( line );
-        item.m_itemId = m_lines.GetCount();
+        item.m_itemId = m_lines.GetCount()-1;
     }
 }