Fixed some probs in wxRadioBox

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index da41f34eba72863cc1405bfe749286d8263793a1..62134799f8dc1a8abf934c43f969a41361799f9a 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -132,9 +132,70 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 //
 // TODO: isn't there a GTK function to draw it?
 void
 //
 // 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)
 {
                                   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;
+
+#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);
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT),
                         wxSOLID));
     dc.SetPen(*wxBLACK_PEN);


@@ -163,6 +224,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
     }
 
     dc.DrawPolygon(3, button);
     }
 
     dc.DrawPolygon(3, button);

+#endif

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


@@ -177,10 +239,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
     static const wxCoord SASH_FULL_SIZE = 5;
 #else // GTK+ 1.x
     // the full sash width (should be even)
     static const wxCoord SASH_FULL_SIZE = 5;
 #else // GTK+ 1.x
     // the full sash width (should be even)

-    static const wxCoord SASH_SIZE = 10;
+    static const wxCoord SASH_SIZE = 8;

 
     // margin around the sash
 
     // margin around the sash

-    static const wxCoord SASH_MARGIN = 5;
+    static const wxCoord SASH_MARGIN = 2;

 
     // the full sash size
     static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
 
     // the full sash size
     static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;


@@ -229,21 +291,55 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;

+    GdkRectangle erase_rect;

     if ( isVert )
     {
     if ( isVert )
     {

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

         rect.x = position;
         rect.x = position;

-        rect.y = 0;
+        rect.y = h/2 - 14/2;

         rect.width = SASH_FULL_SIZE;
         rect.width = SASH_FULL_SIZE;

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

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

-        rect.x = 0;
+       int w = win->GetClientSize().GetWidth();
+    
+        rect.x = w/2 - 14/2;

         rect.y = position;
         rect.height = SASH_FULL_SIZE;
         rect.y = position;
         rect.height = SASH_FULL_SIZE;

-        rect.width = size.x;
+        rect.width = 14;
+       
+        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,
+        NULL,
+        win->m_wxwindow,
+        (char *)"base", // const_cast
+        erase_rect.x,
+        erase_rect.y,
+        erase_rect.width,
+        erase_rect.height
+    );
+

 #ifdef __WXGTK20__
     gtk_paint_handle
     (
 #ifdef __WXGTK20__
     gtk_paint_handle
     (


@@ -258,25 +354,9 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.y,
         rect.width,
         rect.height,
         rect.y,
         rect.width,
         rect.height,

-        isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
+        !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL

     );
 #else // GTK+ 1.x
     );
 #else // GTK+ 1.x

-    // 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,
-        &rect,
-        win->m_wxwindow,
-        (char *)"base", // const_cast
-        0, 0, -1, -1
-    );
-

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