X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..94acd38ec2ffa3eb0550c69a77eda44bd01c9d2f:/src/gtk/renderer.cpp

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 17fb05abd1..8b097e5c76 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -24,15 +24,12 @@
     #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 "wx/renderer.h"
 
 #ifdef __WXGTK20__
     #include "wx/settings.h"
@@ -76,6 +73,11 @@ public:
                                   wxOrientation orient,
                                   int flags = 0);
 
+    virtual void DrawComboBoxDropButton(wxWindow *win,
+                                        wxDC& dc,
+                                        const wxRect& rect,
+                                        int flags = 0);
+
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 };
 
@@ -107,19 +109,19 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     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_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
     (
-    s_button->style,
+        s_button->style,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
-    NULL,
+        NULL,
         s_button,
         "button",
         dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
@@ -130,13 +132,11 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 
 // 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
 wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {
-#if 1
-
 #define PM_SIZE 8
 
     GtkPizza *pizza = GTK_PIZZA( win->m_wxwindow );
@@ -146,7 +146,6 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
     y = dc.LogicalToDeviceY( y );
     x = dc.LogicalToDeviceX( x );
 
-#if 1
     // This draws the GTK+ 2.2.4 triangle
     x--;
     GdkPoint points[3];
@@ -176,57 +175,6 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
     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 );
-#else
-    // this draws the GTK+ 2.2.3 tree item square    
-    gdk_draw_rectangle( pizza->bin_window,
-        style->base_gc[GTK_STATE_NORMAL], TRUE,
-        x, y, PM_SIZE, PM_SIZE);
-    gdk_draw_rectangle( pizza->bin_window,
-        style->fg_gc[GTK_STATE_NORMAL], FALSE,
-        x, y, PM_SIZE, PM_SIZE);
-
-    gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL],
-        x + 2, y + PM_SIZE / 2, x + PM_SIZE - 2, y + PM_SIZE / 2);
-
-    if ( flags & wxCONTROL_EXPANDED )
-    {
-        gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL],
-               x + PM_SIZE / 2, y + 2,
-               x + PM_SIZE / 2, y + PM_SIZE - 2);
-    }
-#endif    
-    
-    
-#else
-    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;
-
-    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;
-    }
-    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;
-    }
-
-    dc.DrawPolygon(3, button);
-#endif
 }
 
 #endif // GTK 2.0
@@ -285,7 +233,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->m_wxwindow->window )
     {
-        // VZ: this happens on startup -- why?
+        // window not realized yet
         return;
     }
 
@@ -296,12 +244,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     GdkRectangle erase_rect;
     if ( isVert )
     {
-    int h = win->GetClientSize().GetHeight();
+        int h = win->GetClientSize().GetHeight();
     
         rect.x = position;
-        rect.y = h/2 - 14/2;
+        rect.y = 0;
         rect.width = SASH_FULL_SIZE;
-        rect.height = 14;
+        rect.height = h;
     
         erase_rect.x = position;
         erase_rect.y = 0;
@@ -310,12 +258,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     }
     else // horz
     {
-    int w = win->GetClientSize().GetWidth();
+        int w = win->GetClientSize().GetWidth();
     
-        rect.x = w/2 - 14/2;
+        rect.x = 0;
         rect.y = position;
         rect.height = SASH_FULL_SIZE;
-        rect.width = 14;
+        rect.width = w;
     
         erase_rect.y = position;
         erase_rect.x = 0;
@@ -399,3 +347,31 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 #endif // GTK+ 2.x/1.x
 }
 
+void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
+                                            wxDC& dc,
+                                            const wxRect& rect,
+                                            int flags)
+{
+    dc.SetBrush(wxBrush(win->GetBackgroundColour()));
+    dc.SetPen(wxPen(win->GetBackgroundColour()));
+    dc.DrawRectangle(rect);
+
+    int x = (rect.GetWidth()-9)   / 2;
+    int y = (rect.GetHeight()-10) / 2;
+
+    wxPoint pt[] =
+    {
+        wxPoint(x+2, y+3),
+        wxPoint(x+6, y+3),
+        wxPoint(x+6, y+6),
+        wxPoint(x+8, y+6),
+        wxPoint(x+4, y+10),
+        wxPoint(x+0, y+6),
+        wxPoint(x+2, y+6)
+    };
+    dc.SetBrush(wxBrush(win->GetForegroundColour()));
+    dc.SetPen(wxPen(win->GetForegroundColour()));
+    dc.DrawLine(x, y, x+9, y);
+    dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y);
+}
+