X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1bf3ad3e8f34361824a801008d47833ac71dcb1..13e245c82a155816885812857c06fff8c88fdb80:/src/gtk/renderer.cpp

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index c6d47c1f4a..de54e0aea2 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/renderer.cpp
+// Name:        src/gtk/renderer.cpp
 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,22 +25,18 @@
 #endif
 
 #include "wx/renderer.h"
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
-
-#include "wx/window.h"
-#include "wx/dc.h"
 
-#ifdef __WXGTK20__
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/dcclient.h"
     #include "wx/settings.h"
-#endif // GTK 2.0
-
-#ifdef __WXGTK20__
-    #define WXUNUSED_IN_GTK1(arg) arg
-#else
-    #define WXUNUSED_IN_GTK1(arg)
+    #include "wx/module.h"
 #endif
 
+#include "wx/gtk/dc.h"
+
+#include <gtk/gtk.h>
+
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
@@ -49,18 +45,18 @@ class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
-    virtual void DrawHeaderButton(wxWindow *win,
+    virtual int  DrawHeaderButton(wxWindow *win,
                                   wxDC& dc,
                                   const wxRect& rect,
-                                  int flags = 0);
+                                  int flags = 0,
+                                  wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+                                  wxHeaderButtonParams* params = NULL);
 
-#ifdef __WXGTK20__
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
                                     int flags = 0);
-#endif // GTK 2.0
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
@@ -73,13 +69,85 @@ public:
                                   wxOrientation orient,
                                   int flags = 0);
 
+    virtual void DrawComboBoxDropButton(wxWindow *win,
+                                        wxDC& dc,
+                                        const wxRect& rect,
+                                        int flags = 0);
+
+    virtual void DrawDropArrow(wxWindow *win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0);
+
+    virtual void DrawCheckBox(wxWindow *win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0);
+
+    virtual void DrawPushButton(wxWindow *win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags = 0);
+
+    virtual void DrawItemSelectionRect(wxWindow *win,
+                                       wxDC& dc,
+                                       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);
+
+    class Module;
+    friend class Module;
+
+private:
+    // used by DrawPushButton and DrawDropArrow
+    static GtkWidget *GetButtonWidget();
+
+    // used by DrawTreeItemButton()
+    static GtkWidget *GetTreeWidget();
+
+    // used by DrawCheckBox()
+    static GtkWidget *GetCheckButtonWidget();
+
+    // Used by DrawHeaderButton
+    static GtkWidget *GetHeaderButtonWidget();
+
+    static GtkWidget* GetSplitterWidget();
+
+    // container for created widgets
+    static GtkContainer* GetContainer();
+    static GtkWidget* ms_container;
+};
+
+// Module for destroying created widgets
+class wxRendererGTK::Module: public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        return true;
+    }
+    virtual void OnExit()
+    {
+        if (wxRendererGTK::ms_container)
+        {
+            GtkWidget* parent =
+                gtk_widget_get_parent(wxRendererGTK::ms_container);
+            gtk_widget_destroy(parent);
+        }
+    }
+    DECLARE_DYNAMIC_CLASS(wxRendererGTK::Module)
 };
