fixed wxlib Mach-O debug and release compilation

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

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 8c73a876fc8182f37f276af6e4fdf5cca0daad09..61a6b7316571d3e0fbcd321742cd0cb3a55ce244 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -24,20 +24,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
+#include "wx/renderer.h"

 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/window.h"
 #include "wx/dc.h"
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/window.h"
 #include "wx/dc.h"

-#include "wx/renderer.h"

 
 #ifdef __WXGTK20__
     #include "wx/settings.h"
 #endif // GTK 2.0
 
 
 #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
+

 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------


@@ -61,14 +64,16 @@ public:
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,

-                                    const wxRect& rect) ;
+                                    const wxRect& rect,
+                                    int flags = 0);

     virtual void DrawSplitterSash(wxWindow *win,
                                   wxDC& dc,
                                   const wxSize& size,
                                   wxCoord position,
     virtual void DrawSplitterSash(wxWindow *win,
                                   wxDC& dc,
                                   const wxSize& size,
                                   wxCoord position,

-                                  wxOrientation orient);
+                                  wxOrientation orient,
+                                  int flags = 0);

 
 

-    virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);

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


@@ -76,7 +81,7 @@ public:
 // ============================================================================
 
 /* static */
 // ============================================================================
 
 /* static */

-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()

 {
     static wxRendererGTK s_rendererGTK;
 
 {
     static wxRendererGTK s_rendererGTK;
 


@@ -93,16 +98,28 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 const wxRect& rect,
                                 int flags)
 {
                                 const wxRect& rect,
                                 int flags)
 {

+
+    static GtkWidget *s_button = NULL;
+    static GtkWidget *s_window = NULL;
+    if (s_button == NULL)
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+    gtk_widget_realize( s_window );
+    s_button = gtk_button_new();
+    gtk_container_add( GTK_CONTAINER(s_window), s_button );
+    gtk_widget_realize( s_button );
+    }
+

     gtk_paint_box
     (
     gtk_paint_box
     (

-        win->m_wxwindow->style,
+    s_button->style,

         GTK_PIZZA(win->m_wxwindow)->bin_window,
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,

-        (GdkRectangle*) NULL,
-        win->m_wxwindow,
-        (char *)"button", // const_cast
-        dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2
+    NULL,
+        s_button,
+        "button",
+        dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2

     );
 }
 
     );
 }
 


@@ -110,39 +127,49 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 
 // draw a ">" or "v" button
 //
 
 // draw a ">" or "v" button
 //

-// TODO: isn't there a GTK function to draw it?
+// TODO: replace the code below with gtk_paint_expander()

 void
 void

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

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

-    dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT),
-                        wxSOLID));
-    dc.SetPen(*wxBLACK_PEN);
-    wxPoint button[3];
-
-    const wxCoord xMiddle = rect.x + rect.width/2;
-    const wxCoord yMiddle = rect.y + rect.height/2;
-
+#define PM_SIZE 8
+
+    GtkPizza *pizza = GTK_PIZZA( win->m_wxwindow );
+    GtkStyle *style = win->m_widget->style;
+    int x = rect.x;
+    int y = rect.y;
+    y = dc.LogicalToDeviceY( y );
+    x = dc.LogicalToDeviceX( x );
+
+    // This draws the GTK+ 2.2.4 triangle
+    x--;
+    GdkPoint points[3];
+    

     if ( flags & wxCONTROL_EXPANDED )
     {
     if ( flags & wxCONTROL_EXPANDED )
     {

-        button[0].x = rect.GetLeft();
-        button[0].y = yMiddle - 2;
-        button[1].x = rect.GetRight();
-        button[1].y = yMiddle - 2;
-        button[2].x = xMiddle;
-        button[2].y = yMiddle + 3;
+        points[0].x = x;
+        points[0].y = y + (PM_SIZE + 2) / 6;
+        points[1].x = points[0].x + (PM_SIZE + 2);
+        points[1].y = points[0].y;
+        points[2].x = (points[0].x + (PM_SIZE + 2) / 2);
+        points[2].y = y + 2 * (PM_SIZE + 2) / 3;

     }
     }

-    else // collapsed
-    {
-        button[0].y = rect.GetBottom();
-        button[0].x = xMiddle - 2;
-        button[1].y = rect.GetTop();
-        button[1].x = xMiddle - 2;
-        button[2].y = yMiddle;
-        button[2].x = xMiddle + 3;
+    else
+    {  
+        points[0].x = x + ((PM_SIZE + 2) / 6 + 2);
+        points[0].y = y - 1;
+        points[1].x = points[0].x;
+        points[1].y = points[0].y + (PM_SIZE + 2);
+        points[2].x = (points[0].x +
+             (2 * (PM_SIZE + 2) / 3 - 1));
+        points[2].y = points[0].y + (PM_SIZE + 2) / 2;

     }
 
     }
 

