check for comctl32.dll version in wxUxThemeEngine::Initialize()

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 87282cf37508682cc9cd429c00dbe2f3044cc82d..741f43dc98ac33ad647f3b2072083ece33070d39 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -60,6 +60,8 @@
 #   pragma warning(disable:4244)    // conversion from double to float
 #   pragma warning(disable:4710)    // function not inlined
 #   pragma warning(disable:4097)    // typedef used as class
 #   pragma warning(disable:4244)    // conversion from double to float
 #   pragma warning(disable:4710)    // function not inlined
 #   pragma warning(disable:4097)    // typedef used as class

+#   pragma warning(disable:4511)    // copy ctor couldn't be generated
+#   pragma warning(disable:4512)    // operator=() couldn't be generated

 #ifndef WIN32
 #   pragma warning(disable:4135)    // conversion between different integral types
 #   pragma warning(disable:4769)    // assignment of near pointer to long integer
 #ifndef WIN32
 #   pragma warning(disable:4135)    // conversion between different integral types
 #   pragma warning(disable:4769)    // assignment of near pointer to long integer


@@ -395,6 +397,7 @@ typedef int wxWindowID;
         #define WXMAKINGDLL_BASE
     #endif
 
         #define WXMAKINGDLL_BASE
     #endif
 

+    #define WXMAKINGDLL_NET

     #define WXMAKINGDLL_CORE
     #define WXMAKINGDLL_HTML
     #define WXMAKINGDLL_XML
     #define WXMAKINGDLL_CORE
     #define WXMAKINGDLL_HTML
     #define WXMAKINGDLL_XML


@@ -413,6 +416,17 @@ typedef int wxWindowID;
     #define WXDLLIMPEXP_DATA_BASE(type) type
 #endif
 
     #define WXDLLIMPEXP_DATA_BASE(type) type
 #endif
 

+#ifdef WXMAKINGDLL_NET
+    #define WXDLLIMPEXP_NET WXEXPORT
+    #define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_NET WXIMPORT
+    #define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_NET
+    #define WXDLLIMPEXP_DATA_NET(type) type
+#endif
+

 #ifdef WXMAKINGDLL_CORE
     #define WXDLLIMPEXP_CORE WXEXPORT
     #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
 #ifdef WXMAKINGDLL_CORE
     #define WXDLLIMPEXP_CORE WXEXPORT
     #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type