X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3208e1158e3bbc38b73eeda606d92be9e649c1c..f4d3253b5923de972846b09814623d7b05e9d4d1:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 19a4777f64..5f7f0074c3 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -32,7 +32,9 @@ #include "wx/dc.h" #include "wx/settings.h" - +#include "wx/splitter.h" +#include "wx/dcmirror.h" +#include "wx/module.h" #include "wx/renderer.h" // ---------------------------------------------------------------------------- @@ -56,16 +58,31 @@ 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); + wxCoord position, + wxOrientation orient, + int flags = 0); - virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win); + 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 @@ -78,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 // ---------------------------------------------------------------------------- @@ -91,21 +118,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)), @@ -146,10 +170,10 @@ wxRendererGeneric::DrawShadedRect(wxDC& dc, // ---------------------------------------------------------------------------- void -wxRendererGeneric::DrawHeaderButton(wxWindow *win, +wxRendererGeneric::DrawHeaderButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, - int flags) + int WXUNUSED(flags)) { const int CORNER = 1; @@ -177,7 +201,7 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win, // draw the plus or minus sign void -wxRendererGeneric::DrawTreeItemButton(wxWindow *win, +wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) @@ -185,18 +209,24 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *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); } } @@ -204,30 +234,56 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *win, // sash drawing // ---------------------------------------------------------------------------- -wxPoint -wxRendererGeneric::GetSplitterSashAndBorder(const wxWindow * WXUNUSED(win)) +wxSplitterRenderParams +wxRendererGeneric::GetSplitterParams(const wxWindow *win) { // see below - return wxPoint(7, 2); + wxCoord sashWidth, + border; + + if ( win->HasFlag(wxSP_3D) ) + { + sashWidth = 7; + border = 2; + } + else // no 3D effect + { + sashWidth = 3; + border = 0; + } + + return wxSplitterRenderParams(sashWidth, border, false); } void -wxRendererGeneric::DrawSplitterBorder(wxWindow * WXUNUSED(win), +wxRendererGeneric::DrawSplitterBorder(wxWindow *win, wxDC& dc, - const wxRect& rectOrig) + const wxRect& rectOrig, + int WXUNUSED(falgs)) { - wxRect rect = rectOrig; - DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight); - DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey); + if ( win->HasFlag(wxSP_3D) ) + { + wxRect rect = rectOrig; + DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight); + DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey); + } } void -wxRendererGeneric::DrawSplitterSash(wxWindow * WXUNUSED(win), - wxDC& dc, - const wxSize& size, - wxCoord position) +wxRendererGeneric::DrawSplitterSash(wxWindow *win, + wxDC& dcReal, + const wxSize& sizeReal, + wxCoord position, + wxOrientation orient, + int WXUNUSED(flags)) { - // we draw a Win32-like sash here: + // to avoid duplicating the same code for horizontal and vertical sashes, + // simply mirror the DC instead if needed (i.e. if horz splitter) + wxMirrorDC dc(dcReal, orient != wxVERTICAL); + wxSize size = dc.Reflect(sizeReal); + + + // we draw a Win32-like grey sash with possible 3D border here: // // ---- this is position // / @@ -242,24 +298,52 @@ wxRendererGeneric::DrawSplitterSash(wxWindow * WXUNUSED(win), // GWGGGDB and lower letters are our border (already drawn) // GWGGGDB // wWGGGDd + // + // only the middle 3 columns are drawn unless wxSP_3D is specified const wxCoord h = size.y; + wxCoord offset = 0; + + // If we're not drawing the border, droppings will + // be left unless we make the sash shorter + if ( !win->HasFlag(wxSP_3DBORDER) ) + { + offset = 3; + } // from left to right - dc.SetPen(m_penLightGrey); - dc.DrawLine(position, 1, position, h - 1); + if ( win->HasFlag(wxSP_3D) ) + { + dc.SetPen(m_penLightGrey); + dc.DrawLine(position, 1 + offset, position, h - 1 - offset); - dc.SetPen(m_penHighlight); - dc.DrawLine(position + 1, 0, position + 1, h); + dc.SetPen(m_penHighlight); + dc.DrawLine(position + 1, offset, position + 1, h - offset); + } dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.DrawRectangle(position + 2, 0, 3, h); + dc.DrawRectangle(position + 2, offset, 3, h - 2*offset); - dc.SetPen(m_penDarkGrey); - dc.DrawLine(position + 5, 0, position + 5, h); + if ( win->HasFlag(wxSP_3D) ) + { + dc.SetPen(m_penDarkGrey); + dc.DrawLine(position + 5, offset, position + 5, h - offset); - dc.SetPen(m_penBlack); - dc.DrawLine(position + 6, 1, position + 6, h - 1); + dc.SetPen(m_penBlack); + dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset); + } } +// 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) +