+IMPLEMENT_DYNAMIC_CLASS(wxRendererGTK::Module, wxModule)
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+GtkWidget* wxRendererGTK::ms_container;
+
 /* static */
 wxRendererNative& wxRendererNative::GetDefault()
 {
@@ -88,178 +156,240 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererGTK;
 }
 
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+GtkContainer* wxRendererGTK::GetContainer()
+{
+    if (ms_container == NULL)
+    {
+        GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
+        ms_container = gtk_fixed_new();
+        gtk_container_add(GTK_CONTAINER(window), ms_container);
+    }
+    return GTK_CONTAINER(ms_container);
+}
+
+GtkWidget *
+wxRendererGTK::GetButtonWidget()
+{
+    static GtkWidget *s_button = NULL;
+
+    if ( !s_button )
+    {
+        s_button = gtk_button_new();
+        gtk_container_add(GetContainer(), s_button);
+        gtk_widget_realize( s_button );
+    }
+
+    return s_button;
+}
+
+GtkWidget *
+wxRendererGTK::GetCheckButtonWidget()
+{
+    static GtkWidget *s_button = NULL;
+
+    if ( !s_button )
+    {
+        s_button = gtk_check_button_new();
+        gtk_container_add(GetContainer(), s_button);
+        gtk_widget_realize( s_button );
+    }
+
+    return s_button;
+}
+
+GtkWidget *
+wxRendererGTK::GetTreeWidget()
+{
+    static GtkWidget *s_tree = NULL;
+
+    if ( !s_tree )
+    {
+        s_tree = gtk_tree_view_new();
+        gtk_container_add(GetContainer(), s_tree);
+        gtk_widget_realize( s_tree );
+    }
+
+    return s_tree;
+}
+
+// used elsewhere
+GtkWidget *GetEntryWidget()
+{
+    static GtkWidget *s_entry = NULL;
+    static GtkWidget *s_window = NULL;
+
+    if ( !s_entry )
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+        gtk_widget_realize( s_window );
+        s_entry = gtk_entry_new();
+        gtk_container_add( GTK_CONTAINER(s_window), s_entry );
+        gtk_widget_realize( s_entry );
+    }
+
+    return s_entry;
+}
+
+// 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;
+}
+
+GtkWidget* wxRendererGTK::GetSplitterWidget()
+{
+    static GtkWidget* widget;
+    if (widget == NULL)
+    {
+        widget = gtk_vpaned_new();
+        gtk_container_add(GetContainer(), widget);
+        gtk_widget_realize(widget);
+    }
+    return widget;
+}
+
 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------
 
-void
+int
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags)
+                                int flags,
+                                wxHeaderSortIconType sortArrow,
+                                wxHeaderButtonParams* params)
 {
 
-    static GtkWidget *s_button = NULL;
-    static GtkWidget *s_window = NULL;
-    if (s_button == NULL)
+    GtkWidget *button = GetHeaderButtonWidget();
+
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    int x_diff = 0;
+    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_diff = rect.width;
+
+    GtkStateType state = GTK_STATE_NORMAL;
+    if (flags & wxCONTROL_DISABLED)
+        state = GTK_STATE_INSENSITIVE;
+    else
     {
-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-    gtk_widget_realize( s_window );
-    s_button = gtk_button_new();
-    gtk_container_add( GTK_CONTAINER(s_window), s_button );
-    gtk_widget_realize( s_button );
+        if (flags & wxCONTROL_CURRENT)
+            state = GTK_STATE_PRELIGHT;
     }
 
     gtk_paint_box
     (
-    s_button->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
+        button->style,
+        gdk_window,
+        state,
         GTK_SHADOW_OUT,
-    NULL,
-        s_button,
+        NULL,
+        button,
         "button",
-        dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
+        dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
     );
-}
 
-#ifdef __WXGTK20__
+    return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
+}
 
 // draw a ">" or "v" button
-//
-// TODO: isn't there a GTK function to draw it?
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {
-#if 1
-
-#define PM_SIZE 8
-
-    GtkPizza *pizza = GTK_PIZZA( win->m_wxwindow );
-    GtkStyle *style = win->m_widget->style;
-    int x = rect.x;
-    int y = rect.y;
-    y = dc.LogicalToDeviceY( y );
-    x = dc.LogicalToDeviceX( x );
-
-#if 1
-    // This draws the GTK+ 2.2.4 triangle
-    x--;
-    GdkPoint points[3];
-    
-    if ( flags & wxCONTROL_EXPANDED )
-    {
-        points[0].x = x;
-        points[0].y = y + (PM_SIZE + 2) / 6;
-        points[1].x = points[0].x + (PM_SIZE + 2);
-        points[1].y = points[0].y;
-        points[2].x = (points[0].x + (PM_SIZE + 2) / 2);
-        points[2].y = y + 2 * (PM_SIZE + 2) / 3;
-    }
-    else
-    {  
-        points[0].x = x + ((PM_SIZE + 2) / 6 + 2);
-        points[0].y = y - 1;
-        points[1].x = points[0].x;
-        points[1].y = points[0].y + (PM_SIZE + 2);
-        points[2].x = (points[0].x +
-             (2 * (PM_SIZE + 2) / 3 - 1));
-        points[2].y = points[0].y + (PM_SIZE + 2) / 2;
-    }
+    GtkWidget *tree = GetTreeWidget();
+
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
 
+    GtkStateType state;
     if ( flags & wxCONTROL_CURRENT )
-        gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_PRELIGHT], TRUE, points, 3);
+        state = GTK_STATE_PRELIGHT;
     else
