added missing include; minor reformatting

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index e9327829b671032ee22b752812e339fbff2a57ab..2e8afc8f0098f2b934f23e0ea54e7804a8f63398 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:
 // Purpose:     Dynamic library management
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -44,7 +44,7 @@
     #include "wx/mac/private.h"
 #endif
 
     #include "wx/mac/private.h"
 #endif
 

-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -117,7 +117,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";
     DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";
     DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);

-#else
+#else // this should be the only remaining branch eventually

     m_handle = RawLoad(libname, flags);
 #endif
 
     m_handle = RawLoad(libname, flags);
 #endif
 


@@ -141,7 +141,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 /* static */
 void wxDynamicLibrary::Unload(wxDllType handle)
 {
 /* 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 );
     DosFreeModule( handle );
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     CloseConnection( (CFragConnectionID*) &handle );