X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed4b0fdca60e017afe72c55940799ce0fed925f0..47e59154157bb013ce255a4efa7a615574c974f7:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index ef18a54170..f1cd95c856 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -28,20 +28,13 @@ #ifndef WX_PRECOMP #include "wx/window.h" - #include "wx/dc.h" #include "wx/dcclient.h" + #include "wx/settings.h" #endif #include #include "wx/gtk/win_gtk.h" -#include "wx/settings.h" - -// 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 - // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation // ---------------------------------------------------------------------------- @@ -206,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 ); } @@ -223,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 @@ -233,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 @@ -298,9 +295,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, const bool isVert = orient == wxVERTICAL; GdkRectangle rect; -#if USE_ERASE_RECT - GdkRectangle erase_rect; -#endif if ( isVert ) { @@ -310,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 { @@ -326,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 ( @@ -363,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 @@ -521,10 +486,6 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, 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) {