X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d94009faa51ae4018e08ced13cfdfe575b03f08..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 8df394b0e4..69d5bc700e 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dynlib.cpp
+// Name:        src/common/dynlib.cpp
 // Purpose:     Dynamic library management
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -21,34 +21,30 @@
 // 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/platinfo.h"
 
 #include "wx/arrimpl.cpp"
 
-#if defined(__WXMAC__)
-    #include "wx/mac/private.h"
-#endif
-
-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
 
 // ============================================================================
 // implementation
@@ -59,13 +55,11 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
 // ---------------------------------------------------------------------------
 
 #if defined(__WXPM__) || defined(__EMX__)
-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-    const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;
+    const wxString wxDynamicLibrary::ms_dllext(_T(".dll"));
 #endif
 
 // for MSW/Unix it is defined in platform-specific file
-#if !(defined(__WXMSW__) && (!defined(__UNIX__) || defined(__EMX__)))
+#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
 
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {
@@ -96,36 +90,14 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
     // 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] = "";
+#if defined(__WXPM__) || defined(__EMX__)
+    char err[256] = "";
     DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
-#else
+#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();
@@ -145,10 +117,8 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 /* 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 );
 #else
     #error  "runtime shared lib support not implemented"
 #endif
@@ -164,19 +134,7 @@ void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
     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__)
+#if defined(__WXPM__) || defined(__EMX__)
     DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
 #else
     symbol = RawGetSymbol(m_handle, name);
@@ -247,11 +205,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');