Added some column width contrl code.

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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 4a9a929eb1cddd2fc8313214dcacfce813721f6a..7b89f9d7ec5f6403d68ad66c5fab68de060ab7fe 100644 (file)
--- 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:
@@ -78,6 +78,11 @@ public:
                                const wxRect& rect,
                                int flags = 0);
 
+    virtual void DrawCheckButton(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0);
+                                 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
     virtual wxRendererVersion GetVersion() const
@@ -357,10 +362,15 @@ wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
                                           const wxRect& rect,
                                           int WXUNUSED(flags))
 {
-    // FIXME: Is it worth to do a better implementation?
-    // Generic wxComboDropButton should be drawn using
-    // combination of wxBitmapButton and DrawDropArrow
-    // anyway.
+    // 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);
 }
 
@@ -390,6 +400,30 @@ wxRendererGeneric::DrawDropArrow(wxWindow *win,
     dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y);
 }
 
+void 
+wxRendererGeneric::DrawCheckButton(wxWindow *WXUNUSED(win),
+                                   wxDC& dc,
+                                   const wxRect& rect,
+                                   int flags)
+{
+    if (flags & wxCONTROL_DISABLED)
+        dc.SetPen( *wxGREY_PEN );
+    else
+        dc.SetPen( *wxBLACK_PEN );
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+    wxRect my_rect = rect;
+    dc.DrawRectangle( my_rect );
+    if (flags & wxCONTROL_CHECKED)
+    {
+        my_rect.x += 2;
+        my_rect.y += 2;
+        my_rect.width -= 4;
+        my_rect.height -= 4;
+        dc.DrawLine( my_rect.x, my_rect.y, my_rect.x+my_rect.width, my_rect.y+my_rect.height );
+        dc.DrawLine( my_rect.x+my_rect.width, my_rect.y, my_rect.x, my_rect.y+my_rect.height );
+    }
+}
+
 // ----------------------------------------------------------------------------
 // A module to allow cleanup of generic renderer.
 // ----------------------------------------------------------------------------
@@ -404,4 +438,3 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
-