-        gdk_draw_polygon( pizza->bin_window, style->base_gc[GTK_STATE_NORMAL], TRUE, points, 3);
-    gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3 );
-#else
-    // this draws the GTK+ 2.2.3 tree item square    
-    gdk_draw_rectangle( pizza->bin_window,
-        style->base_gc[GTK_STATE_NORMAL], TRUE,
-        x, y, PM_SIZE, PM_SIZE);
-    gdk_draw_rectangle( pizza->bin_window,
-        style->fg_gc[GTK_STATE_NORMAL], FALSE,
-        x, y, PM_SIZE, PM_SIZE);
-
-    gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL],
-        x + 2, y + PM_SIZE / 2, x + PM_SIZE - 2, y + PM_SIZE / 2);
-
-    if ( flags & wxCONTROL_EXPANDED )
-    {
-        gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL],
-               x + PM_SIZE / 2, y + 2,
-               x + PM_SIZE / 2, y + PM_SIZE - 2);
-    }
-#endif    
-    
-    
-#else
-    dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT),
-                        wxSOLID));
-    dc.SetPen(*wxBLACK_PEN);
-    wxPoint button[3];
-
-    const wxCoord xMiddle = rect.x + rect.width/2;
-    const wxCoord yMiddle = rect.y + rect.height/2;
+        state = GTK_STATE_NORMAL;
 
-    if ( flags & wxCONTROL_EXPANDED )
-    {
-        button[0].x = rect.GetLeft();
-        button[0].y = yMiddle - 2;
-        button[1].x = rect.GetRight();
-        button[1].y = yMiddle - 2;
-        button[2].x = xMiddle;
-        button[2].y = yMiddle + 3;
-    }
-    else // collapsed
-    {
-        button[0].y = rect.GetBottom();
-        button[0].x = xMiddle - 2;
-        button[1].y = rect.GetTop();
-        button[1].x = xMiddle - 2;
-        button[2].y = yMiddle;
-        button[2].x = xMiddle + 3;
-    }
+    int x_diff = 0;
+    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_diff = rect.width;
 
-    dc.DrawPolygon(3, button);
-#endif
+    // VZ: I don't know how to get the size of the expander so as to centre it
+    //     in the given rectangle, +2/3 below is just what looks good here...
+    gtk_paint_expander
+    (
+        tree->style,
+        gdk_window,
+        state,
+        NULL,
+        tree,
+        "treeview",
+        dc.LogicalToDeviceX(rect.x) + 6 - x_diff,
+        dc.LogicalToDeviceY(rect.y) + 3,
+        flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
+                                   : GTK_EXPANDER_COLLAPSED
+    );
 }
 
-#endif // GTK 2.0
 
 // ----------------------------------------------------------------------------
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 
-// all this should probably be read from the current theme settings somehow?
-#ifdef __WXGTK20__
-    // the full sash size
-    static const wxCoord SASH_FULL_SIZE = 5;
-#else // GTK+ 1.x
-    // the full sash width (should be even)
-    static const wxCoord SASH_SIZE = 8;
-
-    // margin around the sash
-    static const wxCoord SASH_MARGIN = 2;
+static int GetGtkSplitterFullSize(GtkWidget* widget)
+{
+    gint handle_size;
+    gtk_widget_style_get(widget, "handle_size", &handle_size, NULL);
 
-    // the full sash size
-    static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
-#endif // GTK+ 2.x/1.x
+    return handle_size;
+}
 
 wxSplitterRenderParams
