Add some version checks to help compiling on OSX.

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 62d1c47d48cf569bb339fb305545f8291b814d29..7834a390478568913e690f73d03691eabb1d856e 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/renderer.cpp
+// Name:        src/gtk/renderer.cpp

 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -25,22 +25,20 @@
 #endif
 
 #include "wx/renderer.h"
 #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"
     #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
 
 #endif
 

+#include "wx/dcgraph.h"
+#include "wx/gtk/dc.h"
+#include "wx/gtk/private.h"
+
+#include <gtk/gtk.h>
+

 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------


@@ -48,23 +46,24 @@
 class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative
 {
 public:
 class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative
 {
 public:

-
-    // used by DrawHeaderButton and DrawComboBoxDropButton
-    void PrepareButtonDraw();
-

     // draw the header control button (used by wxListCtrl)
     // draw the header control button (used by wxListCtrl)

-    virtual void DrawHeaderButton(wxWindow *win,
+    virtual int  DrawHeaderButton(wxWindow *win,

                                   wxDC& dc,
                                   const wxRect& rect,
                                   wxDC& dc,
                                   const wxRect& rect,

-                                  int flags = 0);
+                                  int flags = 0,
+                                  wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+                                  wxHeaderButtonParams* params = NULL);
+
+    virtual int GetHeaderButtonHeight(wxWindow *win);
+
+    virtual int GetHeaderButtonMargin(wxWindow *win);
+

 
 

-#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);
     // 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,
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,


@@ -82,6 +81,50 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
                                         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 DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags=0);
+
+    virtual void DrawComboBox(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);
+
+    virtual void DrawTextCtrl(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);
+
+    virtual void DrawRadioBitmap(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);
+
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+
+    virtual wxSize GetCheckBoxSize(wxWindow *win);
+

     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 };
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 };
 


@@ -97,139 +140,161 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererGTK;
 }
 
     return s_rendererGTK;
 }
 

-// ----------------------------------------------------------------------------
-// common code
-// ----------------------------------------------------------------------------
+static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
+{
+    GdkWindow* gdk_window = NULL;
+
+#if wxUSE_GRAPHICS_CONTEXT
+    if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
+        gdk_window = win->GTKGetDrawingWindow();
+    else
+#endif
+    {
+#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
+    }

 
 

-static GtkWidget *gs_button = NULL;
-static GtkWidget *gs_window = NULL;
+#if !wxUSE_GRAPHICS_CONTEXT
+    wxUnusedVar(win);
+#endif

 
 

-void
-wxRendererGTK::PrepareButtonDraw()
-{
-    // prepares gs_button and gs_window which are used when
-    // drawing button based elements.
-    wxASSERT ( !gs_button );
-
-    gs_window = gtk_window_new( GTK_WINDOW_POPUP );
-    gtk_widget_realize( gs_window );
-    gs_button = gtk_button_new();
-    gtk_container_add( GTK_CONTAINER(gs_window), gs_button );
-    gtk_widget_realize( gs_button );
+    return gdk_window;

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

-void
+int

 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,

-                                int flags)
+                                int flags,
+                                wxHeaderSortIconType sortArrow,
+                                wxHeaderButtonParams* params)

 {
 
 {
 

-    if (gs_button == NULL)
-        PrepareButtonDraw();
+    GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+    if (flags & wxCONTROL_SPECIAL)
+        button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
+    if (flags & wxCONTROL_DIRTY)
+        button = wxGTKPrivate::GetHeaderButtonWidgetLast();
+
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    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
+    {
+        if (flags & wxCONTROL_CURRENT)
+            state = GTK_STATE_PRELIGHT;
+    }

 
     gtk_paint_box
     (
 
     gtk_paint_box
     (

-        gs_button->style,
-        // FIXME: I suppose GTK_PIZZA(win->m_wxwindow)->bin_window doesn't work with wxMemoryDC.
-        //   Maybe use code similar as in DrawComboBoxDropButton below?
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
+        gtk_widget_get_style(button),
+        gdk_window,
+        state,

         GTK_SHADOW_OUT,
         NULL,
         GTK_SHADOW_OUT,
         NULL,

-        gs_button,
+        button,

         "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

     );
     );

+
+    return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
+}
+
+int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win))
+{
+    GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+
+    GtkRequisition req;
+    GTK_WIDGET_GET_CLASS(button)->size_request(button, &req);
+
+    return req.height;
+}
+
+int wxRendererGTK::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+    wxFAIL_MSG( "GetHeaderButtonMargin() not implemented" );
+    return -1;

 }
 
 }
 

