centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 8eb09bfabd6c25b9fa6cb3b84e61cd24c8134906..e51fbcf72b5d8e17a37212758c44928c19817d4b 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:


@@ -21,10 +21,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#   pragma implementation "dynlib.h"
-#endif
-

 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -48,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


@@ -120,8 +116,8 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";

-    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
-#else
+    DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
+#else // this should be the only remaining branch eventually

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


@@ -145,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 );


@@ -177,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__)
     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
 #else
     symbol = RawGetSymbol(m_handle, name);
 #endif


@@ -249,8 +245,8 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
     {
         wxAppTraits *traits = wxAppConsole::GetInstance() ?
                               wxAppConsole::GetInstance()->GetTraits() : NULL;
     {
         wxAppTraits *traits = wxAppConsole::GetInstance() ?
                               wxAppConsole::GetInstance()->GetTraits() : NULL;

-        wxASSERT_MSG( traits,
-               _("can't query for GUI plugins name in console applications") );
+        wxCHECK_MSG( traits, _T(""),
+                     _("can't query for GUI plugins name in console applications") );

         suffix = traits->GetToolkitInfo().shortName;
     }
 #if wxUSE_UNICODE
         suffix = traits->GetToolkitInfo().shortName;
     }
 #if wxUSE_UNICODE