adding the GetEventHandler() indirection

[wxWidgets.git] / src / univ / themes / mono.cpp

diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp
index 3bf18d39b296e7de601ee1018a1a68c1c86ff106..93cf4b94f827fe8d0faaad69a6d7fd43e719bbf5 100644 (file)
--- a/src/univ/themes/mono.cpp
+++ b/src/univ/themes/mono.cpp
@@ -29,6 +29,7 @@
 #if wxUSE_THEME_MONO
 
 #ifndef WX_PRECOMP
 #if wxUSE_THEME_MONO
 
 #ifndef WX_PRECOMP

+    #include "wx/window.h"

     #include "wx/dc.h"
 #endif // WX_PRECOMP
 
     #include "wx/dc.h"
 #endif // WX_PRECOMP
 


@@ -62,7 +63,7 @@ public:
                                  int indexAccel = -1,
                                  wxRect *rectBounds = NULL);
 
                                  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,
 
     virtual void DrawButtonBorder(wxDC& dc,
                                   const wxRect& rect,


@@ -600,6 +601,7 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const
         case TITLEBAR_ACTIVE:
         case HIGHLIGHT_TEXT:
         case DESKTOP:
         case TITLEBAR_ACTIVE:
         case HIGHLIGHT_TEXT:
         case DESKTOP:

+        case FRAME:

             return GetBg();
 
         case MAX:
             return GetBg();
 
         case MAX:


@@ -649,13 +651,14 @@ wxRect wxMonoRenderer::GetBorderDimensions(wxBorder border) const
         case wxBORDER_STATIC:
         case wxBORDER_RAISED:
         case wxBORDER_SUNKEN:
         case wxBORDER_STATIC:
         case wxBORDER_RAISED:
         case wxBORDER_SUNKEN:

+        case wxBORDER_THEME:

             width = 1;
             break;
             width = 1;
             break;

-
+  /*

         case wxBORDER_DOUBLE:
             width = 2;
             break;
         case wxBORDER_DOUBLE:
             width = 2;
             break;

-
+   */

         default:
             wxFAIL_MSG(_T("unknown border type"));
             // fall through
         default:
             wxFAIL_MSG(_T("unknown border type"));
             // fall through


@@ -701,7 +704,7 @@ wxMonoRenderer::DrawVerticalLine(wxDC& dc, wxCoord x, wxCoord y1, wxCoord y2)
     dc.DrawLine(x, y1, x, y2 + 1);
 }
 
     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
 {
     // no need to draw the focus rect for selected items, it would be invisible
     // anyhow