X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16361ec94128d2cea3a08c2c84a4eb38232715d6..278f584fedf0647bf5dbb1c33ed2df11e2a59ad8:/include/wx/scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 62ccdb04b1..6f36cc93f9 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -271,7 +271,7 @@ struct WXDLLIMPEXP_CORE wxScrolledT_Helper
                                  const wxScrollHelperNative *helper,
                                  const wxSize& origBest);
 #ifdef __WXMSW__
-    static WXLRESULT FilterMSWWindowProc(WXLRESULT origResult);
+    static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult);
 #endif
 };
 
@@ -306,7 +306,7 @@ public:
         m_targetWindow = this;
 
 #ifdef __WXMAC__
-        MacSetClipChildren(true);
+        this->MacSetClipChildren(true);
 #endif
 
         this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));
@@ -325,7 +325,7 @@ public:
 #ifdef __WXMSW__
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
     {
-        return FilterMSWWindowProc(T::MSWWindowProc(nMsg, wParam, lParam));
+        return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam));
     }
 #endif // __WXMSW__
 
@@ -348,7 +348,11 @@ private:
         event.Skip();
     }
 
+    // VC++ 6 gives warning for the declaration of template member function
+    // without definition
+#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)
     DECLARE_NO_COPY_CLASS(wxScrolled)
+#endif
 };
 
 // VC++ <= 6 requires this; it's unlikely any other specializations would