-#ifdef __WXGTK20__

 
 // draw a ">" or "v" button
 
 // draw a ">" or "v" button

-//
-// TODO: replace the code below with gtk_paint_expander()

 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {

-#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 );
-
-    // 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 = wxGTKPrivate::GetTreeWidget();
+
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );

 
 

+    GtkStateType state;

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

-        gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_PRELIGHT], TRUE, points, 3);
+        state = GTK_STATE_PRELIGHT;

     else
     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 );
+        state = GTK_STATE_NORMAL;
+
+    int x_diff = 0;
+    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_diff = rect.width;
+
+    // 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
+    (
+        gtk_widget_get_style(tree),
+        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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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
 
 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
            (
 {
     // we don't draw any border, hence 0 for the second field
     return wxSplitterRenderParams
            (

-               SASH_FULL_SIZE,
+               GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()),

                0,
                0,

-#ifdef __WXGTK20__

                true     // hot sensitive
                true     // hot sensitive

-#else // GTK+ 1.x
-               false    // not
-#endif // GTK+ 2.x/1.x

            );
 }
 
            );
 }
 


@@ -243,191 +308,441 @@ wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
 }
 
 void
 }
 
 void

-wxRendererGTK::DrawSplitterSash(wxWindow *win,
+wxRendererGTK::DrawSplitterSash(wxWindow* win,

                                 wxDC& dc,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,
                                 wxDC& dc,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,

-                                int WXUNUSED_IN_GTK1(flags))
+                                int flags)

 {
 {

-    if ( !win->m_wxwindow->window )
+    if (gtk_widget_get_window(win->m_wxwindow) == NULL)

     {
         // window not realized yet
         return;
     }
 
     {
         // window not realized yet
         return;
     }
 

+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget());
+

     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;

-    GdkRectangle erase_rect;
+

     if ( isVert )
     {
     if ( isVert )
     {

-        int h = win->GetClientSize().GetHeight();
-    

         rect.x = position;
         rect.y = 0;
         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
     {
     }
     else // horz
     {

-        int w = win->GetClientSize().GetWidth();
-    

         rect.x = 0;
         rect.y = position;
         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
     (
     gtk_paint_handle
     (

-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
+        gtk_widget_get_style(win->m_wxwindow),
+        gdk_window,

         flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
         NULL /* no clipping */,
         win->m_wxwindow,
         "paned",
         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,
         rect.width,
         rect.height,

-        !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
+        isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL

     );
     );

-#else // GTK+ 1.x
+}
+
+void
+wxRendererGTK::DrawDropArrow(wxWindow* win,
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)
+{
+    GtkWidget *button = wxGTKPrivate::GetButtonWidget();
+
+    // If we give WX_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 = wxGetGdkWindowForDC(win, dc);
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );

 
 

-    // leave some margin before sash itself
-    position += SASH_MARGIN / 2;
+    // draw arrow so that there is even space horizontally
+    // on both sides
+    int arrowX = rect.width/4 + 1;
+    int arrowWidth = rect.width - (arrowX*2);

 
 

-    // and finally draw it using GTK paint functions
-    typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
-                                                GtkStateType,
-                                                GdkRectangle *, GtkWidget *,
-                                                gchar *,
-                                                gint, gint, gint);
+    // scale arrow's height accoording to the width
+    int arrowHeight = rect.width/3;
+    int arrowY = (rect.height-arrowHeight)/2 +
+                 ((rect.height-arrowHeight) & 1);

 
 

-    GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
+    GtkStateType state;

 
 

-    (*func)
+    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

     (
     (

-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        GTK_STATE_NORMAL,
+        gtk_widget_get_style(button),
+        gdk_window,
+        state,
+        flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,

         NULL,
         NULL,

-        win->m_wxwindow,
-        (char *)"paned", // const_cast
-        0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1
+        button,
+        "arrow",
+        GTK_ARROW_DOWN,
+        FALSE,
+        rect.x + arrowX,
+        rect.y + arrowY,
+        arrowWidth,
+        arrowHeight

     );
     );

+}

 
 

-    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
-    );
-#endif // GTK+ 2.x/1.x
+void
+wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
+                                      wxDC& dc,
+                                      const wxRect& rect,
+                                      int flags)
+{
+    DrawPushButton(win,dc,rect,flags);
+    DrawDropArrow(win,dc,rect);
+}
+
+wxSize
+wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
+{
+    gint indicator_size, indicator_spacing;
+    gtk_widget_style_get(wxGTKPrivate::GetCheckButtonWidget(),
+                         "indicator_size", &indicator_size,
+                         "indicator_spacing", &indicator_spacing,
+                         NULL);
+
+    int size = indicator_size + indicator_spacing * 2;
+    return wxSize(size, size);

 }
 
 }
 

