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

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 5ffb3caac0c72bbcc180f1a2b4871f2f4ba519de..ca51c09146497e5713ebcf3bcb2e97bedfb0c3f0 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -3,7 +3,6 @@
 // Purpose:     generic wxScrollHelper
 // Author:      Vadim Zeitlin
 // Created:     2008-12-24 (replacing old file with the same name)
 // Purpose:     generic wxScrollHelper
 // Author:      Vadim Zeitlin
 // Created:     2008-12-24 (replacing old file with the same name)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -23,11 +22,12 @@ public:
     // implement base class pure virtuals
     virtual void AdjustScrollbars();
 
     // implement base class pure virtuals
     virtual void AdjustScrollbars();
 

-private:
+protected:

     virtual void DoScroll(int x, int y);
     virtual void DoShowScrollbars(wxScrollbarVisibility horz,
                                   wxScrollbarVisibility vert);
 
     virtual void DoScroll(int x, int y);
     virtual void DoShowScrollbars(wxScrollbarVisibility horz,
                                   wxScrollbarVisibility vert);
 

+private:

     // helper of AdjustScrollbars(): does the work for the single scrollbar
     //
     // notice that the parameters passed by non-const references are modified
     // helper of AdjustScrollbars(): does the work for the single scrollbar
     //
     // notice that the parameters passed by non-const references are modified


@@ -45,7 +45,7 @@ private:
     wxScrollbarVisibility m_xVisibility,
                           m_yVisibility;
 
     wxScrollbarVisibility m_xVisibility,
                           m_yVisibility;
 

-    DECLARE_NO_COPY_CLASS(wxScrollHelper)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);

 };
 
 #endif // _WX_GENERIC_SCROLLWIN_H_
 };
 
 #endif // _WX_GENERIC_SCROLLWIN_H_