Explicitly set "C" locale for the tests using decimal point.

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index fc9c68ba4d32cafc312bc11e9fc307513e32a988..70315318dd1e73a29ec7f11868273b9088f2c4e6 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>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -54,6 +54,11 @@ public:
                                   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,
@@ -96,24 +101,24 @@ public:
                                        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);
 
-    virtual void DrawComboBox(wxWindow* win, 
-                                wxDC& dc, 
-                                const wxRect& rect, 
+    virtual void DrawComboBox(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
                                 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);
 
-    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);
@@ -138,7 +143,7 @@ wxRendererNative& wxRendererNative::GetDefault()
 static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
 {
     GdkWindow* gdk_window = NULL;
-    
+
 #if wxUSE_GRAPHICS_CONTEXT
     if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
         gdk_window = win->GTKGetDrawingWindow();
@@ -154,6 +159,11 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
         gdk_window = dc.GetGDKWindow();
 #endif
     }
+
+#if !wxUSE_GRAPHICS_CONTEXT
+    wxUnusedVar(win);
+#endif
+
     return gdk_window;
 }
 
@@ -173,7 +183,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
     if (flags & wxCONTROL_SPECIAL)
         button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
-    if (flags & wxCONTROL_EXPANDED)
+    if (flags & wxCONTROL_DIRTY)
         button = wxGTKPrivate::GetHeaderButtonWidgetLast();
 
     GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
@@ -208,6 +218,23 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     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,
@@ -450,12 +477,21 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
     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
     (
         button->style,
         gdk_window,
         state,
-        flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+        shadow_type,
         NULL,
         button,
         "cellcheck",
@@ -498,9 +534,9 @@ wxRendererGTK::DrawPushButton(wxWindow* win,
         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
     );
 }
@@ -515,20 +551,17 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
     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)
     {
+        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+
-        state = GTK_STATE_SELECTED;
-
-        gtk_paint_flat_box( win->m_widget->style,
+        gtk_paint_flat_box(wxGTKPrivate::GetTreeWidget()->style,
                         gdk_window,
-                        state,
+                        GTK_STATE_SELECTED,
                         GTK_SHADOW_NONE,
                         NULL,
                         win->m_wxwindow,
@@ -538,29 +571,9 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
                         rect.width,
                         rect.height );
     }
-    else // !wxCONTROL_SELECTED
-    {
-        state = GTK_STATE_NORMAL;
-    }
 
     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)
@@ -597,7 +610,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
     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
@@ -605,7 +618,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     gtk_paint_shadow
     (
-        entry->style, 
+        entry->style,
         gdk_window,
         state,
         GTK_SHADOW_OUT,
@@ -615,7 +628,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width,
-        rect.height 
+        rect.height
   );
 }
 
@@ -629,7 +642,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
     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
@@ -637,7 +650,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     gtk_paint_shadow
     (
-        combo->style, 
+        combo->style,
         gdk_window,
         state,
         GTK_SHADOW_OUT,
@@ -647,7 +660,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width,
-        rect.height 
+        rect.height
     );
 
     wxRect r = rect;
@@ -659,7 +672,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     gtk_paint_arrow
     (
-        combo->style, 
+        combo->style,
         gdk_window,
         state,
         GTK_SHADOW_OUT,
@@ -680,7 +693,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     gtk_paint_box
     (
-        combo->style, 
+        combo->style,
         gdk_window,
         state,
         GTK_SHADOW_ETCHED_OUT,
@@ -701,20 +714,20 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
     DrawComboBox( win, dc, rect, flags );
 }
 
-    
+
 // 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);
-    
+
     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;
@@ -734,8 +747,8 @@ void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect,
         NULL,
         button,
         "radiobutton",
-        dc.LogicalToDeviceX(rect.x), 
-        dc.LogicalToDeviceY(rect.y), 
+        dc.LogicalToDeviceX(rect.x),
+        dc.LogicalToDeviceY(rect.y),
         rect.width, rect.height
     );
 }