Use wxGtkString here too

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 7c0a375e803e904d49d93fefc9505c69c3aedff2..b60fac28456f5c15fac521be1ace22360d6000f1 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -31,16 +31,7 @@
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-
-#ifdef __WXGTK20__
-    #include "wx/settings.h"
-#endif // GTK 2.0
-
-#ifdef __WXGTK20__
-    #define WXUNUSED_IN_GTK1(arg) arg
-#else
-    #define WXUNUSED_IN_GTK1(arg)
-#endif
+#include "wx/settings.h"

 
 // RR: After a correction to the orientation of the sash
 //     this doesn't seem to be required anymore and it
 
 // RR: After a correction to the orientation of the sash
 //     this doesn't seem to be required anymore and it


@@ -60,13 +51,11 @@ public:
                                   const wxRect& rect,
                                   int flags = 0);
 
                                   const wxRect& rect,
                                   int flags = 0);
 

-#ifdef __WXGTK20__

     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
                                     int flags = 0);
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
                                     int flags = 0);

-#endif // GTK+ 2.0

 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,


@@ -97,10 +86,8 @@ private:
     // used by DrawHeaderButton and DrawComboBoxDropButton
     static GtkWidget *GetButtonWidget();
 
     // used by DrawHeaderButton and DrawComboBoxDropButton
     static GtkWidget *GetButtonWidget();
 

-#ifdef __WXGTK20__

     // used by DrawTreeItemButton()
     static GtkWidget *GetTreeWidget();
     // used by DrawTreeItemButton()
     static GtkWidget *GetTreeWidget();

-#endif // GTK+ 2.0

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -137,8 +124,6 @@ wxRendererGTK::GetButtonWidget()
     return s_button;
 }
 
     return s_button;
 }
 

-#ifdef __WXGTK20__
-

 GtkWidget *
 wxRendererGTK::GetTreeWidget()
 {
 GtkWidget *
 wxRendererGTK::GetTreeWidget()
 {


@@ -157,8 +142,6 @@ wxRendererGTK::GetTreeWidget()
     return s_tree;
 }
 
     return s_tree;
 }
 

-#endif // GTK+ 2.0
-

 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------


@@ -187,8 +170,6 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     );
 }
 
     );
 }
 

-#ifdef __WXGTK20__
-

 // draw a ">" or "v" button
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 // draw a ">" or "v" button
 void
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,


@@ -219,23 +200,13 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
     );
 }
 
     );
 }
 

-#endif // GTK+ 2.0

 
 // ----------------------------------------------------------------------------
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 

-#ifndef __WXGTK20__
-    // the full sash width (should be even)
-    static const wxCoord SASH_SIZE = 8;
-
-    // margin around the sash
-    static const wxCoord SASH_MARGIN = 2;
-#endif // GTK+ 2.x/1.x
-

 static int GetGtkSplitterFullSize()
 {
 static int GetGtkSplitterFullSize()
 {

-#ifdef __WXGTK20__

     static GtkWidget *s_paned = NULL;
     if (s_paned == NULL)
         s_paned = gtk_vpaned_new();
     static GtkWidget *s_paned = NULL;
     if (s_paned == NULL)
         s_paned = gtk_vpaned_new();


@@ -244,9 +215,6 @@ static int GetGtkSplitterFullSize()
     gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
 
     return handle_size;
     gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
 
     return handle_size;

-#else
-    return SASH_SIZE + SASH_MARGIN;
-#endif

 }
 
 wxSplitterRenderParams
 }
 
 wxSplitterRenderParams


@@ -257,11 +225,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))
            (
                GetGtkSplitterFullSize(),
                0,
            (
                GetGtkSplitterFullSize(),
                0,

-#ifdef __WXGTK20__

                true     // hot sensitive
                true     // hot sensitive

-#else // GTK+ 1.x
-               false    // not
-#endif // GTK+ 2.x/1.x

            );
 }
 
            );
 }
 


@@ -280,7 +244,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,

-                                int WXUNUSED_IN_GTK1(flags))
+                                int flags)

 {
     if ( !win->m_wxwindow->window )
     {
 {
     if ( !win->m_wxwindow->window )
     {


@@ -350,7 +314,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     );
 #endif
 
     );
 #endif
 

-#ifdef __WXGTK20__

     gtk_paint_handle
     (
         win->m_wxwindow->style,
     gtk_paint_handle
     (
         win->m_wxwindow->style,


@@ -366,45 +329,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.height,
         isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
     );
         rect.height,
         isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
     );

-#else // GTK+ 1.x
-
-    // leave some margin before sash itself
-    position += SASH_MARGIN / 2;
-
-    // and finally draw it using GTK paint functions
-    typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
-                                                GtkStateType,
-                                                GdkRectangle *, GtkWidget *,
-                                                gchar *,
-                                                gint, gint, gint);
-
-    GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
-
-    (*func)
-    (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        GTK_STATE_NORMAL,
-        NULL,
-        win->m_wxwindow,
-        (char *)"paned", // const_cast
-        0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1
-    );
-
-    gtk_paint_box
-    (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        GTK_STATE_NORMAL,
-        GTK_SHADOW_OUT,
-        (GdkRectangle*) NULL,
-        win->m_wxwindow,
-        (char *)"paned", // const_cast
-        isVert ? position : size.x - 2*SASH_SIZE,
-        isVert ? size.y - 2*SASH_SIZE : position,
-        SASH_SIZE, SASH_SIZE
-    );
-#endif // GTK+ 2.x/1.x

 }
 
 void
 }
 
 void