another assert added to check incorrect use of ctor

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 228cc67835076b870f01312eda39b99a06de11c9..f75c99e93fb6118653ffdaba0234b004eb6cd92b 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -22,6 +22,9 @@
 #endif
 
 #include  "wx/wxprec.h"
 #endif
 
 #include  "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 #ifdef __BORLANDC__
   #pragma hdrstop
 
 #ifdef __BORLANDC__
   #pragma hdrstop


@@ -38,7 +41,13 @@
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-#if defined(HAVE_DLOPEN)
+#if defined(__WXPM__) || defined(__EMX__)
+#  define INCL_DOS
+#  include <os2.h>
+#  define wxDllOpen(error, lib, handle)     DosLoadModule(error, sizeof(error), lib, &handle)
+#  define wxDllGetSymbol(handle, modaddr)   DosQueryProcAddr(handle, 1L, NULL, (PFN*)modaddr)
+#  define wxDllClose(handle)                DosFreeModule(handle)
+#elif defined(HAVE_DLOPEN)

 #   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
 #   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
 #   define wxDllClose                    dlclose
 #   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
 #   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
 #   define wxDllClose                    dlclose


@@ -55,8 +64,6 @@
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-#   include <windows.h>
-

     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)


@@ -65,14 +72,6 @@
 #   endif  // Win32/16
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary
 #   endif  // Win32/16
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary

-
-#elif defined(__OS2__)
-
-#  define INCL_DOS
-#  include <os2.h>
-#  define wxDllOpen(error, lib, handle)     DosLoadModule(error, sizeof(error), lib, &handle)
-#  define wxDllGetSymbol(handle, modaddr)   DosQueryProcAddr(handle, 1L, NULL, (PFN*)modaddr)
-#  define wxDllClose(handle)                DosFreeModule(handle)

 #else
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS
 #else
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS


@@ -93,14 +92,14 @@ static wxString ConstructLibraryName(const wxString& basename)
 {
     wxString fullname(basename);
 
 {
     wxString fullname(basename);
 

-#if defined(__UNIX__)
+#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
+    fullname << ".dll";
+#elif defined(__UNIX__)

 #   if defined(__HPUX__)
         fullname << ".sl";
 #   else       //__HPUX__
         fullname << ".so";
 #   endif      //__HPUX__
 #   if defined(__HPUX__)
         fullname << ".sl";
 #   else       //__HPUX__
         fullname << ".so";
 #   endif      //__HPUX__

-#elif defined(__WINDOWS__) || defined(__OS2__)
-    fullname << ".dll";

 #endif
 
     return fullname;
 #endif
 
     return fullname;


@@ -183,15 +182,14 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 wxDllType
 wxDllLoader::GetProgramHandle(void)
 {
 wxDllType
 wxDllLoader::GetProgramHandle(void)
 {

-#if defined( HAVE_DLOPEN )
+#if defined( HAVE_DLOPEN ) && !defined(__EMX__)

    // optain handle for main program
    return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/); 
 #elif defined (HAVE_SHL_LOAD)
    // shl_findsymbol with NULL handle looks up in main program
    return 0; 
 #else
    // optain handle for main program
    return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/); 
 #elif defined (HAVE_SHL_LOAD)
    // shl_findsymbol with NULL handle looks up in main program
    return 0; 
 #else

-#warning "Please implement this for your system!"
-   wxFAIL_MSG(_("This method is not implemented under Windows or OS/2"));
+   wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));

    return 0;
 #endif
 }
    return 0;
 #endif
 }


@@ -215,7 +213,7 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
         wxASSERT_MSG( 1 , (char*)myErrName ) ;
         return NULL ;
     }
         wxASSERT_MSG( 1 , (char*)myErrName ) ;
         return NULL ;
     }

-#elif defined(__OS2__)
+#elif defined(__WXPM__) || defined(__EMX__)

     char                            zError[256] = "";
     wxDllOpen(zError, libname, handle);
 #else // !Mac
     char                            zError[256] = "";
     wxDllOpen(zError, libname, handle);
 #else // !Mac


@@ -259,7 +257,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 
     if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
         symbol = (void *)symAddress ;
 
     if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
         symbol = (void *)symAddress ;

-#elif defined( __OS2__ )
+#elif defined( __WXPM__ ) || defined(__EMX__)

     wxDllGetSymbol(dllHandle, symbol);
 #else
     symbol = wxDllGetSymbol(dllHandle, name);
     wxDllGetSymbol(dllHandle, symbol);
 #else
     symbol = wxDllGetSymbol(dllHandle, name);


@@ -277,7 +275,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 

-wxLibraries::wxLibraries()
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)

 {
 }
 
 {
 }
 


@@ -322,13 +320,13 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )

-        libPath << ':' << envLibPath;
-    wxStringTokenizer tokenizer(libPath, _T(':'));
+        libPath << wxT(':') << envLibPath;
+    wxStringTokenizer tokenizer(libPath, wxT(':'));

     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 
     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 

-        fullname << '/' << libname;
+        fullname << wxT('/') << libname;

         if ( wxFileExists(fullname) )
         {
             libname = fullname;
         if ( wxFileExists(fullname) )
         {
             libname = fullname;