Fix typo in last commit

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 6a6259289f7e773c58c9537b37a523e61dcb8c18..7834a390478568913e690f73d03691eabb1d856e 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

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

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


@@ -33,6 +33,7 @@
     #include "wx/module.h"
 #endif
 
     #include "wx/module.h"
 #endif
 

+#include "wx/dcgraph.h"

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


@@ -53,6 +54,11 @@ public:
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
 
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
 

+    virtual int GetHeaderButtonHeight(wxWindow *win);
+
+    virtual int GetHeaderButtonMargin(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,


@@ -95,24 +101,24 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
                                        const wxRect& rect,
                                        int flags = 0);
 

-    virtual void DrawChoice(wxWindow* win, 
-                            wxDC& dc, 
-                            const wxRect& rect, 
+    virtual void DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,

                             int flags=0);
 
                             int flags=0);
 

-    virtual void DrawComboBox(wxWindow* win, 
-                                wxDC& dc, 
-                                const wxRect& rect, 
+    virtual void DrawComboBox(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,

                                 int flags=0);
 
                                 int flags=0);
 

-    virtual void DrawTextCtrl(wxWindow* win, 
-                                wxDC& dc, 
-                                const wxRect& rect, 
+    virtual void DrawTextCtrl(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,

                                 int flags=0);
 
                                 int flags=0);
 

-    virtual void DrawRadioButton(wxWindow* win, 
-                                wxDC& dc, 
-                                const wxRect& rect, 
+    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);
                                 int flags=0);
 
     virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);


@@ -134,17 +140,30 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererGTK;
 }
 
     return s_rendererGTK;
 }
 

-static GdkWindow* wxGetGdkWindowForDC(wxDC& dc)
+static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)

 {
     GdkWindow* gdk_window = NULL;
 {
     GdkWindow* gdk_window = NULL;

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

 #if wxUSE_NEW_DC
 #if wxUSE_NEW_DC

-    wxDCImpl *impl = dc.GetImpl();
-    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
-    if (gtk_impl)
-        gdk_window = gtk_impl->GetGDKWindow();
+        wxDCImpl *impl = dc.GetImpl();
+        wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+        if (gtk_impl)
+            gdk_window = gtk_impl->GetGDKWindow();

 #else
 #else

-    gdk_window = dc.GetGDKWindow();
+        gdk_window = dc.GetGDKWindow();

 #endif
 #endif

+    }
+
+#if !wxUSE_GRAPHICS_CONTEXT
+    wxUnusedVar(win);
+#endif
+

     return gdk_window;
 }
 
     return gdk_window;
 }
 