-void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
-                                            wxDC& dc,
-                                            const wxRect& rect,
-                                            int flags)
+void
+wxRendererGTK::DrawCheckBox(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags )

 {
 {

-    if (gs_button == NULL)
-        PrepareButtonDraw();
+    GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();

 
 

-    // device context must inherit from wxWindowDC
-    // (so it must be wxClientDC, wxMemoryDC or wxPaintDC)
-    wxWindowDC& wdc = (wxWindowDC&)dc;
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );

 
 

-    // only doing debug-time checking here (it should probably be enough)
-    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+    gint indicator_size, indicator_spacing;
+    gtk_widget_style_get(button,
+                         "indicator_size", &indicator_size,
+                         "indicator_spacing", &indicator_spacing,
+                         NULL);

 
 

-    GtkStateType state = GTK_STATE_NORMAL;
-    GtkShadowType shadow = GTK_SHADOW_OUT;
+    GtkStateType state;

 
     if ( flags & wxCONTROL_PRESSED )
 
     if ( flags & wxCONTROL_PRESSED )

-        shadow = GTK_SHADOW_IN;
+        state = GTK_STATE_ACTIVE;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;

     else if ( flags & wxCONTROL_CURRENT )
         state = GTK_STATE_PRELIGHT;
     else if ( flags & wxCONTROL_CURRENT )
         state = GTK_STATE_PRELIGHT;

+    else
+        state = GTK_STATE_NORMAL;
+
+    GtkShadowType shadow_type;
+
+    if ( flags & wxCONTROL_UNDETERMINED )
+        shadow_type = GTK_SHADOW_ETCHED_IN;
+    else if ( flags & wxCONTROL_CHECKED )
+        shadow_type = GTK_SHADOW_IN;
+    else
+        shadow_type = GTK_SHADOW_OUT;
+
+    gtk_paint_check
+    (
+        gtk_widget_get_style(button),
+        gdk_window,
+        state,
+        shadow_type,
+        NULL,
+        button,
+        "cellcheck",
+        dc.LogicalToDeviceX(rect.x) + indicator_spacing,
+        dc.LogicalToDeviceY(rect.y) + indicator_spacing,
+        indicator_size, indicator_size
+    );
+}
+
+void
+wxRendererGTK::DrawPushButton(wxWindow* win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags)
+{
+    GtkWidget *button = wxGTKPrivate::GetButtonWidget();
+
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    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_DISABLED )
         state = GTK_STATE_INSENSITIVE;

+    else if ( flags & wxCONTROL_CURRENT )
+        state = GTK_STATE_PRELIGHT;
+    else
+        state = GTK_STATE_NORMAL;

 
     gtk_paint_box
     (
 
     gtk_paint_box
     (

-        gs_button->style,
-        //GTK_PIZZA(wdc->m_window)->bin_window,
-        wdc.m_window,
+        gtk_widget_get_style(button),
+        gdk_window,

         state,
         state,

-        shadow,
+        flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,

         NULL,
         NULL,

-        gs_button,
+        button,

         "button",
         "button",

-        dc.XLOG2DEV(rect.x), rect.y, rect.width, rect.height
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
+        rect.width,
+        rect.height

     );
     );

+}

 
 

-    // draw arrow on button
+void
+wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
+                                     wxDC& dc,
+                                     const wxRect& rect,
+                                     int flags )
+{
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    if (flags & wxCONTROL_SELECTED)
+    {
+        int x_diff = 0;
+        if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+            x_diff = rect.width;
+
+        // the wxCONTROL_FOCUSED state is deduced
+        // directly from the m_wxwindow by GTK+
+        gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()),
+                        gdk_window,
+                        GTK_STATE_SELECTED,
+                        GTK_SHADOW_NONE,
+                        NULL,
+                        win->m_wxwindow,
+                        "cell_even",
+                        dc.LogicalToDeviceX(rect.x) - x_diff,
+                        dc.LogicalToDeviceY(rect.y),
+                        rect.width,
+                        rect.height );
+    }
+
+    if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
+        DrawFocusRect(win, dc, rect, flags);
+}
+
+void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    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( gtk_widget_get_style(win->m_widget),
+                     gdk_window,
+                     state,
+                     NULL,
+                     win->m_wxwindow,
+                     NULL,
+                     dc.LogicalToDeviceX(rect.x),
+                     dc.LogicalToDeviceY(rect.y),
+                     rect.width,
+                     rect.height );
+}

 
 

