X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..db16e5c3aae30ee4502d3e0d41eed500af365fe9:/include/wx/module.h diff --git a/include/wx/module.h b/include/wx/module.h index 73e913ee1b..aeee79b942 100644 --- a/include/wx/module.h +++ b/include/wx/module.h @@ -12,7 +12,7 @@ #ifndef _WX_MODULEH__ #define _WX_MODULEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "module.h" #endif @@ -32,15 +32,20 @@ public: wxModule() {} virtual ~wxModule() {} - // if module init routine returns FALSE application will fail to startup + // if module init routine returns FALSE application + // will fail to startup + bool Init() { return OnInit(); } void Exit() { OnExit(); } - // Override both of these + // Override both of these // called on program startup + virtual bool OnInit() = 0; - // called just before program termination, but only if OnInit() + + // called just before program termination, but only if OnInit() // succeeded + virtual void OnExit() = 0; static void RegisterModule(wxModule* module); @@ -48,6 +53,10 @@ public: static bool InitializeModules(); static void CleanUpModules(); + // used by wxObjectLoader when unloading shared libs's + + static void UnregisterModule(wxModule* module); + protected: static wxModuleList m_modules;