@@ -162,8 +181,12 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 {
 
     GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
 {
 
     GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();

+    if (flags & wxCONTROL_SPECIAL)
+        button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
+    if (flags & wxCONTROL_DIRTY)
+        button = wxGTKPrivate::GetHeaderButtonWidgetLast();

 
 

-    GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+    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") );
 


@@ -182,7 +205,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 
     gtk_paint_box
     (
 
     gtk_paint_box
     (

-        button->style,
+        gtk_widget_get_style(button),

         gdk_window,
         state,
         GTK_SHADOW_OUT,
         gdk_window,
         state,
         GTK_SHADOW_OUT,


@@ -195,6 +218,23 @@ 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;
+}
+
+int wxRendererGTK::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+    wxFAIL_MSG( "GetHeaderButtonMargin() not implemented" );
+    return -1;
+}
+
+

 // draw a ">" or "v" button
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 // draw a ">" or "v" button
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,


@@ -202,7 +242,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 {
     GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
 
 {
     GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
 

-    GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+    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") );
 


@@ -220,7 +260,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
     //     in the given rectangle, +2/3 below is just what looks good here...
     gtk_paint_expander
     (
     //     in the given rectangle, +2/3 below is just what looks good here...
     gtk_paint_expander
     (

-        tree->style,
+        gtk_widget_get_style(tree),

         gdk_window,
         state,
         NULL,
         gdk_window,
         state,
         NULL,


@@ -268,20 +308,20 @@ wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
 }
 
 void
 }
 
 void

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

                                 wxDC& dc,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,
                                 int flags)
 {
                                 wxDC& dc,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,
                                 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(dc);
+    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") );
 


@@ -313,7 +353,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 
     gtk_paint_handle
     (
 
     gtk_paint_handle
     (

-        win->m_wxwindow->style,
+        gtk_widget_get_style(win->m_wxwindow),

         gdk_window,
         flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
         gdk_window,
         flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,


@@ -329,19 +369,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 }
 
 void
 }
 
 void

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

                              wxDC& dc,
                              const wxRect& rect,
                              int flags)
 {
     GtkWidget *button = wxGTKPrivate::GetButtonWidget();
 
                              wxDC& dc,
                              const wxRect& rect,
                              int flags)
 {
     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 = wxGetGdkWindowForDC(dc);
+    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") );
 


@@ -369,7 +409,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
     // draw arrow on button
     gtk_paint_arrow
     (
     // draw arrow on button
     gtk_paint_arrow
     (

-        button->style,
+        gtk_widget_get_style(button),

         gdk_window,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         gdk_window,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,


@@ -409,14 +449,14 @@ wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
 }
 
 void
 }
 
 void

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

                             wxDC& dc,
                             const wxRect& rect,
                             int flags )
 {
     GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
 
                             wxDC& dc,
                             const wxRect& rect,
                             int flags )
 {
     GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
 

-    GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+    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") );
 


@@ -437,12 +477,21 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
     else
         state = GTK_STATE_NORMAL;
 
     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_paint_check
     (

-        button->style,
+        gtk_widget_get_style(button),

         gdk_window,
         state,
         gdk_window,
         state,

-        flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+        shadow_type,

         NULL,
         button,
         "cellcheck",
         NULL,
         button,
         "cellcheck",


@@ -453,14 +502,14 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
 }
 
 void
 }
 
 void

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

                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
 {
     GtkWidget *button = wxGTKPrivate::GetButtonWidget();
 
                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
 {
     GtkWidget *button = wxGTKPrivate::GetButtonWidget();
 

-    GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+    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") );
 


@@ -478,44 +527,41 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
 
     gtk_paint_box
     (
 
     gtk_paint_box
     (

-        button->style,
+        gtk_widget_get_style(button),

         gdk_window,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         button,
         "button",
         gdk_window,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         button,
         "button",

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

         rect.height
     );
 }
 
 void
         rect.height
     );
 }
 
 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 = wxGetGdkWindowForDC(dc);
+    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") );
 

-    int x_diff = 0;
-    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
-        x_diff = rect.width;
-
-    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(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()),

                         gdk_window,
                         gdk_window,

-                        state,
+                        GTK_STATE_SELECTED,

                         GTK_SHADOW_NONE,
                         NULL,
                         win->m_wxwindow,
                         GTK_SHADOW_NONE,
                         NULL,
                         win->m_wxwindow,


@@ -525,34 +571,14 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                         rect.width,
                         rect.height );
     }
                         rect.width,
                         rect.height );
     }

-    else // !wxCONTROL_SELECTED
-    {
-        state = GTK_STATE_NORMAL;
-    }

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

-    {
-        gtk_paint_focus( win->m_widget->style,
-                         gdk_window,
-                         state,
-                         NULL,
-                         win->m_wxwindow,
-                         // Detail "treeview" causes warning with GTK+ 2.12 Clearlooks theme:
-                         // "... no property named `row-ending-details'"
-                         // 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,
-                         rect.height );
-    }
+        DrawFocusRect(win, dc, rect, flags);

 }
 
 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 = wxGetGdkWindowForDC(dc);
+    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") );
 


@@ -562,7 +588,7 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
     else
         state = GTK_STATE_NORMAL;
 
     else
         state = GTK_STATE_NORMAL;
 

