simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

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

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index c6e3f69cdcd64dd2c375922704165fd8119c9239..65efb88eae9a472a8ee2cfc73ef891a00dac578a 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -26,21 +26,16 @@
 
 #include "wx/renderer.h"
 #include <gtk/gtk.h>
 
 #include "wx/renderer.h"
 #include <gtk/gtk.h>

-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"

 
 #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
+// 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
 
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation


@@ -55,14 +50,6 @@ 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);
-#endif // GTK+ 2.0
-

     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,


@@ -79,6 +66,11 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
                                         const wxRect& rect,
                                         int flags = 0);
 

+    virtual void DrawDropArrow(wxWindow *win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0);
+

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


@@ -86,11 +78,6 @@ 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();
-#endif // GTK+ 2.0

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


@@ -127,28 +114,6 @@ wxRendererGTK::GetButtonWidget()
     return s_button;
 }
 
     return s_button;
 }
 

-#ifdef __WXGTK20__
-
-GtkWidget *
-wxRendererGTK::GetTreeWidget()
-{
-    static GtkWidget *s_tree = NULL;
-    static GtkWidget *s_window = NULL;
-
-    if ( !s_tree )
-    {
-        s_tree = gtk_tree_view_new();
-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-        gtk_widget_realize( s_window );
-        gtk_container_add( GTK_CONTAINER(s_window), s_tree );
-        gtk_widget_realize( s_tree );
-    }
-
-    return s_tree;
-}
-
-#endif // GTK+ 2.0
-

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


@@ -177,66 +142,30 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     );
 }
 
     );
 }
 

-#ifdef __WXGTK20__
-
-// draw a ">" or "v" button
-void
-wxRendererGTK::DrawTreeItemButton(wxWindow* win,
-                                  wxDC& dc, const wxRect& rect, int flags)
-{
-    GtkWidget *tree = GetTreeWidget();
-
-    // 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,
-        GTK_STATE_NORMAL,
-        NULL,
-        tree,
-        "treeview",
-        dc.LogicalToDeviceX(rect.x) + 2,
-        dc.LogicalToDeviceY(rect.y) + 3,
-        flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
-                                   : GTK_EXPANDER_COLLAPSED
-    );
-}
-
-#endif // GTK+ 2.0
-

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

-// all this should probably be read from the current theme settings somehow?
-#ifdef __WXGTK20__
-    // the full sash size
-    static const wxCoord SASH_FULL_SIZE = 5;
-#else // GTK+ 1.x
-    // the full sash width (should be even)
-    static const wxCoord SASH_SIZE = 8;
+// the full sash width (should be even)
+static const wxCoord SASH_SIZE = 8;

 
 

-    // margin around the sash
-    static const wxCoord SASH_MARGIN = 2;
+// margin around the sash
+static const wxCoord SASH_MARGIN = 2;

 
 

-    // the full sash size
-    static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
-#endif // GTK+ 2.x/1.x
+static int GetGtkSplitterFullSize()
+{
+    return SASH_SIZE + SASH_MARGIN;
+}

 
 wxSplitterRenderParams
 
 wxSplitterRenderParams

-wxRendererGTK::GetSplitterParams(const wxWindow * WXUNUSED(win))
+wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))

 {
     // we don't draw any border, hence 0 for the second field
     return wxSplitterRenderParams
            (
 {
     // we don't draw any border, hence 0 for the second field
     return wxSplitterRenderParams
            (

-               SASH_FULL_SIZE,
+               GetGtkSplitterFullSize(),

                0,
                0,

-#ifdef __WXGTK20__
-               true     // hot sensitive
-#else // GTK+ 1.x

                false    // not
                false    // not

-#endif // GTK+ 2.x/1.x

            );
 }
 
            );
 }
 


@@ -255,7 +184,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 WXUNUSED(flags))

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


@@ -263,24 +192,31 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
         return;
     }
 

+    wxCoord full_size = GetGtkSplitterFullSize();
+

     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;

+#if USE_ERASE_RECT

     GdkRectangle erase_rect;
     GdkRectangle erase_rect;

+#endif
+

     if ( isVert )
     {
         int h = win->GetClientSize().GetHeight();
 
         rect.x = position;
         rect.y = 0;
     if ( isVert )
     {
         int h = win->GetClientSize().GetHeight();
 
         rect.x = position;
         rect.y = 0;

-        rect.width = SASH_FULL_SIZE;
+        rect.width = full_size;

         rect.height = h;
 
         rect.height = h;
 

+#if USE_ERASE_RECT

         erase_rect.x = position;
         erase_rect.y = 0;
         erase_rect.x = position;
         erase_rect.y = 0;

-        erase_rect.width = SASH_FULL_SIZE;
+        erase_rect.width = full_size;

         erase_rect.height = h;
         erase_rect.height = h;

+#endif

     }
     else // horz
     {
     }
     else // horz
     {


@@ -288,19 +224,20 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 
         rect.x = 0;
         rect.y = position;
 
         rect.x = 0;
         rect.y = position;

-        rect.height = SASH_FULL_SIZE;
+        rect.height = full_size;

         rect.width = w;
 
         rect.width = w;
 

+#if USE_ERASE_RECT

         erase_rect.y = position;
         erase_rect.x = 0;
         erase_rect.y = position;
         erase_rect.x = 0;

-        erase_rect.height = SASH_FULL_SIZE;
+        erase_rect.height = full_size;

         erase_rect.width = w;
         erase_rect.width = w;

+#endif

     }
 
     }
 

