Better alphabetized the event handler macros

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

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index b0e1e8c73087e39899c822f08f1b5c4731240d5c..aa02feb1935a5fa4b989927b7e4e98d9d8838efe 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>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -107,19 +107,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
@@ -132,9 +132,72 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 //
 // TODO: isn't there a GTK function to draw it?
 void
-wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
+wxRendererGTK::DrawTreeItemButton(wxWindow* win,
                                   wxDC& dc, const wxRect& rect, int flags)
 {
+#if 1
+
+#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 );
+
+#if 1
+    // This draws the GTK+ 2.2.4 triangle
+    x--;
+    GdkPoint points[3];
+    
+    if ( flags & wxCONTROL_EXPANDED )
+    {
+        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
+    {  
+        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;
+    }
+
+    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 );
+#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);
@@ -163,6 +226,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
     }
 
     dc.DrawPolygon(3, button);
+#endif
 }
 
 #endif // GTK 2.0
@@ -221,7 +285,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->m_wxwindow->window )
     {
-        // VZ: this happens on startup -- why?
+        // window not realized yet
         return;
     }
 
@@ -232,13 +296,13 @@ 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;
         erase_rect.width = SASH_FULL_SIZE;
@@ -246,13 +310,13 @@ 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;
         erase_rect.height = SASH_FULL_SIZE;
@@ -292,7 +356,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.y,
         rect.width,
         rect.height,
-        !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
+        isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
     );
 #else // GTK+ 1.x