X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af99040c70b975e24ac0acee50f1fa13746d1239..a333f34d91ae845d39ca8a833290e9a1c3d04749:/src/generic/renderg.cpp?ds=sidebyside diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 758e30835b..fdfb957f7c 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" // ---------------------------------------------------------------------------- @@ -72,6 +71,18 @@ public: virtual wxSplitterRenderParams GetSplitterParams(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 @@ -84,12 +95,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 // ---------------------------------------------------------------------------- @@ -97,11 +118,19 @@ protected: /* static */ wxRendererNative& wxRendererNative::GetGeneric() { - static wxRendererGeneric s_rendererGeneric; + return * wxRendererGeneric::DoGetGeneric(); +} - return s_rendererGeneric; +void wxRendererGeneric::Cleanup() +{ + if (sm_rendererGeneric) + delete sm_rendererGeneric; + + sm_rendererGeneric = NULL; } +wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL; + wxRendererGeneric::wxRendererGeneric() : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)), m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)), @@ -180,18 +209,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); } } @@ -206,16 +241,17 @@ wxRendererGeneric::GetSplitterParams(const wxWindow *win) wxCoord sashWidth, border; - if ( win->HasFlag(wxSP_3D) ) - { + if ( win->HasFlag(wxSP_3DSASH) ) sashWidth = 7; - border = 3; - } + 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 - { - sashWidth = 2; border = 0; - } return wxSplitterRenderParams(sashWidth, border, false); } @@ -226,7 +262,7 @@ wxRendererGeneric::DrawSplitterBorder(wxWindow *win, 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); @@ -267,28 +303,50 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, // only the middle 3 columns are drawn unless wxSP_3D is specified 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) ) + { + offset = 1; + } - // from left to right - if ( win->HasFlag(wxSP_3D) ) + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); + + if ( win->HasFlag(wxSP_3DSASH) ) { + // Draw the 3D sash + dc.DrawRectangle(position + 2, 0, 3, h); + dc.SetPen(m_penLightGrey); - dc.DrawLine(position, 1, position, h - 1); + dc.DrawLine(position, offset, position, h - offset); dc.SetPen(m_penHighlight); dc.DrawLine(position + 1, 0, position + 1, h); - } - - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.DrawRectangle(position + 2, 0, 3, h); - if ( win->HasFlag(wxSP_3D) ) - { 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); } } +// 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) +