GTK+ headers aren't needed anymore

[wxWidgets.git] / src / generic / renderg.cpp

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 5f7f0074c3274a8a91019278d8389d8105c6689f..2a6c00da5f0e3eeadffd837cb69260dd6ff42fcc 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -68,6 +68,11 @@ public:
                                   wxOrientation orient,
                                   int flags = 0);
 
                                   wxOrientation orient,
                                   int flags = 0);
 

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

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


@@ -125,7 +130,7 @@ void wxRendererGeneric::Cleanup()
 {
     if (sm_rendererGeneric)
         delete sm_rendererGeneric;
 {
     if (sm_rendererGeneric)
         delete sm_rendererGeneric;

-    
+

     sm_rendererGeneric = NULL;
 }
 
     sm_rendererGeneric = NULL;
 }
 


@@ -241,16 +246,17 @@ wxRendererGeneric::GetSplitterParams(const wxWindow *win)
     wxCoord sashWidth,
             border;
 
     wxCoord sashWidth,
             border;
 

-    if ( win->HasFlag(wxSP_3D) )
-    {
+    if ( win->HasFlag(wxSP_3DSASH) )

         sashWidth = 7;
         sashWidth = 7;

-        border = 2;
-    }
+    else if ( win->HasFlag(wxSP_NOSASH) )
+        sashWidth = 0;

     else // no 3D effect
     else // no 3D effect

-    {

         sashWidth = 3;
         sashWidth = 3;

+
+    if ( win->HasFlag(wxSP_3DBORDER) )
+        border = 2;
+    else // no 3D effect

         border = 0;
         border = 0;

-    }

 
     return wxSplitterRenderParams(sashWidth, border, false);
 }
 
     return wxSplitterRenderParams(sashWidth, border, false);
 }


@@ -261,7 +267,7 @@ wxRendererGeneric::DrawSplitterBorder(wxWindow *win,
                                       const wxRect& rectOrig,
                                       int WXUNUSED(falgs))
 {
                                       const wxRect& rectOrig,
                                       int WXUNUSED(falgs))
 {

-    if ( win->HasFlag(wxSP_3D) )
+    if ( win->HasFlag(wxSP_3DBORDER) )

     {
         wxRect rect = rectOrig;
         DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
     {
         wxRect rect = rectOrig;
         DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);


@@ -303,39 +309,66 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
 
     const wxCoord h = size.y;
     wxCoord offset = 0;
 
     const wxCoord h = size.y;
     wxCoord offset = 0;

-    
-    // If we're not drawing the border, droppings will
-    // be left unless we make the sash shorter
-    if ( !win->HasFlag(wxSP_3DBORDER) )
-    {
-        offset = 3;
-    }

 
 

-    // from left to right
-    if ( win->HasFlag(wxSP_3D) )
+    // If we're drawing the border, draw the sash 3d lines shorter
+    if ( win->HasFlag(wxSP_3DBORDER) )

     {
     {

-        dc.SetPen(m_penLightGrey);
-        dc.DrawLine(position, 1 + offset, position, h - 1 - offset);
-
-        dc.SetPen(m_penHighlight);
-        dc.DrawLine(position + 1, offset, position + 1, h - offset);
+        offset = 1;

     }
 
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
     }
 
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));

-    dc.DrawRectangle(position + 2, offset, 3, h - 2*offset);

 
 

-    if ( win->HasFlag(wxSP_3D) )
+    if ( win->HasFlag(wxSP_3DSASH) )

     {
     {

+        // Draw the 3D sash
+        dc.DrawRectangle(position + 2, 0, 3, h);
+
+        dc.SetPen(m_penLightGrey);
+        dc.DrawLine(position, offset, position, h - offset);
+
+        dc.SetPen(m_penHighlight);
+        dc.DrawLine(position + 1, 0, position + 1, h);
+

         dc.SetPen(m_penDarkGrey);
         dc.SetPen(m_penDarkGrey);

-        dc.DrawLine(position + 5, offset, position + 5, h - offset);
+        dc.DrawLine(position + 5, 0, position + 5, h);

 
         dc.SetPen(m_penBlack);
 
         dc.SetPen(m_penBlack);

-        dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset);
+        dc.DrawLine(position + 6, offset, position + 6, h - offset);
+    }
+    else
+    {
+        // Draw a flat sash
+        dc.DrawRectangle(position, 0, 3, h);

     }
 }
 
     }
 }
 

+void
+wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
+                                          wxDC& dc,
+                                          const wxRect& rect,
+                                          int WXUNUSED(flags))
+{
+    dc.SetBrush(wxBrush(win->GetBackgroundColour()));
+    dc.SetPen(wxPen(win->GetBackgroundColour()));
+    dc.DrawRectangle(rect);
+
+    wxPoint pt[] =
+    {
+        wxPoint(0,0),
+        wxPoint(rect.width, 0),
+        wxPoint(rect.width/2, rect.height - 2)
+    };
+    dc.SetBrush(wxBrush(win->GetForegroundColour()));
+    dc.SetPen(wxPen(win->GetForegroundColour()));
+    dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y);
+}
+
+
+// ----------------------------------------------------------------------------

 // A module to allow cleanup of generic renderer.
 // A module to allow cleanup of generic renderer.

+// ----------------------------------------------------------------------------
+

 class wxGenericRendererModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
 class wxGenericRendererModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)