cleanup for 10.5

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index facd0d59cb077fa54ab07e3cfb3e23ff1be51eb4..2802f9274ac7f6497294bbe14791742e8a89a556 100644 (file)
--- 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:
 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,18 +25,15 @@
 #endif
 
 #include "wx/renderer.h"
 #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
 
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation


@@ -49,7 +46,9 @@ public:
     virtual void DrawHeaderButton(wxWindow *win,
                                   wxDC& dc,
                                   const wxRect& rect,
     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,
 
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,


@@ -78,10 +77,10 @@ public:
                                const wxRect& rect,
                                int flags = 0);
 
                                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,
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,


@@ -92,7 +91,7 @@ public:
                                        wxDC& dc,
                                        const wxRect& rect,
                                        int flags = 0);
                                        wxDC& dc,
                                        const wxRect& rect,
                                        int flags = 0);

-                                       
+

     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 private:
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 private:


@@ -103,8 +102,8 @@ private:
 
     // used by DrawTreeItemButton()
     static GtkWidget *GetTreeWidget();
 
     // used by DrawTreeItemButton()
     static GtkWidget *GetTreeWidget();

-    
-    // used by DrawCheckButton()
+
+    // used by DrawCheckBox()

     static GtkWidget *GetCheckButtonWidget();
 };
 
     static GtkWidget *GetCheckButtonWidget();
 };
 


@@ -186,24 +185,34 @@ void
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,

