Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 60aa48e553d7b27e1e09122bba8741bc7501b684..afaaf084a73bf7df25ca1fe83ef599f3b26cb571 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/wrapwin.h
+// Name:        wx/msw/wrapwin.h

 // Purpose:     Wrapper around <windows.h>, to be included instead of it
 // Author:      Vaclav Slavik
 // Created:     2003/07/22
 // Purpose:     Wrapper around <windows.h>, to be included instead of it
 // Author:      Vaclav Slavik
 // Created:     2003/07/22


@@ -72,14 +72,15 @@
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 

-// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability 
+// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatibility

 // in the WINAPI SDK (they are an integral type that is the size of a
 // in the WINAPI SDK (they are an integral type that is the size of a

-// pointer) on MSVC 7 and later. However, they are not available in older 
-// Platform SDKs, and since they are typedefs and not #defines we simply 
+// pointer) on MSVC 7 and later. However, they are not available in older
+// Platform SDKs, and since they are typedefs and not #defines we simply

 // overwrite them if there is a chance that they're not defined
 // overwrite them if there is a chance that they're not defined

-#if !defined(_MSC_VER) || (_MSC_VER < 1300)
+#if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)

     #define UINT_PTR unsigned int
     #define INT_PTR int
     #define UINT_PTR unsigned int
     #define INT_PTR int

+    #define HANDLE_PTR unsigned long

     #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
     #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long