From: Vadim Zeitlin Date: Tue, 22 Sep 2009 00:23:09 +0000 (+0000) Subject: Override DrawLabel() to avoid crossing out disabled labels in mono theme. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8e9d1258555c0e162db38ba27fbf4132939280ce Override DrawLabel() to avoid crossing out disabled labels in mono theme. DrawButtonLabel() crosses out the buttons to indicate that they are disabled (for lack of any other options in mono renderer) but this looks really bad for the labels, so don't do it. Closes #11220. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp index a534269f86..13c5107e96 100644 --- a/src/univ/themes/mono.cpp +++ b/src/univ/themes/mono.cpp @@ -54,6 +54,13 @@ class wxMonoRenderer : public wxStdRenderer public: wxMonoRenderer(const wxColourScheme *scheme); + virtual void DrawLabel(wxDC& dc, + const wxString& label, + const wxRect& rect, + int flags = 0, + int alignment = wxALIGN_LEFT | wxALIGN_TOP, + int indexAccel = -1, + wxRect *rectBounds = NULL); virtual void DrawButtonLabel(wxDC& dc, const wxString& label, const wxBitmap& image, @@ -720,6 +727,17 @@ void wxMonoRenderer::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRe // label // ---------------------------------------------------------------------------- +void wxMonoRenderer::DrawLabel(wxDC& dc, + const wxString& label, + const wxRect& rect, + int WXUNUSED(flags), + int alignment, + int indexAccel, + wxRect *rectBounds) +{ + dc.DrawLabel(label, wxNullBitmap, rect, alignment, indexAccel, rectBounds); +} + void wxMonoRenderer::DrawButtonLabel(wxDC& dc, const wxString& label, const wxBitmap& image,