X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b9ab0bd824b6b9c93849928d67de1ec71e7c167..aae91497f6ac36a76d3313cf405cae0f098ea1d1:/include/wx/dynlib.h?ds=sidebyside diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index d6ed0876bc..4f4d571856 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -6,14 +6,14 @@ // Created: 20/07/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DYNLIB_H__ #define _WX_DYNLIB_H__ -#ifdef __GNUG__ -# pragma interface +#if defined(__GNUG__) && !defined(__APPLE__) +# pragma interface "dynlib.h" #endif #include "wx/setup.h" @@ -55,7 +55,7 @@ #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 @@ -113,7 +113,9 @@ public: Returns the pointer to the symbol or NULL on error. */ - static void *GetSymbol(wxDllType dllHandle, const wxString &name, bool success = 0); + static void *GetSymbol(wxDllType dllHandle, + const wxString &name, + bool *success = NULL); // return the standard DLL extension (with leading dot) for this platform static const wxString &GetDllExt() { return ms_dllext; }