Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index fdfb957f7c1109f1d4e461670bd293006c3eb3d5..4a9a929eb1cddd2fc8313214dcacfce813721f6a 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -68,6 +68,15 @@ public:
                                   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);
 
@@ -125,7 +134,7 @@ void wxRendererGeneric::Cleanup()
 {
     if (sm_rendererGeneric)
         delete sm_rendererGeneric;
-    
+
     sm_rendererGeneric = NULL;
 }
 
@@ -304,7 +313,7 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
 
     const wxCoord h = size.y;
     wxCoord offset = 0;
-    
+
     // If we're drawing the border, draw the sash 3d lines shorter
     if ( win->HasFlag(wxSP_3DBORDER) )
     {
@@ -312,8 +321,8 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
     }
 
     dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));    
-    
+    dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
+
     if ( win->HasFlag(wxSP_3DSASH) )
     {
         // Draw the 3D sash
@@ -338,7 +347,53 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
     }
 }
 
+// ----------------------------------------------------------------------------
+// button drawing
+// ----------------------------------------------------------------------------
+
+void
+wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
+                                          wxDC& dc,
+                                          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.
+    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.
+// ----------------------------------------------------------------------------
+
 class wxGenericRendererModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)