X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/497cb543c0f96c4b18732729bf14c65fa97afa68..92646f5a74a4e39c50596b8c57a8c1b854c1557c:/src/univ/themes/mono.cpp

diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp
index 221a7162ff..4fd27cea1e 100644
--- a/src/univ/themes/mono.cpp
+++ b/src/univ/themes/mono.cpp
@@ -62,7 +62,7 @@ public:
                                  int indexAccel = -1,
                                  wxRect *rectBounds = NULL);
 
-    virtual void DrawFocusRect(wxDC& dc, const wxRect& rect, int flags = 0);
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
 
     virtual void DrawButtonBorder(wxDC& dc,
                                   const wxRect& rect,
@@ -600,6 +600,7 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const
         case TITLEBAR_ACTIVE:
         case HIGHLIGHT_TEXT:
         case DESKTOP:
+        case FRAME:
             return GetBg();
 
         case MAX:
@@ -701,7 +702,7 @@ wxMonoRenderer::DrawVerticalLine(wxDC& dc, wxCoord x, wxCoord y1, wxCoord y2)
     dc.DrawLine(x, y1, x, y2 + 1);
 }
 
-void wxMonoRenderer::DrawFocusRect(wxDC& dc, const wxRect& rect, int flags)
+void wxMonoRenderer::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags)
 {
     // no need to draw the focus rect for selected items, it would be invisible
     // anyhow
@@ -726,7 +727,6 @@ void wxMonoRenderer::DrawButtonLabel(wxDC& dc,
                                      int indexAccel,
                                      wxRect *rectBounds)
 {
-    dc.SetTextForeground(m_penFg.GetColour());
     dc.DrawLabel(label, image, rect, alignment, indexAccel, rectBounds);
 
     if ( flags & wxCONTROL_DISABLED )