Fix typo in last commit

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index e3c002a91a85830502eb841fa704b49c28a53f72..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

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


@@ -36,7 +36,6 @@
 #include "wx/dcgraph.h"
 #include "wx/gtk/dc.h"
 #include "wx/gtk/private.h"
 #include "wx/dcgraph.h"
 #include "wx/gtk/dc.h"
 #include "wx/gtk/private.h"

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

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


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


@@ -97,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);


@@ -139,10 +143,10 @@ wxRendererNative& wxRendererNative::GetDefault()
 static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
 {
     GdkWindow* gdk_window = NULL;
 static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
 {
     GdkWindow* gdk_window = NULL;

-    
+

 #if wxUSE_GRAPHICS_CONTEXT
     if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
 #if wxUSE_GRAPHICS_CONTEXT
     if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )

-        gdk_window = WX_PIZZA(win->m_wxwindow)->m_backing_window;   
+        gdk_window = win->GTKGetDrawingWindow();

     else
 #endif
     {
     else
 #endif
     {


@@ -155,6 +159,11 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
         gdk_window = dc.GetGDKWindow();
 #endif
     }
         gdk_window = dc.GetGDKWindow();
 #endif
     }

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

     return gdk_window;
 }
 
     return gdk_window;
 }
 


@@ -172,6 +181,10 @@ 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(win, dc);
     wxASSERT_MSG( gdk_window,
 
     GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
     wxASSERT_MSG( gdk_window,


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


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


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


@@ -285,7 +315,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
                                 wxOrientation orient,
                                 int flags)
 {
                                 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;


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


@@ -379,7 +409,7 @@ wxRendererGTK::DrawDropArrow(wxWindow* 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,


@@ -447,12 +477,21 @@ wxRendererGTK::DrawCheckBox(wxWindow* 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",


@@ -488,16 +527,16 @@ wxRendererGTK::DrawPushButton(wxWindow* 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
     );
 }
         rect.height
     );
 }


@@ -512,20 +551,17 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
     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,


@@ -535,29 +571,9 @@ 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)


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


@@ -594,15 +610,12 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, 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;

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


@@ -612,11 +625,11 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
         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
+// Draw the equivalent of a wxComboBox

 void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
     GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
 void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
     GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();


@@ -626,15 +639,12 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, 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;

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


@@ -644,7 +654,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
         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;


@@ -656,7 +666,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     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,


@@ -677,7 +687,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     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,


@@ -698,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* win, wxDC& dc, const wxRect& rect, int flags)
+void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)

 {
     GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
 
     GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
 {
     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;
     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;


@@ -724,15 +734,15 @@ void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect,
 
     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
     );
 }