#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"
-#if defined(__WXMAC__)
- #include "wx/mac/private.h"
-#endif
-
WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
// ============================================================================
// wxDynamicLibrary
// ---------------------------------------------------------------------------
-#if defined(__WXPM__) || defined(__EMX__)
- const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;
-#endif
-
// for MSW/Unix it is defined in platform-specific file
-#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
+#if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__)
wxDllType wxDynamicLibrary::GetProgramHandle()
{
return 0;
}
-#endif // __WXMSW__ || __UNIX__
+#endif // __WINDOWS__ || __UNIX__
bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
{
- wxASSERT_MSG(m_handle == 0, _T("Library already loaded."));
+ wxASSERT_MSG(m_handle == 0, wxT("Library already loaded."));
// add the proper extension for the DLL ourselves unless told not to
wxString libname = libnameOrig;
wxFileName::SplitPath(libname, NULL, NULL, &ext);
if ( ext.empty() )
{
- libname += GetDllExt();
+ libname += GetDllExt(wxDL_MODULE);
}
}
// different ways to load a shared library
//
// FIXME: should go to the platform-specific files!
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- FSSpec myFSSpec;
- Ptr myMainAddr;
- Str255 myErrName;
-
- wxMacFilename2FSSpec( libname , &myFSSpec );
-
- if( GetDiskFragment( &myFSSpec,
- 0,
- kCFragGoesToEOF,
- "\p",
- kPrivateCFragCopy,
- &m_handle,
- &myMainAddr,
- myErrName ) != noErr )
- {
- wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
- libname.c_str(),
- wxMacMakeStringFromPascal( myErrName ).c_str() );
- m_handle = 0;
- }
-
-#elif defined(__WXPM__) || defined(__EMX__)
- char err[256] = "";
- DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
-#else
+#if defined(__WXPM__) || defined(__EMX__)
+ char err[256] = "";
+ DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
+#else // this should be the only remaining branch eventually
m_handle = RawLoad(libname, flags);
#endif
- if ( m_handle == 0 )
+ if ( m_handle == 0 && !(flags & wxDL_QUIET) )
{
#ifdef wxHAVE_DYNLIB_ERROR
Error();
// for MSW and Unix this is implemented in the platform-specific file
//
// TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
-#if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__)
+#if (!defined(__WINDOWS__) && !defined(__UNIX__)) || defined(__EMX__)
/* static */
void wxDynamicLibrary::Unload(wxDllType handle)
{
#if defined(__OS2__) || defined(__EMX__)
DosFreeModule( handle );
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- CloseConnection( (CFragConnectionID*) &handle );
#else
#error "runtime shared lib support not implemented"
#endif
}
-#endif // !(__WXMSW__ || __UNIX__)
+#endif // !(__WINDOWS__ || __UNIX__)
void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
{
wxCHECK_MSG( IsLoaded(), NULL,
- _T("Can't load symbol from unloaded library") );
+ wxT("Can't load symbol from unloaded library") );
void *symbol = 0;
wxUnusedVar(symbol);
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- Ptr symAddress;
- CFragSymbolClass symClass;
- Str255 symName;
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) symName, name.fn_str() );
-#else
- strcpy( (char *)symName, name.fn_str() );
- c2pstr( (char *)symName );
-#endif
- if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
- symbol = (void *)symAddress;
-#elif defined(__WXPM__) || defined(__EMX__)
- DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );
+#if defined(__WXPM__) || defined(__EMX__)
+ DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
#else
symbol = RawGetSymbol(m_handle, name);
#endif
// informational methods
// ----------------------------------------------------------------------------
+/*static*/
+wxString wxDynamicLibrary::GetDllExt(wxDynamicLibraryCategory cat)
+{
+ wxUnusedVar(cat);
+#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
+ return ".dll";
+#elif defined(__HPUX__)
+ return ".sl";
+#elif defined(__DARWIN__)
+ switch ( cat )
+ {
+ case wxDL_LIBRARY:
+ return ".dylib";
+ case wxDL_MODULE:
+ return ".bundle";
+ }
+ wxFAIL_MSG("unreachable");
+ return wxString(); // silence gcc warning
+#else
+ return ".so";
+#endif
+}
+
/*static*/
wxString
wxDynamicLibrary::CanonicalizeName(const wxString& name,
#if defined(__UNIX__) && !defined(__EMX__)
switch ( cat )
{
- default:
- wxFAIL_MSG( _T("unknown wxDynamicLibraryCategory value") );
- // fall through
-
- case wxDL_MODULE:
- // don't do anything for modules, their names are arbitrary
- break;
-
case wxDL_LIBRARY:
- // library names should start with "lib" under Unix
- nameCanonic = _T("lib");
+ // Library names should start with "lib" under Unix.
+ nameCanonic = "lib";
+ break;
+ case wxDL_MODULE:
+ // Module names are arbitrary and should have no prefix added.
break;
}
-#else // !__UNIX__
- wxUnusedVar(cat);
-#endif // __UNIX__/!__UNIX__
+#endif
+
+ nameCanonic << name << GetDllExt(cat);
- nameCanonic << name << GetDllExt();
return nameCanonic;
}
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');
+ suffix << wxT('u');
#endif
#ifdef __WXDEBUG__
- suffix << _T('d');
+ suffix << wxT('d');
#endif
if ( !suffix.empty() )
- suffix = wxString(_T("_")) + suffix;
+ suffix = wxString(wxT("_")) + suffix;
#define WXSTRINGIZE(x) #x
#if defined(__UNIX__) && !defined(__EMX__)
#ifdef __WINDOWS__
// Add compiler identification:
#if defined(__GNUG__)
- suffix << _T("_gcc");
+ suffix << wxT("_gcc");
#elif defined(__VISUALC__)
- suffix << _T("_vc");
+ suffix << wxT("_vc");
#elif defined(__WATCOMC__)
- suffix << _T("_wat");
+ suffix << wxT("_wat");
#elif defined(__BORLANDC__)
- suffix << _T("_bcc");
+ suffix << wxT("_bcc");
#endif
#endif
projects / wxWidgets.git / blobdiff