Fix item selection/focus drawing in generic wxListCtrl.

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 77ce8a0a4f8e07bbae384cc9cbbe51e6a187d466..8fff4abf1deea95834c47a811729cd1277e09639 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -30,10 +30,14 @@
     #include "wx/window.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/window.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

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

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include "wx/gtk/win_gtk.h"

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


@@ -43,13 +47,16 @@ class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
 {
 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,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
 
                                   wxDC& dc,
                                   const wxRect& rect,
                                   int flags = 0,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
 

+    virtual int GetHeaderButtonHeight(wxWindow *win);
+
+

     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,


@@ -92,19 +99,31 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
                                        const wxRect& rect,
                                        int flags = 0);
 

-    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+    virtual void DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags=0);

 
 

-private:
-    // FIXME: shouldn't we destroy these windows somewhere?
+    virtual void DrawComboBox(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);

 
 

-    // used by DrawHeaderButton and DrawPushButton
-    static GtkWidget *GetButtonWidget();
+    virtual void DrawTextCtrl(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);

 
 

-    // used by DrawTreeItemButton()
-    static GtkWidget *GetTreeWidget();
+    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);

 
 

-    // used by DrawCheckBox()
-    static GtkWidget *GetCheckButtonWidget();
+    virtual wxSize GetCheckBoxSize(wxWindow *win);
+
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -119,69 +138,38 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererGTK;
 }
 
     return s_rendererGTK;
 }
 

-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-GtkWidget *
-wxRendererGTK::GetButtonWidget()
-{
-    static GtkWidget *s_button = NULL;
-    static GtkWidget *s_window = NULL;
-
-    if ( !s_button )
-    {
-        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 );
-    }
-
-    return s_button;
-}
-
-GtkWidget *
-wxRendererGTK::GetCheckButtonWidget()
+static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)

 {
 {

-    static GtkWidget *s_button = NULL;
-    static GtkWidget *s_window = NULL;
+    GdkWindow* gdk_window = NULL;

 
 

-    if ( !s_button )
+#if wxUSE_GRAPHICS_CONTEXT
+    if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
+        gdk_window = win->GTKGetDrawingWindow();
+    else
+#endif

     {
     {

-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-        gtk_widget_realize( s_window );
-        s_button = gtk_check_button_new();
-        gtk_container_add( GTK_CONTAINER(s_window), s_button );
-        gtk_widget_realize( s_button );
+#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

     }
 
     }
 

-    return s_button;
-}
-
-GtkWidget *
-wxRendererGTK::GetTreeWidget()
-{
-    static GtkWidget *s_tree = NULL;
-    static GtkWidget *s_window = NULL;
-
-    if ( !s_tree )
-    {
-        s_tree = gtk_tree_view_new();
-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-        gtk_widget_realize( s_window );
-        gtk_container_add( GTK_CONTAINER(s_window), s_tree );
-        gtk_widget_realize( s_tree );
-    }
+#if !wxUSE_GRAPHICS_CONTEXT
+    wxUnusedVar(win);
+#endif

 
 

-    return s_tree;
+    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,


@@ -190,21 +178,34 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxHeaderButtonParams* params)
 {
 
                                 wxHeaderButtonParams* params)
 {
 

-    GtkWidget *button = GetButtonWidget();
+    GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+    if (flags & wxCONTROL_SPECIAL)
+        button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
+    if (flags & wxCONTROL_DIRTY)
+        button = wxGTKPrivate::GetHeaderButtonWidgetLast();

 
 

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    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;
     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
     (
         button->style,
         gdk_window,
     gtk_paint_box
     (
         button->style,
         gdk_window,

-        flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
+        state,

         GTK_SHADOW_OUT,
         NULL,
         button,
         GTK_SHADOW_OUT,
         NULL,
         button,


@@ -212,17 +213,28 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
         dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
     );
 
         dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
     );
 

-    DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
+    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;

 }
 
 }
 

+

 // draw a ">" or "v" button
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {
 // draw a ">" or "v" button
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {

-    GtkWidget *tree = GetTreeWidget();
+    GtkWidget *tree = wxGTKPrivate::GetTreeWidget();

 
 

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -258,14 +270,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 

-static int GetGtkSplitterFullSize()
+static int GetGtkSplitterFullSize(GtkWidget* widget)

 {
 {

-    static GtkWidget *s_paned = NULL;
-    if (s_paned == NULL)
-        s_paned = gtk_vpaned_new();
-

     gint handle_size;
     gint handle_size;

-    gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
+    gtk_widget_style_get(widget, "handle_size", &handle_size, NULL);

 
     return handle_size;
 }
 
     return handle_size;
 }


@@ -276,7 +284,7 @@ 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
            (

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

                0,
                true     // hot sensitive
            );
                0,
                true     // hot sensitive
            );


@@ -292,7 +300,7 @@ wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
 }
 
 void
 }
 
 void

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

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


@@ -305,11 +313,11 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
         return;
     }
 

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 

-    wxCoord full_size = GetGtkSplitterFullSize();
+    wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget());

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


@@ -318,23 +326,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 
     if ( isVert )
     {
 
     if ( isVert )
     {

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

         rect.x = position;
         rect.y = 0;
         rect.width = full_size;
         rect.x = position;
         rect.y = 0;
         rect.width = full_size;

-        rect.height = h;
+        rect.height = size.y;

     }
     else // horz
     {
     }
     else // horz
     {

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

         rect.x = 0;
         rect.y = position;
         rect.height = full_size;
         rect.x = 0;
         rect.y = position;
         rect.height = full_size;

-        rect.width = w;
+        rect.width = size.x;

     }
     }