-wxRendererGTK::GetSplitterParams(const wxWindow * WXUNUSED(win))
+wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))
 {
     // we don't draw any border, hence 0 for the second field
     return wxSplitterRenderParams
            (
-               SASH_FULL_SIZE,
+               GetGtkSplitterFullSize(GetSplitterWidget()),
                0,
-#ifdef __WXGTK20__
                true     // hot sensitive
-#else // GTK+ 1.x
-               false    // not
-#endif // GTK+ 2.x/1.x
            );
 }
 
@@ -278,7 +408,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,
-                                int WXUNUSED_IN_GTK1(flags))
+                                int flags)
 {
     if ( !win->m_wxwindow->window )
     {
@@ -286,113 +416,316 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    wxCoord full_size = GetGtkSplitterFullSize(GetSplitterWidget());
+
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
-    GdkRectangle erase_rect;
+
     if ( isVert )
     {
-        int h = win->GetClientSize().GetHeight();
-    
         rect.x = position;
         rect.y = 0;
-        rect.width = SASH_FULL_SIZE;
-        rect.height = h;
-    
-        erase_rect.x = position;
-        erase_rect.y = 0;
-        erase_rect.width = SASH_FULL_SIZE;
-        erase_rect.height = h;
+        rect.width = full_size;
+        rect.height = size.y;
     }
     else // horz
     {
-        int w = win->GetClientSize().GetWidth();
-    
         rect.x = 0;
         rect.y = position;
-        rect.height = SASH_FULL_SIZE;
-        rect.width = w;
-    
-        erase_rect.y = position;
-        erase_rect.x = 0;
-        erase_rect.height = SASH_FULL_SIZE;
-        erase_rect.width = w;
+        rect.height = full_size;
+        rect.width = size.x;
     }
 
-    // we must erase everything first, otherwise the garbage from the old sash
-    // is left when dragging it
-    //
-    // TODO: is this the right way to draw themed background?
-    gtk_paint_flat_box
-    (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        GTK_STATE_NORMAL,
-        GTK_SHADOW_NONE,
-        NULL,
-        win->m_wxwindow,
-        (char *)"base", // const_cast
-        erase_rect.x,
-        erase_rect.y,
-        erase_rect.width,
-        erase_rect.height
-    );
+    int x_diff = 0;
+    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_diff = rect.width;
 
-#ifdef __WXGTK20__
     gtk_paint_handle
     (
         win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
+        gdk_window,
         flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
         NULL /* no clipping */,
         win->m_wxwindow,
         "paned",
-        rect.x,
-        rect.y,
+        dc.LogicalToDeviceX(rect.x) - x_diff,
+        dc.LogicalToDeviceY(rect.y),
         rect.width,
         rect.height,
         isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
     );
-#else // GTK+ 1.x
+}
+
+void
+wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)
+{
+    GtkWidget *button = GetButtonWidget();
+
+    // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as
+    // a window for gtk_paint_xxx function, then it won't
+    // work for wxMemoryDC. So that is why we assume wxDC
+    // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
+    // are derived from it) and use its m_window.
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    // draw arrow so that there is even space horizontally
+    // on both sides
+    int arrowX = rect.width/4 + 1;
+    int arrowWidth = rect.width - (arrowX*2);
+
+    // scale arrow's height accoording to the width
+    int arrowHeight = rect.width/3;
+    int arrowY = (rect.height-arrowHeight)/2 +
+                 ((rect.height-arrowHeight) & 1);
+
+    GtkStateType state;
+
+    if ( flags & wxCONTROL_PRESSED )
+        state = GTK_STATE_ACTIVE;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = GTK_STATE_PRELIGHT;
+    else
+        state = GTK_STATE_NORMAL;
+
+    // draw arrow on button
+    gtk_paint_arrow
+    (
+        button->style,
+        gdk_window,
+        state,
+        flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+        NULL,
+        button,
+        "arrow",
+        GTK_ARROW_DOWN,
+        FALSE,
+        rect.x + arrowX,
+        rect.y + arrowY,
+        arrowWidth,
+        arrowHeight
+    );
+}
+
+void
+wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
+                                      wxDC& dc,
+                                      const wxRect& rect,
+                                      int flags)
+{
+    DrawPushButton(win,dc,rect,flags);
+    DrawDropArrow(win,dc,rect);
+}
 
