Added parent window parameter to wxHelpController constructor

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 357a013e5e55f1753e734b4275f2d252e1b5ceea..949149332de496c6b75a986b4c02d14f54c6a20d 100644 (file)
--- 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,10 +21,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#   pragma implementation "dynlib.h"
-#endif
-
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -48,7 +44,7 @@
     #include "wx/mac/private.h"
 #endif
 
-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
 
 // ============================================================================
 // implementation
@@ -64,8 +60,8 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
     const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;
 #endif
 
-// for Unix it is in src/unix/dlunix.cpp
-#if !defined(__UNIX__) || defined(__EMX__)
+// for MSW/Unix it is defined in platform-specific file
+#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
 
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {
@@ -73,7 +69,8 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
    return 0;
 }
 
-#endif // __UNIX__
+#endif // __WXMSW__ || __UNIX__
+
 
 bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 {
@@ -119,7 +116,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";
-    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
+    DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
 #else
     m_handle = RawLoad(libname, flags);
 #endif
@@ -144,7 +141,7 @@ 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 );
@@ -176,7 +173,7 @@ void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 #elif defined(__WXPM__) || defined(__EMX__)
-    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
+    DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );
 #else
     symbol = RawGetSymbol(m_handle, name);
 #endif