-    
+

     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;


@@ -357,19 +361,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 }
 
 void
 }
 
 void

-wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
+wxRendererGTK::DrawDropArrow(wxWindow* win,

                              wxDC& dc,
                              const wxRect& rect,
                              int flags)
 {
                              wxDC& dc,
                              const wxRect& rect,
                              int flags)
 {

-    GtkWidget *button = GetButtonWidget();
+    GtkWidget *button = wxGTKPrivate::GetButtonWidget();

 
 

-    // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as
+    // 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.
     // 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 = dc.GetGDKWindow();
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -423,19 +427,37 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     DrawDropArrow(win,dc,rect);
 }
 
     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
 void

-wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
+wxRendererGTK::DrawCheckBox(wxWindow* win,

                             wxDC& dc,
                             const wxRect& rect,
                             int flags )
 {
                             wxDC& dc,
                             const wxRect& rect,
                             int flags )
 {

-    GtkWidget *button = GetCheckButtonWidget();
+    GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();

 
 

-    // for reason why we do this, see DrawDropArrow
-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 

+    gint indicator_size, indicator_spacing;
+    gtk_widget_style_get(button,
+                         "indicator_size", &indicator_size,
+                         "indicator_spacing", &indicator_spacing,
+                         NULL);
+

     GtkStateType state;
 
     if ( flags & wxCONTROL_PRESSED )
     GtkStateType state;
 
     if ( flags & wxCONTROL_PRESSED )


@@ -456,22 +478,21 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
         NULL,
         button,
         "cellcheck",
         NULL,
         button,
         "cellcheck",

-        dc.LogicalToDeviceX(rect.x)+2,
-        dc.LogicalToDeviceY(rect.y)+3,
-        13, 13
+        dc.LogicalToDeviceX(rect.x) + indicator_spacing,
+        dc.LogicalToDeviceY(rect.y) + indicator_spacing,
+        indicator_size, indicator_size

     );
 }
 
 void
     );
 }
 
 void

-wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
+wxRendererGTK::DrawPushButton(wxWindow* win,

                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
 {
                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
 {

-    GtkWidget *button = GetButtonWidget();
+    GtkWidget *button = wxGTKPrivate::GetButtonWidget();

 
 

-    // for reason why we do this, see DrawDropArrow
-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -496,51 +517,221 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
         NULL,
         button,
         "button",
         NULL,
         button,
         "button",

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

     );
 }
 
 void
     );
 }
 
 void

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

                                      wxDC& dc,
                                      const wxRect& rect,
                                      int flags )
 {
                                      wxDC& dc,
                                      const wxRect& rect,
                                      int flags )
 {

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 

-    GtkStateType state;

     if (flags & wxCONTROL_SELECTED)
     {
     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+
         // 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(wxGTKPrivate::GetTreeWidget()->style,

                         gdk_window,
                         gdk_window,

-                        state,
+                        GTK_STATE_SELECTED,

                         GTK_SHADOW_NONE,
                         NULL,
                         win->m_wxwindow,
                         "cell_even",
                         GTK_SHADOW_NONE,
                         NULL,
                         win->m_wxwindow,
                         "cell_even",

-                        dc.LogicalToDeviceX(rect.x),
+                        dc.LogicalToDeviceX(rect.x) - x_diff,

                         dc.LogicalToDeviceY(rect.y),
                         rect.width,
                         rect.height );
     }
 
                         dc.LogicalToDeviceY(rect.y),
                         rect.width,
                         rect.height );
     }
 

-    if (flags & wxCONTROL_CURRENT)
-    {
-        gtk_paint_focus( win->m_widget->style, 
-                         gdk_window,
-                         GTK_STATE_SELECTED,
-                         NULL,
-                         win->m_wxwindow,
-                         "treeview",
-                         dc.LogicalToDeviceX(rect.x),
-                         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( win->m_widget->style,
+                     gdk_window,
+                     state,
+                     NULL,
+                     win->m_wxwindow,
+                     NULL,
+                     dc.LogicalToDeviceX(rect.x),
+                     dc.LogicalToDeviceY(rect.y),
+                     rect.width,
+                     rect.height );
+}
+
+// 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;
+
+    if (flags & wxCONTROL_CURRENT )
+        GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS );
+    else
+        GTK_WIDGET_UNSET_FLAGS( entry, GTK_HAS_FOCUS );
+
+    gtk_paint_shadow
+    (
+        entry->style,
+        gdk_window,
+        state,
+        GTK_SHADOW_OUT,
+        NULL,
+        entry,
+        "entry",
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
+        rect.width,
+        rect.height
+  );
+}
+
+// Draw the equivallent 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;
+
+    if (flags & wxCONTROL_CURRENT )
+        GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS );
+    else
+        GTK_WIDGET_UNSET_FLAGS( combo, GTK_HAS_FOCUS );
+
+    gtk_paint_shadow
+    (
+        combo->style,
+        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
+    (
+        combo->style,
+        gdk_window,
+        state,
+        GTK_SHADOW_OUT,
+        NULL,
+        combo,
+        "arrow",
+        GTK_ARROW_DOWN,
+        TRUE,
+        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
+    (
+        combo->style,
+        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
+    (
+        button->style,
+        gdk_window,
+        state,
+        shadow_type,
+        NULL,
+        button,
+        "radiobutton",
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
+        rect.width, rect.height
+    );

 }
 }