-    // leave some margin before sash itself
-    position += SASH_MARGIN / 2;
+void
+wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags )
+{
+    GtkWidget *button = GetCheckButtonWidget();
+
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
 
-    // and finally draw it using GTK paint functions
-    typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
-                                                GtkStateType,
-                                                GdkRectangle *, GtkWidget *,
-                                                gchar *,
-                                                gint, gint, gint);
+    GtkStateType state;
 
-    GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
+    if ( flags & wxCONTROL_PRESSED )
+        state = GTK_STATE_ACTIVE;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = GTK_STATE_PRELIGHT;
+    else
+        state = GTK_STATE_NORMAL;
 
-    (*func)
+    gtk_paint_check
     (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        GTK_STATE_NORMAL,
+        button->style,
+        gdk_window,
+        state,
+        flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
-        win->m_wxwindow,
-        (char *)"paned", // const_cast
-        0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1
+        button,
+        "cellcheck",
+        dc.LogicalToDeviceX(rect.x)+2,
+        dc.LogicalToDeviceY(rect.y)+3,
+        13, 13
     );
+}
+
+void
+wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags)
+{
+    GtkWidget *button = GetButtonWidget();
+
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    // draw button
+    GtkStateType state;
+
+    if ( flags & wxCONTROL_PRESSED )
+        state = GTK_STATE_ACTIVE;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = GTK_STATE_PRELIGHT;
+    else
+        state = GTK_STATE_NORMAL;
 
     gtk_paint_box
     (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        GTK_STATE_NORMAL,
-        GTK_SHADOW_OUT,
-        (GdkRectangle*) NULL,
-        win->m_wxwindow,
-        (char *)"paned", // const_cast
-        isVert ? position : size.x - 2*SASH_SIZE,
-        isVert ? size.y - 2*SASH_SIZE : position,
-        SASH_SIZE, SASH_SIZE
+        button->style,
+        gdk_window,
+        state,
+        flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+        NULL,
+        button,
+        "button",
+        rect.x, rect.y, rect.width, rect.height
     );
-#endif // GTK+ 2.x/1.x
 }
 
+void
+wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
+                                     wxDC& dc,
+                                     const wxRect& rect,
+                                     int flags )
+{
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    int x_diff = 0;
+    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_diff = rect.width;
+
+    GtkStateType state;
+    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,
+                        gdk_window,
+                        state,
+                        GTK_SHADOW_NONE,
+                        NULL,
+                        win->m_wxwindow,
+                        "cell_even",
+                        dc.LogicalToDeviceX(rect.x) - x_diff,
+                        dc.LogicalToDeviceY(rect.y),
+                        rect.width,
+                        rect.height );
+    }
+    else // !wxCONTROL_SELECTED
+    {
+        state = GTK_STATE_NORMAL;
+    }
+
+    if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
+    {
+        gtk_paint_focus( win->m_widget->style,
+                         gdk_window,
+                         state,
+                         NULL,
+                         win->m_wxwindow,
+                         "treeview",
+                         dc.LogicalToDeviceX(rect.x),
+                         dc.LogicalToDeviceY(rect.y),
+                         rect.width,
+                         rect.height );
+    }
+}
+
+void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    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 );
+}