projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed redundant code
[wxWidgets.git]
/
include
/
wx
/
dynlib.h
diff --git
a/include/wx/dynlib.h
b/include/wx/dynlib.h
index e7b65cfd0525325bcd7f2382a7570423d67d3585..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"
@@
-51,7
+55,7
@@
#elif defined(__DARWIN__)
typedef void *wxDllType;
#elif defined(__WXMAC__)
#elif defined(__DARWIN__)
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,7
+229,7
@@
protected:
// Global variables
// ----------------------------------------------------------------------------
// Global variables
// ----------------------------------------------------------------------------
-extern
wxLibraries
wxTheLibraries;
+extern
WXDLLEXPORT_DATA(wxLibraries)
wxTheLibraries;
// ----------------------------------------------------------------------------
// Interesting defines
// ----------------------------------------------------------------------------
// Interesting defines