fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 5ffb3caac0c72bbcc180f1a2b4871f2f4ba519de..c4f4a0b292924c12ff274eca5b5bafd3bd12484c 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -23,11 +23,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 +46,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_