using new API (no visual difference)

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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 9f409c3e9898d2273142869d6a148b83d8547b2a..546e7ff9de7a1b046fc2ad0b1e385ab6666660d2 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -68,6 +68,15 @@ 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 void DrawDropArrow(wxWindow *win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0);

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


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

-    
+

     sm_rendererGeneric = NULL;
 }
 
     sm_rendererGeneric = NULL;
 }
 


@@ -209,18 +218,24 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),
     // white background
     dc.SetPen(*wxGREY_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);
     // white background
     dc.SetPen(*wxGREY_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);

-    dc.DrawRectangle(rect.Deflate(1, 2));
+    dc.DrawRectangle(rect);

 
     // black lines
     const wxCoord xMiddle = rect.x + rect.width/2;
     const wxCoord yMiddle = rect.y + rect.height/2;
 
 
     // black lines
     const wxCoord xMiddle = rect.x + rect.width/2;
     const wxCoord yMiddle = rect.y + rect.height/2;
 

+    // half of the length of the horz lines in "-" and "+"
+    const wxCoord halfWidth = rect.width/2 - 2;

     dc.SetPen(*wxBLACK_PEN);
     dc.SetPen(*wxBLACK_PEN);

-    dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle);
+    dc.DrawLine(xMiddle - halfWidth, yMiddle,
+                xMiddle + halfWidth + 1, yMiddle);
+

     if ( !(flags & wxCONTROL_EXPANDED) )
     {
         // turn "-" into "+"
     if ( !(flags & wxCONTROL_EXPANDED) )
     {
         // turn "-" into "+"

-        dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3);
+        const wxCoord halfHeight = rect.height/2 - 2;
+        dc.DrawLine(xMiddle, yMiddle - halfHeight,
+                    xMiddle, yMiddle + halfHeight + 1);

     }
 }
 
     }
 }
 


@@ -235,16 +250,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);
 }


@@ -255,7 +271,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);


@@ -297,39 +313,92 @@ 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);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// button drawing
+// ----------------------------------------------------------------------------
+
+void
+wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
+                                          wxDC& dc,
+                                          const wxRect& rect,
+                                          int WXUNUSED(flags))
+{
+    // Creating a generic button background that would actually be
+    // useful is rather difficult to accomplish. Best compromise
+    // is to use window's background colour to achieve transparent'
+    // ish appearance that should look decent in combo box style
+    // controls.
+    wxColour col = win->GetBackgroundColour();
+    dc.SetBrush(wxBrush(col));
+    dc.SetPen(wxPen(col));
+    dc.DrawRectangle(rect);
+    DrawDropArrow(win,dc,rect);
+}
+
+
+void
+wxRendererGeneric::DrawDropArrow(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int WXUNUSED(flags))
+{
+    // This generic implementation should be good
+    // enough for Windows platforms (including XP).
+
+    int arrowHalf = rect.width/5;
+    int rectMid = rect.width / 2;
+    int arrowTopY = (rect.height/2) - (arrowHalf/2);
+
+    // This should always result in arrow with odd width.
+    wxPoint pt[] =
+    {
+        wxPoint(rectMid - arrowHalf, arrowTopY),
+        wxPoint(rectMid + arrowHalf, arrowTopY),
+        wxPoint(rectMid, arrowTopY + arrowHalf)
+    };
+    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)