removing non darwin mac source
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,8 +60,6 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
|
|||||||
|
|
||||||
#if defined(__WXPM__) || defined(__EMX__)
|
#if defined(__WXPM__) || defined(__EMX__)
|
||||||
const wxString wxDynamicLibrary::ms_dllext(_T(".dll"));
|
const wxString wxDynamicLibrary::ms_dllext(_T(".dll"));
|
||||||
#elif defined(__WXMAC__) && !defined(__DARWIN__)
|
|
||||||
const wxString wxDynamicLibrary::ms_dllext; // empty string
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// for MSW/Unix it is defined in platform-specific file
|
// for MSW/Unix it is defined in platform-specific file
|
||||||
@@ -96,29 +94,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
|
|||||||
// different ways to load a shared library
|
// different ways to load a shared library
|
||||||
//
|
//
|
||||||
// FIXME: should go to the platform-specific files!
|
// FIXME: should go to the platform-specific files!
|
||||||
#if defined(__WXMAC__) && !defined(__DARWIN__)
|
#if defined(__WXPM__) || defined(__EMX__)
|
||||||
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] = "";
|
char err[256] = "";
|
||||||
DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
|
DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
|
||||||
#else // this should be the only remaining branch eventually
|
#else // this should be the only remaining branch eventually
|
||||||
@@ -147,8 +123,6 @@ void wxDynamicLibrary::Unload(wxDllType handle)
|
|||||||
{
|
{
|
||||||
#if defined(__OS2__) || defined(__EMX__)
|
#if defined(__OS2__) || defined(__EMX__)
|
||||||
DosFreeModule( handle );
|
DosFreeModule( handle );
|
||||||
#elif defined(__WXMAC__) && !defined(__DARWIN__)
|
|
||||||
CloseConnection( (CFragConnectionID*) &handle );
|
|
||||||
#else
|
#else
|
||||||
#error "runtime shared lib support not implemented"
|
#error "runtime shared lib support not implemented"
|
||||||
#endif
|
#endif
|
||||||
@@ -164,19 +138,7 @@ void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
|
|||||||
void *symbol = 0;
|
void *symbol = 0;
|
||||||
|
|
||||||
wxUnusedVar(symbol);
|
wxUnusedVar(symbol);
|
||||||
#if defined(__WXMAC__) && !defined(__DARWIN__)
|
#if defined(__WXPM__) || defined(__EMX__)
|
||||||
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, name.c_str(), (PFN*)symbol );
|
DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
|
||||||
#else
|
#else
|
||||||
symbol = RawGetSymbol(m_handle, name);
|
symbol = RawGetSymbol(m_handle, name);
|
||||||
|
Reference in New Issue
Block a user