wxWinCE fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/debughlp.h b/include/wx/msw/debughlp.h
index 10e32496a59f8cfa5b9f7908a2cba9974634b9af..a4b945ee81eb83acbe807a8b91d94ea9009ecf44 100644 (file)
--- a/include/wx/msw/debughlp.h
+++ b/include/wx/msw/debughlp.h
@@ -15,7 +15,9 @@
 #include "wx/dynlib.h"
 
 #include "wx/msw/wrapwin.h"
+#ifndef __WXWINCE__
 #include <imagehlp.h>
+#endif // __WXWINCE__
 #include "wx/msw/private.h"
 
 // we need to determine whether we have the declarations for the function in

diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index cd0d38ae2c6b0fb31a7a84455178a89a69032e30..177dd7e2021aca9421b75879e0c4344f65e1c1eb 100644 (file)
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -262,7 +262,13 @@ void wxDynamicLibrary::Unload(wxDllType handle)
 /* static */
 void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 {
-    return (void *)::GetProcAddress(handle, name.ToAscii());
+    return (void *)::GetProcAddress(handle,
+#ifdef __WXWINCE__
+                                            name.c_str()
+#else
+                                            name.ToAscii()
+#endif // __WXWINCE__
+                                   );
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 71f5e6521e775a864eb66094b9670987acb7b7b3..ad156d3ffea050a98db1c84db7afcf627f05156e 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -32,6 +32,7 @@
 #endif  //WX_PRECOMP
 
 #include "wx/apptrait.h"
+#include "wx/dynlib.h"
 #include "wx/dynload.h"
 
 #include "wx/confbase.h"        // for wxExpandEnvVars()