Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress VC6 warnings about non-DLL-exported class for wxScrolled.

Browse Source 
It's harmless to derive wxScrolledWindow from wxScrolled<> so suppress the
warnings about it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-22 11:18:11 +00:00
parent 982d7f9317
commit ce38e440a6
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/scrolwin.h
View File

@@ -404,11 +404,18 @@ private:
// VC++ 6 gives warning for the declaration of template member function // VC++ 6 gives warning for the declaration of template member function
// without definition // without definition
#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7) #ifndef __VISUALC6__
wxDECLARE_NO_COPY_CLASS(wxScrolled); wxDECLARE_NO_COPY_CLASS(wxScrolled);
#endif #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 // for compatibility with existing code, we provide wxScrolledWindow
// "typedef" for wxScrolled<wxPanel>. It's not a real typedef because we // "typedef" for wxScrolled<wxPanel>. It's not a real typedef because we
// want wxScrolledWindow to show in wxRTTI information (the class is widely // 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_