VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 26844dfc0560bf799d94a7fb0abd5c4486c17e91..8ad47c2b837bbc0cb1ede3418e61edf7361e0d1a 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -26,7 +26,6 @@
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif

-

 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"
 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"


@@ -66,6 +65,14 @@
 #   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


@@ -92,7 +99,7 @@ static wxString ConstructLibraryName(const wxString& basename)
 #   else       //__HPUX__
         fullname << ".so";
 #   endif      //__HPUX__
 #   else       //__HPUX__
         fullname << ".so";
 #   endif      //__HPUX__

-#elif defined(__WINDOWS__)
+#elif defined(__WINDOWS__) || defined(__OS2__)

     fullname << ".dll";
 #endif
 
     fullname << ".dll";
 #endif
 


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

-#ifdef __UNIX__
-    return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
+#if defined( HAVE_DLOPEN )
+   // 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
 #else

-    wxFAIL_MSG(_("This method is not implemented under Windows"));
-
-    return 0;
+   wxFAIL_MSG(_("This method is not implemented under Windows or OS/2"));
+   return 0;

 #endif
 }
 
 #endif
 }
 


@@ -204,6 +214,9 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
         wxASSERT_MSG( 1 , (char*)myErrName ) ;
         return NULL ;
     }
         wxASSERT_MSG( 1 , (char*)myErrName ) ;
         return NULL ;
     }

+#elif defined(__OS2__)
+    char                            zError[256] = "";
+    wxDllOpen(zError, libname, handle);

 #else // !Mac
     handle = wxDllOpen(libname);
 #endif // OS
 #else // !Mac
     handle = wxDllOpen(libname);
 #endif // OS


@@ -245,6 +258,8 @@ 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__ )
+    wxDllGetSymbol(dllHandle, symbol);

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


@@ -261,7 +276,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)

 {
 }
 
 {
 }
 


@@ -283,9 +298,14 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     wxLibrary *lib;
     wxClassInfo *old_sm_first;
 
     wxLibrary *lib;
     wxClassInfo *old_sm_first;
 

+#if defined(__VISAGECPP__)
+    node = m_loaded.Find(name.GetData());
+    if (node != NULL)
+        return ((wxLibrary *)node->Data());
+#else // !OS/2

     if ( (node = m_loaded.Find(name.GetData())) )
         return ((wxLibrary *)node->Data());
     if ( (node = m_loaded.Find(name.GetData())) )
         return ((wxLibrary *)node->Data());

-
+#endif

     // If DLL shares data, this is necessary.
     old_sm_first = wxClassInfo::sm_first;
     wxClassInfo::sm_first = NULL;
     // If DLL shares data, this is necessary.
     old_sm_first = wxClassInfo::sm_first;
     wxClassInfo::sm_first = NULL;


@@ -302,7 +322,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
         libPath << ':' << envLibPath;
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
         libPath << ':' << envLibPath;

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

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