More _T() in asserts...

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 40bba2b170f7da2a275183760200386136115c95..26844dfc0560bf799d94a7fb0abd5c4486c17e91 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -23,9 +23,9 @@
 
 #include  "wx/wxprec.h"
 
 
 #include  "wx/wxprec.h"
 

-#ifdef    __BORLANDC__
-#   pragma hdrstop
-#endif  //__BORLANDC__
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif

 
 #if wxUSE_DYNLIB_CLASS
 
 
 #if wxUSE_DYNLIB_CLASS
 


@@ -40,7 +40,7 @@
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)

-#   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY)
+#   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)

 #   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
 #   define wxDllClose                    dlclose
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
 #   define wxDllClose                    dlclose
 #elif defined(HAVE_SHL_LOAD)


@@ -174,64 +174,85 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 
 /* static */
 wxDllType
 
 /* static */
 wxDllType

-wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success)
+wxDllLoader::GetProgramHandle(void)

 {
 {

-   wxASSERT(success);
-   
-   wxDllType handle;
+#ifdef __UNIX__
+    return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
+#else
+    wxFAIL_MSG(_("This method is not implemented under Windows"));
+
+    return 0;
+#endif
+}
+
+/* static */
+wxDllType
+wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
+{
+    wxDllType handle;

 
 #if defined(__WXMAC__)
 
 #if defined(__WXMAC__)

-   FSSpec myFSSpec ;
-   Ptr myMainAddr ;
-   Str255      myErrName ;
-   
-   wxMacPathToFSSpec( lib_name , &myFSSpec ) ;
-   if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
-                        myErrName ) != noErr )
-   {
-      p2cstr( myErrName ) ;
-      wxASSERT_MSG( 1 , (char*)myErrName ) ;
-      return NULL ;
-   }
+    FSSpec myFSSpec ;
+    Ptr        myMainAddr ;
+    Str255     myErrName ;
+
+    wxMacPathToFSSpec( libname , &myFSSpec ) ;
+    if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
+                myErrName ) != noErr )
+    {
+        p2cstr( myErrName ) ;
+        wxASSERT_MSG( 1 , (char*)myErrName ) ;
+        return NULL ;
+    }

 #else // !Mac
 #else // !Mac

-   handle = wxDllOpen(lib_name);
+    handle = wxDllOpen(libname);

 #endif // OS
 
 #endif // OS
 

-   if ( !handle )
-   {
-      wxLogSysError(_("Failed to load shared library '%s'"),
-                    lib_name.c_str());
-      *success = FALSE;
-      return NULL;
-   }
-   *success = TRUE;
-   return handle;
+    if ( !handle )
+    {
+        wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
+    }
+
+    if ( success )
+    {
+        *success = handle != 0;
+    }
+
+    return handle;
+}
+
+
+/* static */
+void
+wxDllLoader::UnloadLibrary(wxDllType handle)
+{
+   wxDllClose(handle);

 }
 
 /* static */
 void *
 wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 {
 }
 
 /* static */
 void *
 wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 {

-   void *symbol = NULL;    // return value
+    void *symbol = NULL;    // return value

 
 #if defined( __WXMAC__ )
 
 #if defined( __WXMAC__ )

-   Ptr symAddress ;
-   CFragSymbolClass symClass ;
-   Str255      symName ;
-   
-   strcpy( (char*) symName , name ) ;
-   c2pstr( (char*) symName ) ;
-   
-   if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
-      symbol = (void *)symAddress ; 
+    Ptr symAddress ;
+    CFragSymbolClass symClass ;
+    Str255     symName ;
+
+    strcpy( (char*) symName , name ) ;
+    c2pstr( (char*) symName ) ;
+
+    if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
+        symbol = (void *)symAddress ;

 #else
     symbol = wxDllGetSymbol(dllHandle, name);
 #endif
 
     if ( !symbol )
     {
 #else
     symbol = wxDllGetSymbol(dllHandle, name);
 #endif
 
     if ( !symbol )
     {

-       wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
-                     name.c_str());
+        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
+                      name.c_str());

     }
     return symbol;
 }
     }
     return symbol;
 }


@@ -269,7 +290,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     old_sm_first = wxClassInfo::sm_first;
     wxClassInfo::sm_first = NULL;
 
     old_sm_first = wxClassInfo::sm_first;
     wxClassInfo::sm_first = NULL;
 

-    wxString lib_name = ConstructLibraryName(name);
+    wxString libname = ConstructLibraryName(name);

 
 /*
   Unix automatically builds that library name, at least for dlopen()
 
 /*
   Unix automatically builds that library name, at least for dlopen()


@@ -286,10 +307,10 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     {
         wxString fullname(tokenizer.NextToken());
 
     {
         wxString fullname(tokenizer.NextToken());
 

-        fullname << '/' << lib_name;
+        fullname << '/' << libname;

         if ( wxFileExists(fullname) )
         {
         if ( wxFileExists(fullname) )
         {

-            lib_name = fullname;
+            libname = fullname;

 
             // found the library
             break;
 
             // found the library
             break;


@@ -301,7 +322,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 #endif
 
     bool success = FALSE;
 #endif
 
     bool success = FALSE;

-    wxDllType handle = wxDllLoader::LoadLibrary(lib_name, &success);
+    wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);

     if(success)
     {
        lib = new wxLibrary(handle);
     if(success)
     {
        lib = new wxLibrary(handle);