better fix for #11803, don't set iconized state for hidden window

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index a8eb92b00734e525dc7f46c54276dc16c93206a5..9889c5e4dae1c39c5e778418fb4bf56edfc3e127 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -33,7 +33,9 @@
     #include "wx/module.h"
 #endif
 
     #include "wx/module.h"
 #endif
 

+#include "wx/dcgraph.h"

 #include "wx/gtk/dc.h"
 #include "wx/gtk/dc.h"

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

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


@@ -52,6 +54,9 @@ public:
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
 
                                   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,


@@ -94,60 +99,37 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
                                        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();
+    virtual void DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags=0);

 
 

-    // used by DrawTreeItemButton()
-    static GtkWidget *GetTreeWidget();
+    virtual void DrawComboBox(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);

 
 

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

 
 

-    // Used by DrawHeaderButton
-    static GtkWidget *GetHeaderButtonWidget();
+    virtual void DrawRadioBitmap(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);

 
 

-    static GtkWidget* GetSplitterWidget();
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);

 
 

-    // container for created widgets
-    static GtkContainer* GetContainer();
-    static GtkWidget* ms_container;
-};
+    virtual wxSize GetCheckBoxSize(wxWindow *win);

 
 

-// 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)
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);

 };
 };

-IMPLEMENT_DYNAMIC_CLASS(wxRendererGTK::Module, wxModule)

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-GtkWidget* wxRendererGTK::ms_container;
-

 /* static */
 wxRendererNative& wxRendererNative::GetDefault()
 {
 /* static */
 wxRendererNative& wxRendererNative::GetDefault()
 {


@@ -156,115 +138,31 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererGTK;
 }
 
     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 GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)

 {
 {

-    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;
+    GdkWindow* gdk_window = NULL;

 
 

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

     {
     {

-        // 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;
+#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;
-}
+#if !wxUSE_GRAPHICS_CONTEXT
+    wxUnusedVar(win);
+#endif

 
 

-GtkWidget* wxRendererGTK::GetSplitterWidget()
-{
-    static GtkWidget* widget;
-    if (widget == NULL)
-    {
-        widget = gtk_vpaned_new();
-        gtk_container_add(GetContainer(), widget);
-        gtk_widget_realize(widget);
-    }
-    return widget;
+    return gdk_window;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -280,17 +178,13 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxHeaderButtonParams* params)
 {
 
                                 wxHeaderButtonParams* params)
 {
 

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

 
 

-    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
+    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") );
 


@@ -322,22 +216,25 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     return 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 = 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
+    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") );
 


@@ -387,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(GetSplitterWidget()),
+               GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()),

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


@@ -403,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,


@@ -416,19 +313,11 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
         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
+    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(GetSplitterWidget());
+    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;


@@ -472,27 +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 = 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
+    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") );
 


@@ -546,26 +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();

 
 

-    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
+    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 )


@@ -586,29 +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();

 
 

-    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
+    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") );
 


@@ -633,25 +517,22 @@ 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 = 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
+    GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
+
+    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") );
 


@@ -659,14 +540,15 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 
     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;
 
     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,
                         gdk_window,
                         state,
                         GTK_SHADOW_NONE,


@@ -685,7 +567,10 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
 
     if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
     {
 
     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,
                          gdk_window,
                          state,
                          NULL,


@@ -695,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.
                          // 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,
                          dc.LogicalToDeviceX(rect.x),
                          dc.LogicalToDeviceY(rect.y),
                          rect.width,


@@ -705,15 +590,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
 
 void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
 
 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
+    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") );
 


@@ -734,3 +611,156 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
                      rect.width,
                      rect.height );
 }
                      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
+    );
+}