1. wxMSW seems to work (please test and send your bug reports!)

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 39db5aa6adc5863850ac377b2c610bce8c9a8d36..98bc1839a60e1c62607d3cedc4d4f1a8644f914a 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -1,73 +1,121 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dynlib.cpp
+// Purpose:     Dynamic library management
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     20/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_DYNLIB_H__
 #define _WX_DYNLIB_H__
 
 #ifdef __GNUG__
 #ifndef _WX_DYNLIB_H__
 #define _WX_DYNLIB_H__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface

 #endif
 
 #endif
 

+#include <wx/setup.h>
+
+#if wxUSE_DYNLIB_CLASS
+

 #include <wx/string.h>
 #include <wx/list.h>
 #include <wx/string.h>
 #include <wx/list.h>

-#include <wx/dynarray.h>

 #include <wx/hash.h>
 
 #include <wx/hash.h>
 

+// this is normally done by configure, but I leave it here for now...
+#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHL_LOAD))
+    #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__)
+        #define HAVE_DLOPEN
+    #elif defined(__HPUX__)
+        #define HAVE_SHL_LOAD
+    #endif // Unix flavour
+#endif // !Unix or already have some HAVE_xxx defined
+
+#if defined(HAVE_DLOPEN)
+    #include <dlfcn.h>
+
+    typedef void *wxDllType;
+#elif defined(HAVE_SHL_LOAD)
+    #include <dl.h>
+
+    typedef shl_t wxDllType;
+#elif defined(__WINDOWS__)
+    #include <windows.h>
+
+    typedef HMODULE wxDllType;
+#elif defined(__WXMAC__)
+    typedef CFragConnectionID wxDllType;
+#else
+    #error "wxLibrary can't be compiled on this platform, sorry."
+#endif // OS
+
+// defined in windows.h

 #ifdef LoadLibrary
 #ifdef LoadLibrary

-#undef LoadLibrary
+    #undef LoadLibrary

 #endif
 
 #endif
 

-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxLibrary
 // wxLibrary

+// ----------------------------------------------------------------------------

 
 

-class wxLibrary: public wxObject {
- protected:
-  void *m_handle;
-  bool m_destroy;
- public:
-  wxHashTable classTable;
+class wxLibrary : public wxObject
+{
+public:
+    wxHashTable classTable;

 
 

- public:
-  wxLibrary(void *handle);
-  ~wxLibrary(void);
+public:
+    wxLibrary(wxDllType handle);
+    ~wxLibrary();

 
 

-  // Get a symbol from the dynamic library
-  void *GetSymbol(const wxString& symbname);
+    // Get a symbol from the dynamic library
+    void *GetSymbol(const wxString& symbname);

 
 

-  // Create the object whose classname is "name"
-  wxObject *CreateObject(const wxString& name);
+    // Create the object whose classname is "name"
+    wxObject *CreateObject(const wxString& name);

 
 

-  // Merge the symbols with the main symbols: WARNING! the library will not
-  // be unloaded.
-  void MergeWithSystem();
+protected:
+    void PrepareClasses(wxClassInfo *first);

 
 

- protected:
-  void PrepareClasses(wxClassInfo **first);
+    wxDllType m_handle;

 };
 
 };
 

-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxLibraries
 // wxLibraries

+// ----------------------------------------------------------------------------
+
+class wxLibraries
+{
+public:
+    wxLibraries();
+    ~wxLibraries();

 
 

-class wxLibraries {
- protected:
-  wxList m_loaded;
- public:
-  wxLibraries(void);
-  ~wxLibraries(void);
+    // caller is responsible for deleting the returned pointer if !NULL
+    wxLibrary *LoadLibrary(const wxString& basename);

 
 

-  wxLibrary *LoadLibrary(const wxString& name);
-  wxObject *CreateObject(const wxString& name);
+    wxObject *CreateObject(const wxString& name);
+
+protected:
+    wxList m_loaded;

 };
 
 };
 

-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // Global variables
 // Global variables

+// ----------------------------------------------------------------------------

 
 extern wxLibraries wxTheLibraries;
 
 
 extern wxLibraries wxTheLibraries;
 

-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // Interesting defines
 // Interesting defines

+// ----------------------------------------------------------------------------

 
 #define WXDLL_ENTRY_FUNCTION() \
 
 #define WXDLL_ENTRY_FUNCTION() \

-extern "C" wxClassInfo **wxGetClassFirst(); \
-wxClassInfo **wxGetClassFirst() { \
-  return &wxClassInfo::first; \
+extern "C" wxClassInfo *wxGetClassFirst(); \
+wxClassInfo *wxGetClassFirst() { \
+  return wxClassInfo::GetFirst(); \

 }
 
 }
 

-#endif
+#endif // wxUSE_DYNLIB_CLASS
+
+#endif // _WX_DYNLIB_H__