-    int arr_wid = rect.width/2;
-    int arr_hei = rect.height/2;
-    arr_wid += arr_wid & 1;
-    arr_hei += arr_hei & 1;
+// Uses the theme to draw the border and fill for something like a wxTextCtrl
+void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
+
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+
+    GtkStateType state = GTK_STATE_NORMAL;
+    if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;
+
+    gtk_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0);
+
+    gtk_paint_shadow
+    (
+        gtk_widget_get_style(entry),
+        gdk_window,
+        state,
+        GTK_SHADOW_OUT,
+        NULL,
+        entry,
+        "entry",
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
+        rect.width,
+        rect.height
+  );
+}
+
+// Draw the equivalent of a wxComboBox
+void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
+
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+
+    GtkStateType state = GTK_STATE_NORMAL;
+    if ( flags & wxCONTROL_DISABLED )
+       state = GTK_STATE_INSENSITIVE;
+
+    gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0);
+
+    gtk_paint_shadow
+    (
+        gtk_widget_get_style(combo),
+        gdk_window,
+        state,
+        GTK_SHADOW_OUT,
+        NULL,
+        combo,
+        "combobox",
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
+        rect.width,
+        rect.height
+    );
+
+    wxRect r = rect;
+    int extent = rect.height / 2;
+    r.x += rect.width - extent - extent/2;
+    r.y += extent/2;
+    r.width = extent;
+    r.height = extent;

 
     gtk_paint_arrow
     (
 
     gtk_paint_arrow
     (

-        gs_button->style,
-        //GTK_PIZZA(wdc->m_window)->bin_window,
-        wdc.m_window,
+        gtk_widget_get_style(combo),
+        gdk_window,

         state,
         state,

-        shadow,
+        GTK_SHADOW_OUT,

         NULL,
         NULL,

-        gs_button,
+        combo,

         "arrow",
         GTK_ARROW_DOWN,
         TRUE,
         "arrow",
         GTK_ARROW_DOWN,
         TRUE,

-        dc.XLOG2DEV(rect.x) + (rect.width/2-arr_wid/2) + 1,
-        rect.y + (rect.height/2-arr_hei/2) + 1,
-        arr_wid,
-        arr_hei
+        dc.LogicalToDeviceX(r.x),
+        dc.LogicalToDeviceY(r.y),
+        r.width,
+        r.height

     );
 
     );
 

+    r = rect;
+    r.x += rect.width - 2*extent;
+    r.width = 2;
+
+    gtk_paint_box
+    (
+        gtk_widget_get_style(combo),
+        gdk_window,
+        state,
+        GTK_SHADOW_ETCHED_OUT,
+        NULL,
+        combo,
+        "vseparator",
+        dc.LogicalToDeviceX(r.x),
+        dc.LogicalToDeviceY(r.y+1),
+        r.width,
+        r.height-2
+    );
+}
+
+
+void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
+                           const wxRect& rect, int flags)
+{
+    DrawComboBox( win, dc, rect, flags );

 }
 
 }
 

+
+// Draw a themed radio button
+void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
+
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+
+    GtkShadowType shadow_type = GTK_SHADOW_OUT;
+    if ( flags & wxCONTROL_CHECKED )
+        shadow_type = GTK_SHADOW_IN;
+    else if ( flags & wxCONTROL_UNDETERMINED )
+        shadow_type = GTK_SHADOW_ETCHED_IN;
+
+    GtkStateType state = GTK_STATE_NORMAL;
+    if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;
+    if ( flags & wxCONTROL_PRESSED )
+        state = GTK_STATE_ACTIVE;
+/*
+    Don't know when to set this
+       state_type = GTK_STATE_PRELIGHT;
+*/
+
+    gtk_paint_option
+    (
+        gtk_widget_get_style(button),
+        gdk_window,
+        state,
+        shadow_type,
+        NULL,
+        button,
+        "radiobutton",
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
+        rect.width, rect.height
+    );
+}