Cleanup of previous fix

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 570922a169f3455417dd9b1990b5fcd4dc631dd9..6f36cc93f9deda64b2b3bb34078ff458bfbb6759 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -306,7 +306,7 @@ public:
         m_targetWindow = this;
 
 #ifdef __WXMAC__
-        MacSetClipChildren(true);
+        this->MacSetClipChildren(true);
 #endif
 
         this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));
@@ -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