Rename wxGenericImageList to wxImageList in generic wxListCtrl, too.

[wxWidgets.git] / include / wx / dynlib.h

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 83adf1d77b963fbf80b3a998f29f5695edbb1c4e..a3c4f2d98b0fd9ed06bf9982cf1cb17897894cbf 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -18,7 +18,11 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_DYNLIB_CLASS
+#if wxUSE_DYNAMIC_LOADER
+
+#include "wx/dynload.h"  // Use the new (version of) wxDynamicLibrary instead
+
+#elif wxUSE_DYNLIB_CLASS

 
 #include "wx/string.h"
 #include "wx/list.h"
 
 #include "wx/string.h"
 #include "wx/list.h"


@@ -48,10 +52,10 @@
 #elif defined(__WINDOWS__)
 #   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;
 #elif defined(__WINDOWS__)
 #   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;

-#elif defined(__APPLE__) && defined(__UNIX__)
+#elif defined(__DARWIN__)

     typedef void *wxDllType;
 #elif defined(__WXMAC__)
     typedef void *wxDllType;
 #elif defined(__WXMAC__)

-    typedef CFragConnectionID wxDllType;
+    typedef void *wxDllType;

 #else
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS
 #else
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS


@@ -85,7 +89,7 @@ public:
       if success pointer is not NULL, it will be filled with TRUE if everything
       went ok and FALSE otherwise
      */
       if success pointer is not NULL, it will be filled with TRUE if everything
       went ok and FALSE otherwise
      */

-    static wxDllType LoadLibrary(const wxString& libname, bool *success = NULL);
+    static wxDllType LoadLibrary(const wxString& libname, bool *success = 0);

 
     /*
       This function unloads the shared library previously loaded with
 
     /*
       This function unloads the shared library previously loaded with


@@ -109,14 +113,17 @@ public:
 
        Returns the pointer to the symbol or NULL on error.
      */
 
        Returns the pointer to the symbol or NULL on error.
      */

-    static void * GetSymbol(wxDllType dllHandle, const wxString &name);
+    static void *GetSymbol(wxDllType dllHandle,
+                           const wxString &name,
+                           bool *success = NULL);

 
     // return the standard DLL extension (with leading dot) for this platform
 
     // return the standard DLL extension (with leading dot) for this platform

-    static wxString GetDllExt();
+    static const wxString &GetDllExt() { return ms_dllext; }

 
 private:
     // forbid construction of objects
     wxDllLoader();
 
 private:
     // forbid construction of objects
     wxDllLoader();

+    static const wxString   ms_dllext;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -222,15 +229,15 @@ protected:
 // Global variables
 // ----------------------------------------------------------------------------
 
 // Global variables
 // ----------------------------------------------------------------------------
 

-extern wxLibraries wxTheLibraries;
+extern WXDLLEXPORT_DATA(wxLibraries) wxTheLibraries;

 
 // ----------------------------------------------------------------------------
 // Interesting defines
 // ----------------------------------------------------------------------------
 
 #define WXDLL_ENTRY_FUNCTION() \
 
 // ----------------------------------------------------------------------------
 // Interesting defines
 // ----------------------------------------------------------------------------
 
 #define WXDLL_ENTRY_FUNCTION() \

-extern "C" wxClassInfo *wxGetClassFirst(); \
-wxClassInfo *wxGetClassFirst() { \
+extern "C" WXEXPORT const wxClassInfo *wxGetClassFirst(); \
+const wxClassInfo *wxGetClassFirst() { \

   return wxClassInfo::GetFirst(); \
 }
 
   return wxClassInfo::GetFirst(); \
 }