-                                int flags)
+                                int flags,
+                                wxHeaderSortIconType sortArrow,
+                                wxHeaderButtonParams* params)

 {
 
     GtkWidget *button = GetButtonWidget();
 
 {
 
     GtkWidget *button = GetButtonWidget();
 

+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    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;
+        

     gtk_paint_box
     (
         button->style,
     gtk_paint_box
     (
         button->style,

-        // FIXME: I suppose GTK_PIZZA(win->m_wxwindow)->bin_window doesn't work with wxMemoryDC.
-        //   Maybe use code similar as in DrawPushButton below?
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
+        gdk_window,

         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
         NULL,
         button,
         "button",
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
         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
 }
 
 // draw a ">" or "v" button


@@ -213,23 +222,31 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 {
     GtkWidget *tree = GetTreeWidget();
 
 {
     GtkWidget *tree = GetTreeWidget();
 

+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+

     GtkStateType state;
     if ( flags & wxCONTROL_CURRENT )
         state = GTK_STATE_PRELIGHT;
     else
         state = GTK_STATE_NORMAL;
 
     GtkStateType state;
     if ( flags & wxCONTROL_CURRENT )
         state = GTK_STATE_PRELIGHT;
     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
     (
         tree->style,
     // 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
     (
         tree->style,

-        GTK_PIZZA(win->m_wxwindow)->bin_window,
+        gdk_window,

         state,
         NULL,
         tree,
         "treeview",
         state,
         NULL,
         tree,
         "treeview",

-        dc.LogicalToDeviceX(rect.x) + 2,
+        dc.LogicalToDeviceX(rect.x) + 6 - x_diff,

         dc.LogicalToDeviceY(rect.y) + 3,
         flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
                                    : GTK_EXPANDER_COLLAPSED
         dc.LogicalToDeviceY(rect.y) + 3,
         flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
                                    : GTK_EXPANDER_COLLAPSED


@@ -288,15 +305,16 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
         return;
     }
 

+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+

     wxCoord full_size = GetGtkSplitterFullSize();
 
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
     wxCoord full_size = GetGtkSplitterFullSize();
 
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;

-#if USE_ERASE_RECT
-    GdkRectangle erase_rect;
-#endif

 
     if ( isVert )
     {
 
     if ( isVert )
     {


@@ -306,13 +324,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.y = 0;
         rect.width = full_size;
         rect.height = h;
         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
     {
     }
     else // horz
     {


@@ -322,45 +333,23 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.y = position;
         rect.height = full_size;
         rect.width = w;
         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
     (
         win->m_wxwindow->style,
 
     gtk_paint_handle
     (
         win->m_wxwindow->style,

-        GTK_PIZZA(win->m_wxwindow)->bin_window,
+        gdk_window,

         flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
         NULL /* no clipping */,
         win->m_wxwindow,
         "paned",
         flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
         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
         rect.width,
         rect.height,
         isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL


@@ -368,7 +357,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 }
 
 void
 }
 
 void

-wxRendererGTK::DrawDropArrow(wxWindow *win,
+wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),

                              wxDC& dc,
                              const wxRect& rect,
                              int flags)
                              wxDC& dc,
                              const wxRect& rect,
                              int flags)


@@ -380,11 +369,9 @@ wxRendererGTK::DrawDropArrow(wxWindow *win,
     // work for wxMemoryDC. So that is why we assume wxDC
     // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
     // are derived from it) and use its m_window.
     // work for wxMemoryDC. So that is why we assume wxDC
     // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
     // are derived from it) and use its m_window.

-    wxWindowDC& wdc = (wxWindowDC&)dc;
-
-    // only doing debug-time checking here (it should
-    // probably be enough)
-    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );

 
     // draw arrow so that there is even space horizontally
     // on both sides
 
     // draw arrow so that there is even space horizontally
     // on both sides


@@ -411,7 +398,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *win,
     gtk_paint_arrow
     (
         button->style,
     gtk_paint_arrow
     (
         button->style,

-        wdc.m_window,
+        gdk_window,

         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,


@@ -436,18 +423,19 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     DrawDropArrow(win,dc,rect);
 }
 
     DrawDropArrow(win,dc,rect);
 }
 

-void 
-wxRendererGTK::DrawCheckButton(wxWindow *win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags )
+void
+wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags )

 {
     GtkWidget *button = GetCheckButtonWidget();
 
     // for reason why we do this, see DrawDropArrow
 {
     GtkWidget *button = GetCheckButtonWidget();
 
     // for reason why we do this, see DrawDropArrow

-    wxWindowDC& wdc = (wxWindowDC&)dc;
-    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
-    
+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+

     GtkStateType state;
 
     if ( flags & wxCONTROL_PRESSED )
     GtkStateType state;
 
     if ( flags & wxCONTROL_PRESSED )


@@ -458,24 +446,24 @@ wxRendererGTK::DrawCheckButton(wxWindow *win,
         state = GTK_STATE_PRELIGHT;
     else
         state = GTK_STATE_NORMAL;
         state = GTK_STATE_PRELIGHT;
     else
         state = GTK_STATE_NORMAL;

-    
+

     gtk_paint_check
     (
         button->style,
     gtk_paint_check
     (
         button->style,

-        wdc.m_window,
+        gdk_window,

         state,
         flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         button,
         "cellcheck",
         state,
         flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         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
     );
 }
 
 void
         13, 13
     );
 }
 
 void

-wxRendererGTK::DrawPushButton(wxWindow *win,
+wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),

                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
                               wxDC& dc,
                               const wxRect& rect,
                               int flags)


@@ -483,8 +471,9 @@ wxRendererGTK::DrawPushButton(wxWindow *win,
     GtkWidget *button = GetButtonWidget();
 
     // for reason why we do this, see DrawDropArrow
     GtkWidget *button = GetButtonWidget();
 
     // for reason why we do this, see DrawDropArrow

-    wxWindowDC& wdc = (wxWindowDC&)dc;
-    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );

 
     // draw button
     GtkStateType state;
 
     // draw button
     GtkStateType state;


@@ -501,7 +490,7 @@ wxRendererGTK::DrawPushButton(wxWindow *win,
     gtk_paint_box
     (
         button->style,
     gtk_paint_box
     (
         button->style,

-        wdc.m_window,
+        gdk_window,

         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,


@@ -511,29 +500,29 @@ wxRendererGTK::DrawPushButton(wxWindow *win,
     );
 }
 
     );
 }
 

-void 
+void

 wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
 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)) );
+    GdkWindow* gdk_window = dc.GetGDKWindow();
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );

 
     GtkStateType state;
 
     GtkStateType state;

-       if (flags & wxCONTROL_SELECTED)
+    if (flags & wxCONTROL_SELECTED)

     {
         if (flags & wxCONTROL_FOCUSED)
     {
         if (flags & wxCONTROL_FOCUSED)

-           state = GTK_STATE_SELECTED;
+            state = GTK_STATE_SELECTED;

         else
         else

-           state = GTK_STATE_INSENSITIVE;
+            state = GTK_STATE_INSENSITIVE;

 
         gtk_paint_flat_box( win->m_wxwindow->style,
 
         gtk_paint_flat_box( win->m_wxwindow->style,

-                        GTK_PIZZA(win->m_wxwindow)->bin_window,
+                        gdk_window,

                         state,
                         GTK_SHADOW_NONE,
                         state,
                         GTK_SHADOW_NONE,

-                        NULL, 
+                        NULL,

                         win->m_wxwindow,
                         "treeview",
                         dc.LogicalToDeviceX(rect.x),
                         win->m_wxwindow,
                         "treeview",
                         dc.LogicalToDeviceX(rect.x),


@@ -541,7 +530,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                         rect.width,
                         rect.height );
     }
                         rect.width,
                         rect.height );
     }

-    
+

     if (flags & wxCONTROL_CURRENT)
     {
         dc.SetPen( *wxBLACK_PEN );
     if (flags & wxCONTROL_CURRENT)
     {
         dc.SetPen( *wxBLACK_PEN );


@@ -549,4 +538,3 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
         dc.DrawRectangle( rect );
     }
 }
         dc.DrawRectangle( rect );
     }
 }

-