#include "wx/settings.h"
#include "wx/splitter.h"
-
#include "wx/dcmirror.h"
-
+#include "wx/module.h"
#include "wx/renderer.h"
// ----------------------------------------------------------------------------
wxOrientation orient,
int flags = 0);
+ virtual void DrawComboBoxDropButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
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
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
// ----------------------------------------------------------------------------
/* static */
wxRendererNative& wxRendererNative::GetGeneric()
{
- static wxRendererGeneric s_rendererGeneric;
+ return * wxRendererGeneric::DoGetGeneric();
+}
+
+void wxRendererGeneric::Cleanup()
+{
+ if (sm_rendererGeneric)
+ delete sm_rendererGeneric;
- return s_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)),
// 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);
}
}
wxCoord sashWidth,
border;
- if ( win->HasFlag(wxSP_3D) )
- {
+ if ( win->HasFlag(wxSP_3DSASH) )
sashWidth = 7;
- border = 2;
- }
+ 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);
}
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);
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
- 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 + offset, position, h - 1 - offset);
-
- dc.SetPen(m_penHighlight);
- dc.DrawLine(position + 1, offset, position + 1, h - offset);
+ offset = 1;
}
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
- dc.DrawRectangle(position + 2, offset, 3, h - 2*offset);
- 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, offset, position + 5, h - offset);
+ dc.DrawLine(position + 5, 0, position + 5, h);
dc.SetPen(m_penBlack);
- dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset);
+ dc.DrawLine(position + 6, offset, position + 6, h - offset);
+ }
+ else
+ {
+ // Draw a flat sash
+ dc.DrawRectangle(position, 0, 3, h);
}
}
+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(0, 0, rect.width, rect.height);
+
+ 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);
+}
+
+
+// ----------------------------------------------------------------------------
+// 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)
+
projects / wxWidgets.git / blobdiff