AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fix (use int instead of wxDLFlags as parameter type, since the flags are used in OR-combinations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-12-31 00:46:04 +00:00
parent 6de5b59919
commit 23213f1811
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/dynload.h
View File

@ -109,7 +109,7 @@ public:
static const wxString &GetDllExt() { return ms_dllext; }
wxDynamicLibrary() : m_handle(0) {}
wxDynamicLibrary(wxString libname, wxDLFlags flags = wxDL_DEFAULT)
wxDynamicLibrary(wxString libname, int flags = wxDL_DEFAULT)
: m_handle(0)
{
Load(libname, flags);
@ -123,7 +123,7 @@ public:
// load the library with the given name
// (full or not), return TRUE on success
bool Load(wxString libname, wxDLFlags flags = wxDL_DEFAULT);
bool Load(wxString libname, int flags = wxDL_DEFAULT);
// unload the library, also done automatically in dtor
@ -186,7 +186,7 @@ public:
static wxDLImports ms_classes; // Static hash of all imported classes.
wxPluginLibrary( const wxString &libname, wxDLFlags flags = wxDL_DEFAULT );
wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT );
~wxPluginLibrary();
wxPluginLibrary *RefLib() { ++m_linkcount; return this; }
@ -241,7 +241,7 @@ public:
// Static accessors.
static wxPluginLibrary *LoadLibrary( const wxString &libname,
wxDLFlags flags = wxDL_DEFAULT );
int flags = wxDL_DEFAULT );
static bool UnloadLibrary(const wxString &libname);
// This is used by wxDllLoader. It's wrapped in the compatibility
@ -254,13 +254,13 @@ public:
// Instance methods.
wxPluginManager() : m_entry(0) {};
wxPluginManager(const wxString &libname, wxDLFlags flags = wxDL_DEFAULT)
wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT)
{
Load(libname, flags);
}
~wxPluginManager() { Unload(); }
bool Load(const wxString &libname, wxDLFlags flags = wxDL_DEFAULT);
bool Load(const wxString &libname, int flags = wxDL_DEFAULT);
void Unload();
bool IsLoaded() const { return m_entry && m_entry->IsLoaded(); }

10
src/common/dynload.cpp
View File

@ -71,7 +71,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
#endif
}
bool wxDynamicLibrary::Load(wxString libname, wxDLFlags flags)
bool wxDynamicLibrary::Load(wxString libname, int flags)
{
wxASSERT_MSG(m_handle == 0, _T("Library already loaded."));
@ -242,7 +242,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
symbol = NSAddressOfSymbol( NSLookupAndBindSymbol( name.c_str() ) );
#elif defined(__WINDOWS__)
symbol = ::GetProcAddress( m_handle, name.c_str() );
symbol = ::GetProcAddress( m_handle, name.mb_str() );
#else
#error "runtime shared lib support not implemented"
@ -278,7 +278,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
wxDLImports wxPluginLibrary::ms_classes(wxKEY_STRING);
wxPluginLibrary::wxPluginLibrary(const wxString &libname, wxDLFlags flags)
wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
: m_linkcount(1)
, m_objcount(0)
{
@ -459,7 +459,7 @@ wxDLManifest wxPluginManager::ms_manifest(wxKEY_STRING);
// Static accessors
// ------------------------
wxPluginLibrary *wxPluginManager::LoadLibrary(const wxString &libname, wxDLFlags flags)
wxPluginLibrary *wxPluginManager::LoadLibrary(const wxString &libname, int flags)
{
wxString realname(libname);
@ -522,7 +522,7 @@ wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
// Class implementation
// ------------------------
bool wxPluginManager::Load(const wxString &libname, wxDLFlags flags)
bool wxPluginManager::Load(const wxString &libname, int flags)
{
m_entry = wxPluginManager::LoadLibrary(libname, flags);
return IsLoaded();