X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c118a47691b0017042d07601a9d9a1eb6cf5f7f7..33f3e2b31ed781ba1446b49ec6d3e226c0a5c652:/include/wx/dynlib.h diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 1057f09cae..6a704d7eb6 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -19,14 +19,6 @@ #include "wx/string.h" #include "wx/dynarray.h" -#if defined(__OS2__) || defined(__EMX__) -#include "wx/os2/private.h" -#endif - -#ifdef __WXMSW__ -#include "wx/msw/private.h" -#endif - // note that we have our own dlerror() implementation under Darwin #if (defined(HAVE_DLERROR) && !defined(__EMX__)) || defined(__DARWIN__) #define wxHAVE_DYNLIB_ERROR @@ -41,7 +33,7 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator; // Note: __OS2__/EMX has to be tested first, since we want to use // native version, even if configure detected presence of DLOPEN. #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__) - typedef HMODULE wxDllType; + typedef WXHMODULE wxDllType; #elif defined(__DARWIN__) // Don't include dlfcn.h on Darwin, we may be using our own replacements. typedef void *wxDllType; @@ -131,14 +123,14 @@ enum wxPluginCategory #define wxDL_INIT_FUNC(pfx, name, dynlib) \ pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name) -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // same as wxDL_INIT_FUNC() but appends 'A' or 'W' to the function name, see // wxDynamicLibrary::GetSymbolAorW() #define wxDL_INIT_FUNC_AW(pfx, name, dynlib) \ pfx ## name = (name ## _t)(dynlib).GetSymbolAorW(#name) -#endif // __WXMSW__ +#endif // __WINDOWS__ // the following macros can be used to redirect a whole library to a class and // check at run-time if the library is present and contains all required @@ -312,7 +304,7 @@ public: #endif } -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // this function is useful for loading functions from the standard Windows // DLLs: such functions have an 'A' (in ANSI build) or 'W' (in Unicode, or // wide character build) suffix if they take string parameters @@ -334,7 +326,7 @@ public: { return RawGetSymbolAorW(m_handle, name); } -#endif // __WXMSW__ +#endif // __WINDOWS__ // return all modules/shared libraries in the address space of this process // @@ -357,7 +349,7 @@ public: static wxString GetPluginsDirectory(); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // return the handle (HMODULE/HINSTANCE) of the DLL with the given name // and/or containing the specified address: for XP and later systems only // the address is used and the name is ignored but for the previous systems @@ -367,8 +359,8 @@ public: // the returned handle reference count is not incremented so it doesn't // need to be freed using FreeLibrary() but it also means that it can // become invalid if the DLL is unloaded - static HINSTANCE MSWGetModuleHandle(const char *name, void *addr); -#endif // __WXMSW__ + static WXHMODULE MSWGetModuleHandle(const char *name, void *addr); +#endif // __WINDOWS__ protected: // common part of GetSymbol() and HasSymbol() @@ -391,7 +383,7 @@ protected: wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary); }; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // ---------------------------------------------------------------------------- // wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind @@ -412,7 +404,7 @@ public: } }; -#endif // __WXMSW__ +#endif // __WINDOWS__ // ---------------------------------------------------------------------------- // Interesting defines