Connect changed page event after subpages are created so book->SetSelection does...

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index b86627af6357bd485c49fac91450be4c487ba5ae..2c8c94ee1e4a269ad02aa70eb7ead03b8ff97330 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -25,18 +25,15 @@
 #endif
 
 #include "wx/renderer.h"
-#include <gtk/gtk.h>
-#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 <gtk/gtk.h>
+#include "wx/gtk/win_gtk.h"
 
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
@@ -49,7 +46,9 @@ public:
     virtual void DrawHeaderButton(wxWindow *win,
                                   wxDC& dc,
                                   const wxRect& rect,
-                                  int flags = 0);
+                                  int flags = 0,
+                                  wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+                                  wxHeaderButtonParams* params = NULL);
 
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
@@ -186,11 +185,17 @@ void
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags)
+                                int flags,
+                                wxHeaderSortIconType sortArrow,
+                                wxHeaderButtonParams* params)
 {
 
     GtkWidget *button = GetButtonWidget();
 
+    int x_diff = 0;
+    if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_diff = rect.width;
+        
     gtk_paint_box
     (
         button->style,
@@ -202,8 +207,10 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
         NULL,
         button,
         "button",
-        dc.XLOG2DEV(rect.x), rect.y, rect.width, rect.height
+        dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
     );
+
+    DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
 
 // draw a ">" or "v" button
@@ -219,6 +226,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 +240,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 +305,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
-#if USE_ERASE_RECT
-    GdkRectangle erase_rect;
-#endif
 
     if ( isVert )
     {
@@ -306,13 +314,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 +323,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 +338,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,7 +415,7 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     DrawDropArrow(win,dc,rect);
 }
 
-void 
+void
 wxRendererGTK::DrawCheckBox(wxWindow *win,
                             wxDC& dc,
                             const wxRect& rect,
@@ -468,8 +447,8 @@ wxRendererGTK::DrawCheckBox(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,16 +490,12 @@ 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)
     {
@@ -533,7 +508,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                         GTK_PIZZA(win->m_wxwindow)->bin_window,
                         state,
                         GTK_SHADOW_NONE,
-                        NULL, 
+                        NULL,
                         win->m_wxwindow,
                         "treeview",
                         dc.LogicalToDeviceX(rect.x),