///////////////////////////////////////////////////////////////////////////////
-// Name: generic/renderg.cpp
+// Name: src/generic/renderg.cpp
// Purpose: generic implementation of wxRendererNative (for any platform)
// Author: Vadim Zeitlin
// Modified by:
#pragma hdrstop
#endif
+#include "wx/renderer.h"
+
#ifndef WX_PRECOMP
#include "wx/string.h"
+ #include "wx/dc.h"
+ #include "wx/settings.h"
+ #include "wx/gdicmn.h"
#endif //WX_PRECOMP
-#include "wx/gdicmn.h"
-#include "wx/dc.h"
-
-#include "wx/settings.h"
#include "wx/splitter.h"
#include "wx/dcmirror.h"
#include "wx/module.h"
-#include "wx/renderer.h"
// ----------------------------------------------------------------------------
// wxRendererGeneric: our wxRendererNative implementation
const wxRect& rect,
int flags = 0);
- virtual void DrawCheckButton(wxWindow *win,
- wxDC& dc,
- const wxRect& rect,
- int flags = 0);
-
+ virtual void DrawCheckBox(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawPushButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawItemSelectionRect(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
virtual wxRendererVersion GetVersion() const
const wxRect& rect,
int flags)
{
- // white background
- dc.SetPen(*wxGREY_PEN);
- dc.SetBrush(*wxWHITE_BRUSH);
+ // store settings
+ wxDCPenChanger penChanger(dc, *wxGREY_PEN);
+ wxDCBrushChanger brushChanger(dc, *wxWHITE_BRUSH);
+
dc.DrawRectangle(rect);
// black lines
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,
dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y);
}
-void
-wxRendererGeneric::DrawCheckButton(wxWindow *win,
- wxDC& dc,
- const wxRect& rect,
- int flags)
+void
+wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
{
- if (flags & wxCONTROL_DISABLED)
- dc.SetPen( *wxGREY_PEN );
- else
- dc.SetPen( *wxBLACK_PEN );
+ dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN));
dc.SetBrush( *wxTRANSPARENT_BRUSH );
- wxRect my_rect = rect;
- dc.DrawRectangle( my_rect );
- if (flags & wxCONTROL_CHECKED)
+ dc.DrawRectangle(rect);
+
+ if ( flags & wxCONTROL_CHECKED )
{
- my_rect.x += 2;
- my_rect.y += 2;
- my_rect.width -= 4;
- my_rect.height -= 4;
- dc.DrawLine( my_rect.x, my_rect.y, my_rect.x+my_rect.width, my_rect.y+my_rect.height );
- dc.DrawLine( my_rect.x+my_rect.width, my_rect.y, my_rect.x, my_rect.y+my_rect.height );
+ dc.DrawCheckMark(rect.Deflate(2, 2));
}
}
+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);
+}
+
+void
+wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ wxBrush brush;
+ if ( flags & wxCONTROL_SELECTED )
+ {
+ if ( flags & wxCONTROL_FOCUSED )
+ {
+ brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+ }
+ else // !focused
+ {
+ brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+ }
+ }
+ else // !selected
+ {
+ brush = *wxTRANSPARENT_BRUSH;
+ }
+
+ dc.SetBrush(brush);
+ dc.SetPen(flags & wxCONTROL_CURRENT ? *wxBLACK_PEN : *wxTRANSPARENT_PEN);
+
+ dc.DrawRectangle( rect );
+}
+
+
// ----------------------------------------------------------------------------
// A module to allow cleanup of generic renderer.
// ----------------------------------------------------------------------------
};
IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
-