Merge in from trunk r68626 - r68683

[wxWidgets.git] / include / wx / univ / stdrend.h

diff --git a/include/wx/univ/stdrend.h b/include/wx/univ/stdrend.h
index 8a07e5ccf5ddf2a3409ed27014ddac66e9a3ff1a..62aa0753b109b23abb37b08ed77e87fabfdad647 100644 (file)
--- a/include/wx/univ/stdrend.h
+++ b/include/wx/univ/stdrend.h
@@ -38,7 +38,8 @@ public:
                                    int flags);
 
 
                                    int flags);
 
 

-    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 DrawLabel(wxDC& dc,
                            const wxString& label,
                            const wxRect& rect,
     virtual void DrawLabel(wxDC& dc,
                            const wxString& label,
                            const wxRect& rect,


@@ -321,7 +322,7 @@ protected:
     // return the frame icon bitmap
     virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type) = 0;
 
     // return the frame icon bitmap
     virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type) = 0;
 

-    // get the width of either normal or resizeable frame border depending on
+    // get the width of either normal or resizable frame border depending on

     // whether flags contains wxTOPLEVEL_RESIZEABLE bit
     //
     // notice that these methods only make sense with standard border drawing
     // whether flags contains wxTOPLEVEL_RESIZEABLE bit
     //
     // notice that these methods only make sense with standard border drawing


@@ -346,7 +347,7 @@ protected:
     // update m_penXXX objects above
     const wxColourScheme * const m_scheme;
 
     // update m_penXXX objects above
     const wxColourScheme * const m_scheme;
 

-    DECLARE_NO_COPY_CLASS(wxStdRenderer)
+    wxDECLARE_NO_COPY_CLASS(wxStdRenderer);

 };
 
 #endif // _WX_UNIV_STDREND_H_
 };
 
 #endif // _WX_UNIV_STDREND_H_