changed copyright to SciTech one

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 334db2efe73526d06ef870cce63c033ac22f4553..20b4d94676bc723a73e6f0fd734abd95b1a001d6 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -16,6 +16,11 @@
 
 #include <windows.h>
 
 
 #include <windows.h>
 

+#ifdef __WXMICROWIN__
+/* Extra prototypes and symbols not defined by MicroWindows */
+#include "wx/msw/microwin.h"
+#endif
+

 // undefine conflicting symbols which were defined in windows.h
 #include "wx/msw/winundef.h"
 
 // undefine conflicting symbols which were defined in windows.h
 #include "wx/msw/winundef.h"
 


@@ -184,7 +189,7 @@ extern LONG APIENTRY _EXPORT
 // ---------------------------------------------------------------------------
 
 // a wrapper macro for ZeroMemory()
 // ---------------------------------------------------------------------------
 
 // a wrapper macro for ZeroMemory()

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)

 #define wxZeroMemory(obj)   ::ZeroMemory(&obj, sizeof(obj))
 #else
 #define wxZeroMemory(obj)   memset((void*) & obj, 0, sizeof(obj))
 #define wxZeroMemory(obj)   ::ZeroMemory(&obj, sizeof(obj))
 #else
 #define wxZeroMemory(obj)   memset((void*) & obj, 0, sizeof(obj))