X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c28639791ab5706eca36489e4f776b7ef6756eb..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/common/dynlib.cpp diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 2e8afc8f00..3e78472bce 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -24,19 +24,23 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DYNLIB_CLASS #include "wx/dynlib.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" +#endif //WX_PRECOMP + #include "wx/filefn.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/utils.h" #include "wx/filename.h" // for SplitPath() -#include "wx/app.h" -#include "wx/apptrait.h" +#include "wx/platinfo.h" #include "wx/arrimpl.cpp" @@ -115,7 +119,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) } #elif defined(__WXPM__) || defined(__EMX__) - char err[256] = ""; + char err[256] = ""; DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle); #else // this should be the only remaining branch eventually m_handle = RawLoad(libname, flags); @@ -243,11 +247,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name, wxString suffix; if ( cat == wxDL_PLUGIN_GUI ) { - wxAppTraits *traits = wxAppConsole::GetInstance() ? - wxAppConsole::GetInstance()->GetTraits() : NULL; - wxASSERT_MSG( traits, - _("can't query for GUI plugins name in console applications") ); - suffix = traits->GetToolkitInfo().shortName; + suffix = wxPlatformInfo::Get().GetPortIdShortName(); } #if wxUSE_UNICODE suffix << _T('u');