X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a53b9b8fe6fc88f243f777db03bafa3a9651701..9802983f157c32177e92e8c0f6b1ce44aec0ebca:/src/generic/renderg.cpp?ds=sidebyside diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index fdfb957f7c..2a6c00da5f 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -68,6 +68,11 @@ public: wxOrientation orient, int flags = 0); + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); @@ -125,7 +130,7 @@ void wxRendererGeneric::Cleanup() { if (sm_rendererGeneric) delete sm_rendererGeneric; - + sm_rendererGeneric = NULL; } @@ -304,7 +309,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 +317,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 +343,32 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, } } +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. +// ---------------------------------------------------------------------------- + class wxGenericRendererModule: public wxModule { DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)