-    dc.DrawPolygon(3, button);
+    if ( flags & wxCONTROL_CURRENT )
+        gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_PRELIGHT], TRUE, points, 3);
+    else
+        gdk_draw_polygon( pizza->bin_window, style->base_gc[GTK_STATE_NORMAL], TRUE, points, 3);
+    gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3 );

 }
 
 #endif // GTK 2.0
 }
 
 #endif // GTK 2.0


@@ -151,24 +178,42 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 

-// the full sash width (should be even)
-static const wxCoord SASH_SIZE = 10;
+// 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;
+
+    // margin around the sash
+    static const wxCoord SASH_MARGIN = 2;

 
 

-// margin around the sash
-static const wxCoord SASH_MARGIN = 5;
+    // the full sash size
+    static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
+#endif // GTK+ 2.x/1.x

 
 

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

 {
 {

-    // we don't draw any border, hence 0 for the second field, but we must
-    // leave some margin around the sash
-    return wxPoint(SASH_SIZE + SASH_MARGIN, 0);
+    // we don't draw any border, hence 0 for the second field
+    return wxSplitterRenderParams
+           (
+               SASH_FULL_SIZE,
+               0,
+#ifdef __WXGTK20__
+               true     // hot sensitive
+#else // GTK+ 1.x
+               false    // not
+#endif // GTK+ 2.x/1.x
+           );

 }
 
 void
 wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
                                   wxDC& WXUNUSED(dc),
 }
 
 void
 wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
                                   wxDC& WXUNUSED(dc),

-                                  const wxRect& WXUNUSED(rect))
+                                  const wxRect& WXUNUSED(rect),
+                                  int WXUNUSED(flags))

 {
     // nothing to do
 }
 {
     // nothing to do
 }


@@ -178,49 +223,85 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
                                 wxDC& dc,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxDC& dc,
                                 const wxSize& size,
                                 wxCoord position,

-                                wxOrientation orient)
+                                wxOrientation orient,
+                                int WXUNUSED_IN_GTK1(flags))

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

-        // VZ: this happens on startup -- why?
+        // window not realized yet

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

-    // 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?

     GdkRectangle rect;
     GdkRectangle rect;

+    GdkRectangle erase_rect;

     if ( isVert )
     {
     if ( isVert )
     {

+        int h = win->GetClientSize().GetHeight();
+    

         rect.x = position;
         rect.y = 0;
         rect.x = position;
         rect.y = 0;

-        rect.width = SASH_SIZE + SASH_MARGIN;
-        rect.height = size.y;
+        rect.width = SASH_FULL_SIZE;
+        rect.height = h;
+    
+        erase_rect.x = position;
+        erase_rect.y = 0;
+        erase_rect.width = SASH_FULL_SIZE;
+        erase_rect.height = h;

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

+        int w = win->GetClientSize().GetWidth();
+    

         rect.x = 0;
         rect.y = position;
         rect.x = 0;
         rect.y = position;

-        rect.height = SASH_SIZE + SASH_MARGIN;
-        rect.width = size.x;
+        rect.height = SASH_FULL_SIZE;
+        rect.width = w;
+    
+        erase_rect.y = position;
+        erase_rect.x = 0;
+        erase_rect.height = SASH_FULL_SIZE;
+        erase_rect.width = w;

     }
 
     }
 

+    // 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?

     gtk_paint_flat_box
     (
         win->m_wxwindow->style,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
     gtk_paint_flat_box
     (
         win->m_wxwindow->style,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,

-        &rect,
+        NULL,

         win->m_wxwindow,
         (char *)"base", // const_cast
         win->m_wxwindow,
         (char *)"base", // const_cast

-        0, 0, -1, -1
+        erase_rect.x,
+        erase_rect.y,
+        erase_rect.width,
+        erase_rect.height

     );
 
     );
 

+#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;


@@ -229,11 +310,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
                                                 GtkStateType,
                                                 GdkRectangle *, GtkWidget *,
     typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
                                                 GtkStateType,
                                                 GdkRectangle *, GtkWidget *,

-#ifdef __WXGTK20__
-                                                const gchar *,
-#else

                                                 gchar *,
                                                 gchar *,

-#endif

                                                 gint, gint, gint);
 
     GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
                                                 gint, gint, gint);
 
     GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;


@@ -262,5 +339,6 @@ 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

 }
 
 }