Committed Jaako's renderer patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -82,7 +82,12 @@ public:
|
||||
wxDC& dc,
|
||||
const wxRect& rect,
|
||||
int flags = 0);
|
||||
|
||||
|
||||
virtual void DrawPushButton(wxWindow *win,
|
||||
wxDC& dc,
|
||||
const wxRect& rect,
|
||||
int flags = 0);
|
||||
|
||||
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
|
||||
|
||||
virtual wxRendererVersion GetVersion() const
|
||||
@@ -360,21 +365,12 @@ void
|
||||
wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
|
||||
wxDC& dc,
|
||||
const wxRect& rect,
|
||||
int WXUNUSED(flags))
|
||||
int 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);
|
||||
DrawPushButton(win,dc,rect,flags);
|
||||
DrawDropArrow(win,dc,rect,flags);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
wxRendererGeneric::DrawDropArrow(wxWindow *win,
|
||||
wxDC& dc,
|
||||
@@ -416,6 +412,22 @@ wxRendererGeneric::DrawCheckButton(wxWindow *WXUNUSED(win),
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
wxRendererGeneric::DrawPushButton(wxWindow *win,
|
||||
wxDC& dc,
|
||||
const wxRect& rect,
|
||||
int flags)
|
||||
{
|
||||
// Don't try anything too fancy. It'll just turn out looking
|
||||
// out-of-place on most platforms.
|
||||
wxColour bgCol = flags & wxCONTROL_DISABLED ?
|
||||
wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) :
|
||||
win->GetBackgroundColour();
|
||||
dc.SetBrush(wxBrush(bgCol));
|
||||
dc.SetPen(wxPen(bgCol));
|
||||
dc.DrawRectangle(rect);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// A module to allow cleanup of generic renderer.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user