/////////////////////////////////////////////////////////////////////////////
-// Name: dynlib.cpp
+// Name: src/common/dynlib.cpp
// Purpose: Dynamic library management
// Author: Guilhem Lavaux
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-# pragma implementation "dynlib.h"
-#endif
-
#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/arrimpl.cpp"
#include "wx/mac/private.h"
#endif
-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
// ============================================================================
// implementation
const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;
#endif
-// for Unix it is in src/unix/dlunix.cpp
-#if !defined(__UNIX__) || defined(__EMX__)
+// for MSW/Unix it is defined in platform-specific file
+#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
wxDllType wxDynamicLibrary::GetProgramHandle()
{
return 0;
}
-#endif // __UNIX__
+#endif // __WXMSW__ || __UNIX__
+
bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
{
}
#elif defined(__WXPM__) || defined(__EMX__)
- char err[256] = "";
- DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
-#else
+ 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);
#endif
/* static */
void wxDynamicLibrary::Unload(wxDllType handle)
{
-#if defined(__WXPM__) || defined(__EMX__)
+#if defined(__OS2__) || defined(__EMX__)
DosFreeModule( handle );
#elif defined(__WXMAC__) && !defined(__DARWIN__)
CloseConnection( (CFragConnectionID*) &handle );
if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
symbol = (void *)symAddress;
#elif defined(__WXPM__) || defined(__EMX__)
- DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
+ DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );
#else
symbol = RawGetSymbol(m_handle, name);
#endif
{
wxAppTraits *traits = wxAppConsole::GetInstance() ?
wxAppConsole::GetInstance()->GetTraits() : NULL;
- wxASSERT_MSG( traits,
- _("can't query for GUI plugins name in console applications") );
+ wxCHECK_MSG( traits, wxEmptyString,
+ _("can't query for GUI plugins name in console applications") );
suffix = traits->GetToolkitInfo().shortName;
}
#if wxUSE_UNICODE