X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f33cef9fec16abad12ef95f293776d3926960ad3..daebb84bff054d3833baca58a5dc506de56c64a1:/src/generic/renderg.cpp?ds=inline

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 7675c9de83..41a5bd65ff 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        generic/renderg.cpp
+// Name:        src/generic/renderg.cpp
 // Purpose:     generic implementation of wxRendererNative (for any platform)
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -73,6 +73,20 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
+    virtual void DrawDropArrow(wxWindow *win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0);
+
+    virtual void DrawCheckButton(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0);
+
+    virtual void DrawPushButton(wxWindow *win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags = 0);
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
@@ -343,27 +357,76 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
     }
 }
 
+// ----------------------------------------------------------------------------
+// button drawing
+// ----------------------------------------------------------------------------
+
 void
 wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
                                           wxDC& dc,
                                           const wxRect& rect,
-                                          int WXUNUSED(flags))
+                                          int flags)
+{
+    DrawPushButton(win,dc,rect,flags);
+    DrawDropArrow(win,dc,rect,flags);
+}
+
+void
+wxRendererGeneric::DrawDropArrow(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int WXUNUSED(flags))
 {
-    dc.SetBrush(wxBrush(win->GetBackgroundColour()));
-    dc.SetPen(wxPen(win->GetBackgroundColour()));
-    dc.DrawRectangle(0, 0, rect.width, rect.height);
+    // 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(0, 0),
-        wxPoint(rect.width, 0),
-        wxPoint(rect.width/2, rect.height - 2)
+        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);
+    dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y);
+}
+
+void 
+wxRendererGeneric::DrawCheckButton(wxWindow *WXUNUSED(win),
+                                   wxDC& dc,
+                                   const wxRect& rect,
+                                   int flags)
+{
+    dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN));
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+    dc.DrawRectangle(rect);
+
+    if ( flags & wxCONTROL_CHECKED )
+    {
+        dc.DrawCheckMark(rect.Deflate(2, 2));
+    }
 }
 
+void
+wxRendererGeneric::DrawPushButton(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags)
+{
+    // Don't try anything too fancy. It'll just turn out looking
+    // out-of-place on most platforms.
+    wxColour bgCol = flags & wxCONTROL_DISABLED ?
+                        wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) :
+                        win->GetBackgroundColour();
+    dc.SetBrush(wxBrush(bgCol));
+    dc.SetPen(wxPen(bgCol));
+    dc.DrawRectangle(rect);
+}
 
 // ----------------------------------------------------------------------------
 // A module to allow cleanup of generic renderer.
@@ -379,4 +442,3 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
-