fixing osx_cocoa

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 2e8afc8f0098f2b934f23e0ea54e7804a8f63398..d8ab264fb4a03c057259d18bebc5a110ec0755bf 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -24,26 +24,26 @@
 #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)
 
 // ============================================================================
@@ -55,9 +55,7 @@ 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(wxT(".dll"));
 #endif
 
 // for MSW/Unix it is defined in platform-specific file
@@ -74,7 +72,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
 
 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;
@@ -92,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] = "";
-    DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
+#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();
@@ -143,8 +119,6 @@ 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
@@ -155,25 +129,13 @@ void wxDynamicLibrary::Unload(wxDllType handle)
 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
@@ -216,7 +178,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
     switch ( cat )
     {
         default:
-            wxFAIL_MSG( _T("unknown wxDynamicLibraryCategory value") );
+            wxFAIL_MSG( wxT("unknown wxDynamicLibraryCategory value") );
             // fall through
 
         case wxDL_MODULE:
@@ -225,7 +187,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
 
         case wxDL_LIBRARY:
             // library names should start with "lib" under Unix
-            nameCanonic = _T("lib");
+            nameCanonic = wxT("lib");
             break;
     }
 #else // !__UNIX__
@@ -243,21 +205,17 @@ 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');
+    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__)
@@ -282,13 +240,13 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
 #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