Fix memory leak by letting the base class version handle the

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index f723f1bf994b918db69ef31a707846b91db183dd..5cd923c50cb5f4f512807cf32cab467fcaa367b0 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -5,7 +5,7 @@
 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vaclav Slavik
 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vaclav Slavik

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WRAPWIN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WRAPWIN_H_


@@ -18,6 +18,20 @@
 #endif
 
 #include <windows.h>
 #endif
 
 #include <windows.h>

+
+#ifdef __WXWINCE__
+    // this doesn't make any sense knowing that windows.h includes all these
+    // headers anyhow, but the fact remains that when building using eVC 4 the
+    // functions and constants from these headers are not defined unless we
+    // explicitly include them ourselves -- how is it possible is beyond me...
+    #include <winbase.h>
+    #include <wingdi.h>
+    #include <winuser.h>
+
+    // this one OTOH contains many useful CE-only functions
+    #include <shellapi.h>
+#endif // __WXWINCE__
+

 #include "wx/msw/winundef.h"
 
 // types DWORD_PTR, ULONG_PTR and so on might be not defined in old headers but
 #include "wx/msw/winundef.h"
 
 // types DWORD_PTR, ULONG_PTR and so on might be not defined in old headers but


@@ -28,7 +42,7 @@
 // this is ugly but what else can we do? even testing for compiler version
 // wouldn't help as you can perfectly well be using an older compiler (VC6)
 // with newer SDK headers
 // this is ugly but what else can we do? even testing for compiler version
 // wouldn't help as you can perfectly well be using an older compiler (VC6)
 // with newer SDK headers

-#ifndef __WIN64__
+#if !defined(__WIN64__) && !defined(__WXWINCE__)

     #define UINT_PTR unsigned int
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
     #define UINT_PTR unsigned int
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long