use "..." for wx includes instead of <...>

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 4cfd2b5de87ff2c3a1510d76dc3d36050a51bc2a..11462250d63f570f816da81aa26958b70a900cc0 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DYNAMICLOADER_H__
 #define _WX_DYNAMICLOADER_H__
 
 #ifndef _WX_DYNAMICLOADER_H__
 #define _WX_DYNAMICLOADER_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dynload.h"
 #endif
 
 #pragma interface "dynload.h"
 #endif
 


@@ -87,6 +87,10 @@ enum wxDLFlags
     wxDL_VERBATIM   = 0x00000008,   // Attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.
     wxDL_VERBATIM   = 0x00000008,   // Attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.

+
+    wxDL_NOSHARE    = 0x00000010,   // load new DLL, don't reuse already loaded
+
+    // FIXME: why? (VZ)

 #ifdef __osf__
     wxDL_DEFAULT    = wxDL_LAZY
 #else
 #ifdef __osf__
     wxDL_DEFAULT    = wxDL_LAZY
 #else


@@ -106,7 +110,7 @@ public:
 
         // return the platform standard DLL extension (with leading dot)
 
 
         // return the platform standard DLL extension (with leading dot)
 

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

 
     wxDynamicLibrary() : m_handle(0) {}
     wxDynamicLibrary(wxString libname, int flags = wxDL_DEFAULT)
 
     wxDynamicLibrary() : m_handle(0) {}
     wxDynamicLibrary(wxString libname, int flags = wxDL_DEFAULT)


@@ -155,7 +159,7 @@ protected:
 
         // Platform specific shared lib suffix.
 
 
         // Platform specific shared lib suffix.
 

-    static const wxString ms_dllext;
+    static const wxChar *ms_dllext;

 
         // the handle to DLL or NULL
 
 
         // the handle to DLL or NULL
 


@@ -189,7 +193,7 @@ public:
     wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT );
     ~wxPluginLibrary();
 
     wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT );
     ~wxPluginLibrary();
 

-    wxPluginLibrary  *RefLib() { ++m_linkcount; return this; }
+    wxPluginLibrary  *RefLib();

     bool              UnrefLib();
 
         // These two are called by the PluginSentinel on (PLUGGABLE) object
     bool              UnrefLib();
 
         // These two are called by the PluginSentinel on (PLUGGABLE) object


@@ -297,14 +301,14 @@ class WXDLLEXPORT wxDllLoader
 {
 public:
 
 {
 public:
 

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

     static void         UnloadLibrary(wxDllType dll);
 
     static wxDllType GetProgramHandle() { return wxDynamicLibrary::GetProgramHandle(); }
 
     static void *GetSymbol(wxDllType dllHandle, const wxString &name, bool *success = 0);
 
     static void         UnloadLibrary(wxDllType dll);
 
     static wxDllType GetProgramHandle() { return wxDynamicLibrary::GetProgramHandle(); }
 
     static void *GetSymbol(wxDllType dllHandle, const wxString &name, bool *success = 0);
 

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

 
 private:
 
 
 private:
 


@@ -312,8 +316,6 @@ private:
 };
 #endif
 
 };
 #endif
 

-

 #endif  // wxUSE_DYNAMIC_LOADER
 #endif  // _WX_DYNAMICLOADER_H__
 
 #endif  // wxUSE_DYNAMIC_LOADER
 #endif  // _WX_DYNAMICLOADER_H__
 

-// vi:sts=4:sw=4:et