don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 41726f3aba6040019372374fd862a374f00e5144..f209507d5f226c24009d9cc913d652b6ee01034e 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -70,8 +70,12 @@ public:
                                bool noRefresh = false );
 
     // scroll to the given (in logical coords) position
                                bool noRefresh = false );
 
     // scroll to the given (in logical coords) position

-    void Scroll(int x, int y) { DoScroll(x, y); }
-    void Scroll(const wxPoint& pt) { DoScroll(pt.x, pt.y); }
+    //
+    // notice that for backwards compatibility reasons Scroll() is virtual as
+    // the existing code could override it but new code should override
+    // DoScroll() instead
+    virtual void Scroll(int x, int y) { DoScroll(x, y); }
+    virtual void Scroll(const wxPoint& pt) { DoScroll(pt.x, pt.y); }

 
     // get/set the page size for this orientation (wxVERTICAL/wxHORIZONTAL)
     int GetScrollPageSize(int orient) const;
 
     // get/set the page size for this orientation (wxVERTICAL/wxHORIZONTAL)
     int GetScrollPageSize(int orient) const;


@@ -286,7 +290,7 @@ protected:
 
     wxScrollHelperEvtHandler *m_handler;
 
 
     wxScrollHelperEvtHandler *m_handler;
 

-    DECLARE_NO_COPY_CLASS(wxScrollHelperBase)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelperBase);

 };
 
 // this macro can be used in a wxScrollHelper-derived class to forward wxWindow
 };
 
 // this macro can be used in a wxScrollHelper-derived class to forward wxWindow


@@ -401,7 +405,7 @@ private:
     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 #if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)
     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 #if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)

-    DECLARE_NO_COPY_CLASS(wxScrolled)
+    wxDECLARE_NO_COPY_CLASS(wxScrolled);

 #endif
 };
 
 #endif
 };