X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/daebb44c74bdbdc8ce43bd4aa471774d92f35f02..446e69bee56ce978cfb87d80a2f8c0e44ec61658:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index facd0d59cb..f1cd95c856 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: @@ -25,18 +25,15 @@ #endif #include "wx/renderer.h" -#include -#include "wx/gtk/win_gtk.h" -#include "wx/window.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/settings.h" +#ifndef WX_PRECOMP + #include "wx/window.h" + #include "wx/dcclient.h" + #include "wx/settings.h" +#endif -// RR: After a correction to the orientation of the sash -// this doesn't seem to be required anymore and it -// seems to confuse some themes so USE_ERASE_RECT=0 -#define USE_ERASE_RECT 0 +#include +#include "wx/gtk/win_gtk.h" // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -78,10 +75,10 @@ public: const wxRect& rect, int flags = 0); - virtual void DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); virtual void DrawPushButton(wxWindow *win, wxDC& dc, @@ -92,7 +89,7 @@ public: wxDC& dc, const wxRect& rect, int flags = 0); - + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); private: @@ -103,8 +100,8 @@ private: // used by DrawTreeItemButton() static GtkWidget *GetTreeWidget(); - - // used by DrawCheckButton() + + // used by DrawCheckBox() static GtkWidget *GetCheckButtonWidget(); }; @@ -202,7 +199,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, NULL, button, "button", - dc.XLOG2DEV(rect.x), rect.y, rect.width, rect.height + dc.LogicalToDeviceX(rect.x), rect.y, rect.width, rect.height ); } @@ -219,6 +216,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, else state = GTK_STATE_NORMAL; + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; + // VZ: I don't know how to get the size of the expander so as to centre it // in the given rectangle, +2/3 below is just what looks good here... gtk_paint_expander @@ -229,7 +230,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, NULL, tree, "treeview", - dc.LogicalToDeviceX(rect.x) + 2, + dc.LogicalToDeviceX(rect.x) + 2 - x_diff, dc.LogicalToDeviceY(rect.y) + 3, flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED @@ -294,9 +295,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, const bool isVert = orient == wxVERTICAL; GdkRectangle rect; -#if USE_ERASE_RECT - GdkRectangle erase_rect; -#endif if ( isVert ) { @@ -306,13 +304,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.y = 0; rect.width = full_size; rect.height = h; - -#if USE_ERASE_RECT - erase_rect.x = position; - erase_rect.y = 0; - erase_rect.width = full_size; - erase_rect.height = h; -#endif } else // horz { @@ -322,33 +313,11 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.y = position; rect.height = full_size; rect.width = w; - -#if USE_ERASE_RECT - erase_rect.y = position; - erase_rect.x = 0; - erase_rect.height = full_size; - erase_rect.width = w; -#endif } - -#if USE_ERASE_RECT - // we must erase everything first, otherwise the garbage - // from the old sash is left when dragging it - gtk_paint_flat_box - ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_NONE, - NULL, - win->m_wxwindow, - (char *)"viewportbin", // const_cast - erase_rect.x, - erase_rect.y, - erase_rect.width, - erase_rect.height - ); -#endif + + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; gtk_paint_handle ( @@ -359,8 +328,8 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, NULL /* no clipping */, win->m_wxwindow, "paned", - rect.x, - rect.y, + dc.LogicalToDeviceX(rect.x) - x_diff, + dc.LogicalToDeviceY(rect.y), rect.width, rect.height, isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL @@ -436,18 +405,18 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, DrawDropArrow(win,dc,rect); } -void -wxRendererGTK::DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags ) +void +wxRendererGTK::DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) { GtkWidget *button = GetCheckButtonWidget(); // for reason why we do this, see DrawDropArrow wxWindowDC& wdc = (wxWindowDC&)dc; wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); - + GtkStateType state; if ( flags & wxCONTROL_PRESSED ) @@ -458,7 +427,7 @@ wxRendererGTK::DrawCheckButton(wxWindow *win, state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; - + gtk_paint_check ( button->style, @@ -468,8 +437,8 @@ wxRendererGTK::DrawCheckButton(wxWindow *win, NULL, button, "cellcheck", - dc.LogicalToDeviceX(rect.x)+2, - dc.LogicalToDeviceY(rect.y)+3, + dc.LogicalToDeviceX(rect.x)+2, + dc.LogicalToDeviceY(rect.y)+3, 13, 13 ); } @@ -511,29 +480,25 @@ wxRendererGTK::DrawPushButton(wxWindow *win, ); } -void +void wxRendererGTK::DrawItemSelectionRect(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags ) + wxDC& dc, + const wxRect& rect, + int flags ) { - // for reason why we do this, see DrawDropArrow - wxWindowDC& wdc = (wxWindowDC&)dc; - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); - GtkStateType state; - if (flags & wxCONTROL_SELECTED) + if (flags & wxCONTROL_SELECTED) { if (flags & wxCONTROL_FOCUSED) - state = GTK_STATE_SELECTED; + state = GTK_STATE_SELECTED; else - state = GTK_STATE_INSENSITIVE; + state = GTK_STATE_INSENSITIVE; gtk_paint_flat_box( win->m_wxwindow->style, GTK_PIZZA(win->m_wxwindow)->bin_window, state, GTK_SHADOW_NONE, - NULL, + NULL, win->m_wxwindow, "treeview", dc.LogicalToDeviceX(rect.x), @@ -541,7 +506,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, rect.width, rect.height ); } - + if (flags & wxCONTROL_CURRENT) { dc.SetPen( *wxBLACK_PEN ); @@ -549,4 +514,3 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, dc.DrawRectangle( rect ); } } -