-    gtk_paint_focus( win->m_widget->style,
+    gtk_paint_focus( gtk_widget_get_style(win->m_widget),

                      gdk_window,
                      state,
                      NULL,
                      gdk_window,
                      state,
                      NULL,


@@ -575,24 +601,21 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
 }
 
 // Uses the theme to draw the border and fill for something like a wxTextCtrl
 }
 
 // Uses the theme to draw the border and fill for something like a wxTextCtrl

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

 {
     GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
 
 {
     GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
 

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

 
     GtkStateType state = GTK_STATE_NORMAL;
     if ( flags & wxCONTROL_DISABLED )
         state = GTK_STATE_INSENSITIVE;
 
     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_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0);

 
     gtk_paint_shadow
     (
 
     gtk_paint_shadow
     (

-        entry->style, 
+        gtk_widget_get_style(entry),

         gdk_window,
         state,
         GTK_SHADOW_OUT,
         gdk_window,
         state,
         GTK_SHADOW_OUT,


@@ -602,29 +625,26 @@ void wxRendererGTK::DrawTextCtrl(wxWindow*, wxDC& dc, const wxRect& rect, int fl
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width,
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width,

-        rect.height 
+        rect.height

   );
 }
 
   );
 }
 

-// Draw the equivallent of a wxComboBox
-void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
+// Draw the equivalent of a wxComboBox
+void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)

 {
     GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
 
 {
     GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
 

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

 
     GtkStateType state = GTK_STATE_NORMAL;
     if ( flags & wxCONTROL_DISABLED )
        state = GTK_STATE_INSENSITIVE;
 
     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_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0);

 
     gtk_paint_shadow
     (
 
     gtk_paint_shadow
     (

-        combo->style, 
+        gtk_widget_get_style(combo),

         gdk_window,
         state,
         GTK_SHADOW_OUT,
         gdk_window,
         state,
         GTK_SHADOW_OUT,


@@ -634,7 +654,7 @@ void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int fl
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width,
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width,

-        rect.height 
+        rect.height

     );
 
     wxRect r = rect;
     );
 
     wxRect r = rect;


@@ -646,7 +666,7 @@ void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int fl
 
     gtk_paint_arrow
     (
 
     gtk_paint_arrow
     (

-        combo->style, 
+        gtk_widget_get_style(combo),

         gdk_window,
         state,
         GTK_SHADOW_OUT,
         gdk_window,
         state,
         GTK_SHADOW_OUT,


@@ -667,7 +687,7 @@ void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int fl
 
     gtk_paint_box
     (
 
     gtk_paint_box
     (

-        combo->style, 
+        gtk_widget_get_style(combo),

         gdk_window,
         state,
         GTK_SHADOW_ETCHED_OUT,
         gdk_window,
         state,
         GTK_SHADOW_ETCHED_OUT,


@@ -688,20 +708,20 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
     DrawComboBox( win, dc, rect, flags );
 }
 
     DrawComboBox( win, dc, rect, flags );
 }
 

-    
+

 // Draw a themed radio button
 // Draw a themed radio button

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

 {
     GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
 
 {
     GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
 

-    GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
-    
+    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;
     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;
     GtkStateType state = GTK_STATE_NORMAL;
     if ( flags & wxCONTROL_DISABLED )
         state = GTK_STATE_INSENSITIVE;


@@ -714,15 +734,15 @@ void wxRendererGTK::DrawRadioButton(wxWindow*, wxDC& dc, const wxRect& rect, int
 
     gtk_paint_option
     (
 
     gtk_paint_option
     (

-        button->style,
+        gtk_widget_get_style(button),

         gdk_window,
         state,
         shadow_type,
         NULL,
         button,
         "radiobutton",
         gdk_window,
         state,
         shadow_type,
         NULL,
         button,
         "radiobutton",

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

         rect.width, rect.height
     );
 }
         rect.width, rect.height
     );
 }