Use wxMenuBar::Attach/Detach() instead of SetInvokingWindow() in wxGTK1.

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 8e106a6babb5fd3d7683d9fa112e4b4d0c6b2600..1b41c43d9bd102b3b6119897a57e63c484dde4ab 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -404,11 +404,18 @@ private:
 
     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 
     // VC++ 6 gives warning for the declaration of template member function
     // without definition

-#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)
+#ifndef __VISUALC6__

     wxDECLARE_NO_COPY_CLASS(wxScrolled);
 #endif
 };
 
     wxDECLARE_NO_COPY_CLASS(wxScrolled);
 #endif
 };
 

+#ifdef __VISUALC6__
+    // disable the warning about non dll-interface class used as base for
+    // dll-interface class: it's harmless in this case
+    #pragma warning(push)
+    #pragma warning(disable:4275)
+#endif
+

 // for compatibility with existing code, we provide wxScrolledWindow
 // "typedef" for wxScrolled<wxPanel>. It's not a real typedef because we
 // want wxScrolledWindow to show in wxRTTI information (the class is widely
 // for compatibility with existing code, we provide wxScrolledWindow
 // "typedef" for wxScrolled<wxPanel>. It's not a real typedef because we
 // want wxScrolledWindow to show in wxRTTI information (the class is widely


@@ -430,4 +437,8 @@ public:
 
 typedef wxScrolled<wxWindow> wxScrolledCanvas;
 
 
 typedef wxScrolled<wxWindow> wxScrolledCanvas;
 

+#ifdef __VISUALC6__
+    #pragma warning(pop)
+#endif
+

 #endif // _WX_SCROLWIN_H_BASE_
 #endif // _WX_SCROLWIN_H_BASE_