renamed WX_DEFINE_ARRAY_NO_PTR in WX_DEFINE_ARRAY_PTR

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 11ba4edb5984ee6f95eaa55ad7d645c22af4fe80..72c158d39264d683fca274485b35b2b9d0c37503 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -146,7 +146,7 @@ public:
 
 protected:
     // get pointer to our scroll rect if we use it or NULL
-    const wxRect *GetRect() const
+    const wxRect *GetScrollRect() const
     {
         return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
     }
@@ -201,6 +201,8 @@ protected:
 #endif // wxUSE_MOUSEWHEEL
 
     wxScrollHelperEvtHandler *m_handler;
+
+    DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 
 // ----------------------------------------------------------------------------
@@ -227,7 +229,7 @@ protected:
         }
 
     private:
-        DECLARE_CLASS(wxScrolledWindow)
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
     };
 
     #define wxSCROLLED_WINDOW_IS_GENERIC 1
@@ -236,4 +238,3 @@ protected:
 #endif
     // _WX_SCROLWIN_H_BASE_
 
-// vi:sts=4:sw=4:et