Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index e80c42cd7b4d3f12475fdea060ce2ecf051a6cae..f32e90adc71c57560a48270c899b61f5af6a9110 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/vscroll.h
+// Name:        wx/vscroll.h

 // Purpose:     Variable scrolled windows (wx[V/H/HV]ScrolledWindow)
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, Bryan Petty
 // Purpose:     Variable scrolled windows (wx[V/H/HV]ScrolledWindow)
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, Bryan Petty


@@ -736,7 +736,7 @@ protected:
 #endif // __WXMAC__
 
 private:
 #endif // __WXMAC__
 
 private:

-    DECLARE_NO_COPY_CLASS(wxVScrolledWindow)
+    wxDECLARE_NO_COPY_CLASS(wxVScrolledWindow);

     DECLARE_ABSTRACT_CLASS(wxVScrolledWindow)
 };
 
     DECLARE_ABSTRACT_CLASS(wxVScrolledWindow)
 };
 


@@ -803,7 +803,7 @@ protected:
 #endif // __WXMAC__
 
 private:
 #endif // __WXMAC__
 
 private:

-    DECLARE_NO_COPY_CLASS(wxHScrolledWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHScrolledWindow);

     DECLARE_ABSTRACT_CLASS(wxHScrolledWindow)
 };
 
     DECLARE_ABSTRACT_CLASS(wxHScrolledWindow)
 };
 


@@ -840,7 +840,7 @@ public:
                        long style = 0,
                        const wxString& name = wxPanelNameStr)
         : wxPanel(),
                        long style = 0,
                        const wxString& name = wxPanelNameStr)
         : wxPanel(),

-          wxVarHVScrollHelper(this) 
+          wxVarHVScrollHelper(this)

     {
         (void)Create(parent, id, pos, size, style, name);
     }
     {
         (void)Create(parent, id, pos, size, style, name);
     }


@@ -868,7 +868,7 @@ protected:
 #endif // __WXMAC__
 
 private:
 #endif // __WXMAC__
 
 private:

-    DECLARE_NO_COPY_CLASS(wxHVScrolledWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHVScrolledWindow);

     DECLARE_ABSTRACT_CLASS(wxHVScrolledWindow)
 };
 
     DECLARE_ABSTRACT_CLASS(wxHVScrolledWindow)
 };