X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62dc9cb4f159e2d4cac08308b96e63238935e6bb..e15f0a5ea372e3a6c693fb6aa4fe73893a9af797:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 252bfccc14..546e7ff9de 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -33,9 +33,8 @@ #include "wx/settings.h" #include "wx/splitter.h" - #include "wx/dcmirror.h" - +#include "wx/module.h" #include "wx/renderer.h" // ---------------------------------------------------------------------------- @@ -59,17 +58,40 @@ public: virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, - const wxRect& rect); + const wxRect& rect, + int flags = 0); virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, wxCoord position, - wxOrientation orient); + 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 wxPoint GetSplitterSashAndBorder(const wxWindow *win); + virtual wxRendererVersion GetVersion() const + { + return wxRendererVersion(wxRendererVersion::Current_Version, + wxRendererVersion::Current_Age); + } + + + // Cleanup by deleting standard renderer + static void Cleanup(); + // Get the generic object + static wxRendererGeneric* DoGetGeneric(); protected: // draw the rectange using the first pen for the left and top sides and @@ -82,12 +104,22 @@ protected: m_penDarkGrey, m_penLightGrey, m_penHighlight; + + static wxRendererGeneric* sm_rendererGeneric; }; // ============================================================================ // wxRendererGeneric implementation // ============================================================================ +// Get the generic object +wxRendererGeneric* wxRendererGeneric::DoGetGeneric() +{ + if (!sm_rendererGeneric) + sm_rendererGeneric = new wxRendererGeneric; + return sm_rendererGeneric; +} + // ---------------------------------------------------------------------------- // wxRendererGeneric creation // ---------------------------------------------------------------------------- @@ -95,21 +127,18 @@ protected: /* static */ wxRendererNative& wxRendererNative::GetGeneric() { - static wxRendererGeneric s_rendererGeneric; - - return s_rendererGeneric; + return * wxRendererGeneric::DoGetGeneric(); } -// some platforms have their own renderers -#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__) - -/* static */ -wxRendererNative& wxRendererNative::Get() +void wxRendererGeneric::Cleanup() { - return GetGeneric(); + if (sm_rendererGeneric) + delete sm_rendererGeneric; + + sm_rendererGeneric = NULL; } -#endif // platforms using their own renderers +wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL; wxRendererGeneric::wxRendererGeneric() : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)), @@ -189,18 +218,24 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), // 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; + // half of the length of the horz lines in "-" and "+" + const wxCoord halfWidth = rect.width/2 - 2; 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 "+" - dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3); + const wxCoord halfHeight = rect.height/2 - 2; + dc.DrawLine(xMiddle, yMiddle - halfHeight, + xMiddle, yMiddle + halfHeight + 1); } } @@ -208,19 +243,35 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), // sash drawing // ---------------------------------------------------------------------------- -wxPoint -wxRendererGeneric::GetSplitterSashAndBorder(const wxWindow *win) +wxSplitterRenderParams +wxRendererGeneric::GetSplitterParams(const wxWindow *win) { // see below - return win->HasFlag(wxSP_3D) ? wxPoint(7, 2) : wxPoint(3, 0); + wxCoord sashWidth, + border; + + if ( win->HasFlag(wxSP_3DSASH) ) + sashWidth = 7; + else if ( win->HasFlag(wxSP_NOSASH) ) + sashWidth = 0; + else // no 3D effect + sashWidth = 3; + + if ( win->HasFlag(wxSP_3DBORDER) ) + border = 2; + else // no 3D effect + border = 0; + + return wxSplitterRenderParams(sashWidth, border, false); } void wxRendererGeneric::DrawSplitterBorder(wxWindow *win, wxDC& dc, - const wxRect& rectOrig) + 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); @@ -233,7 +284,8 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, wxDC& dcReal, const wxSize& sizeReal, wxCoord position, - wxOrientation orient) + wxOrientation orient, + int WXUNUSED(flags)) { // to avoid duplicating the same code for horizontal and vertical sashes, // simply mirror the DC instead if needed (i.e. if horz splitter) @@ -260,28 +312,101 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, // only the middle 3 columns are drawn unless wxSP_3D is specified const wxCoord h = size.y; + wxCoord offset = 0; - // 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, position, h - 1); - - dc.SetPen(m_penHighlight); - dc.DrawLine(position + 1, 0, position + 1, h); + offset = 1; } dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.DrawRectangle(position + 2, 0, 3, h); - 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.DrawLine(position + 5, 0, position + 5, h); dc.SetPen(m_penBlack); - dc.DrawLine(position + 6, 1, position + 6, h - 1); + 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. +// ---------------------------------------------------------------------------- + +class wxGenericRendererModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxGenericRendererModule) +public: + wxGenericRendererModule() {} + bool OnInit() { return true; }; + void OnExit() { wxRendererGeneric::Cleanup(); }; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule) +