From: Włodzimierz Skiba Date: Tue, 18 Jan 2005 10:10:23 +0000 (+0000) Subject: wxWinCE fixes. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/23ee4b4874aa32111eca609bfe4c9e62e6ca5a6a 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 10e32496a5..a4b945ee81 100644 --- 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 +#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 cd0d38ae2c..177dd7e202 100644 --- 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 71f5e6521e..ad156d3ffe 100644 --- 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()