No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index f95ef798e2971bc39ad04868541d61894a57985e..c2fcbfd411a5b26130d666557814221da242b20d 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
 // Created:     01/02/97
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -18,6 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase
 {
 
 class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase
 {

+    typedef wxScrollHelperBase base_type;

 public:
     // default ctor doesn't do anything
     wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { }
 public:
     // default ctor doesn't do anything
     wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { }


@@ -70,8 +70,7 @@ private:
                         int pixelsPerLine,
                         int *posOld);
 
                         int pixelsPerLine,
                         int *posOld);
 

-private:
-    DECLARE_NO_COPY_CLASS(wxScrollHelper)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);

 };
 
 #endif // _WX_GTK_SCROLLWIN_H_
 };
 
 #endif // _WX_GTK_SCROLLWIN_H_