-    // we must erase everything first, otherwise the garbage from the old sash
-    // is left when dragging it
-    //
-    // TODO: is this the right way to draw themed background?
+#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_paint_flat_box
     (
         win->m_wxwindow->style,


@@ -309,30 +246,14 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         GTK_SHADOW_NONE,
         NULL,
         win->m_wxwindow,
         GTK_SHADOW_NONE,
         NULL,
         win->m_wxwindow,

-        (char *)"base", // const_cast
+        (char *)"viewportbin", // const_cast

         erase_rect.x,
         erase_rect.y,
         erase_rect.width,
         erase_rect.height
     );
         erase_rect.x,
         erase_rect.y,
         erase_rect.width,
         erase_rect.height
     );

+#endif

 
 

-#ifdef __WXGTK20__
-    gtk_paint_handle
-    (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
-        GTK_SHADOW_NONE,
-        NULL /* no clipping */,
-        win->m_wxwindow,
-        "paned",
-        rect.x,
-        rect.y,
-        rect.width,
-        rect.height,
-        !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
-    );
-#else // GTK+ 1.x

 
     // leave some margin before sash itself
     position += SASH_MARGIN / 2;
 
     // leave some margin before sash itself
     position += SASH_MARGIN / 2;


@@ -370,47 +291,92 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         isVert ? size.y - 2*SASH_SIZE : position,
         SASH_SIZE, SASH_SIZE
     );
         isVert ? size.y - 2*SASH_SIZE : position,
         SASH_SIZE, SASH_SIZE
     );

-#endif // GTK+ 2.x/1.x

 }
 
 }
 

-void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
-                                            wxDC& dc,
-                                            const wxRect& rect,
-                                            int flags)
+void
+wxRendererGTK::DrawDropArrow(wxWindow *win,
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)

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

-    // device context must inherit from wxWindowDC
-    // (so it must be wxClientDC, wxMemoryDC or wxPaintDC)
+    // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as
+    // a window for gtk_paint_xxx function, then it won't
+    // 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;
 
     wxWindowDC& wdc = (wxWindowDC&)dc;
 

-    // only doing debug-time checking here (it should probably be enough)
+    // only doing debug-time checking here (it should
+    // probably be enough)

     wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
 
     wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
 

+    // draw arrow so that there is even space horizontally
+    // on both sides
+    int arrowX = rect.width/4 + 1;
+    int arrowWidth = rect.width - (arrowX*2);
+
+    // scale arrow's height accoording to the width
+    int arrowHeight = rect.width/3;
+    int arrowY = (rect.height-arrowHeight)/2 +
+                 ((rect.height-arrowHeight) & 1);
+

     GtkStateType state;
 
     GtkStateType state;
 

-    if ( flags & wxCONTROL_CURRENT )
-        state = GTK_STATE_PRELIGHT;
+    if ( flags & wxCONTROL_PRESSED )
+        state = GTK_STATE_ACTIVE;

     else if ( flags & wxCONTROL_DISABLED )
         state = GTK_STATE_INSENSITIVE;
     else if ( flags & wxCONTROL_DISABLED )
         state = GTK_STATE_INSENSITIVE;

+    else if ( flags & wxCONTROL_CURRENT )
+        state = GTK_STATE_PRELIGHT;

     else
         state = GTK_STATE_NORMAL;
 
     else
         state = GTK_STATE_NORMAL;
 

-    // erase background first
-    gtk_paint_box
+    // draw arrow on button
+    gtk_paint_arrow

     (
         button->style,
         wdc.m_window,
         state,
     (
         button->style,
         wdc.m_window,
         state,

-        GTK_SHADOW_NONE,
+        flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,

         NULL,
         button,
         NULL,
         button,

-        "button",
-        rect.x, rect.y, rect.width, rect.height
+        "arrow",
+        GTK_ARROW_DOWN,
+        FALSE,
+        rect.x + arrowX,
+        rect.y + arrowY,
+        arrowWidth,
+        arrowHeight

     );
     );

+}

 
 

-    // draw arrow on button
-    gtk_paint_arrow
+void
+wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
+                                      wxDC& dc,
+                                      const wxRect& rect,
+                                      int flags)
+{
+    GtkWidget *button = GetButtonWidget();
+
+    // for reason why we do this, see DrawDropArrow
+    wxWindowDC& wdc = (wxWindowDC&)dc;
+    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+
+    // draw button
+    GtkStateType state;
+
+    if ( flags & wxCONTROL_PRESSED )
+        state = GTK_STATE_ACTIVE;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = GTK_STATE_INSENSITIVE;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = GTK_STATE_PRELIGHT;
+    else
+        state = GTK_STATE_NORMAL;
+
+    gtk_paint_box

     (
         button->style,
         wdc.m_window,
     (
         button->style,
         wdc.m_window,


@@ -418,10 +384,11 @@ void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         button,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         button,

-        "arrow",
-        GTK_ARROW_DOWN,
-        FALSE,
-        rect.x + 1, rect.y + 1, rect.width - 2, rect.height - 2
+        "button",
+        rect.x, rect.y, rect.width, rect.height

     );
     );

-}

 
 

+    // draw arrow on button
+    DrawDropArrow(win,dc,rect,flags);
+
+}