fixing 'id' objc.h collisions, listbox rewrite

[wxWidgets.git] / include / wx / module.h

diff --git a/include/wx/module.h b/include/wx/module.h
index e15b4de06b329e47399ef8c260b484a550ca7bee..b73a840b4652f7916c9b6a62ab563514631d3760 100644 (file)
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -9,50 +9,56 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_MODULEH__
-#define _WX_MODULEH__
-
-#ifdef __GNUG__
-    #pragma interface "module.h"
-#endif
+#ifndef _WX_MODULE_H_
+#define _WX_MODULE_H_

 
 #include "wx/object.h"
 #include "wx/list.h"
 
 // declare a linked list of modules
 
 #include "wx/object.h"
 #include "wx/list.h"
 
 // declare a linked list of modules

-class wxModule;
-WX_DECLARE_LIST(wxModule, wxModuleList);
+class WXDLLIMPEXP_BASE wxModule;
+WX_DECLARE_USER_EXPORTED_LIST(wxModule, wxModuleList, WXDLLIMPEXP_BASE);

 
 // declaring a class derived from wxModule will automatically create an
 // instance of this class on program startup, call its OnInit() method and call
 // OnExit() on program termination (but only if OnInit() succeeded)
 
 // declaring a class derived from wxModule will automatically create an
 // instance of this class on program startup, call its OnInit() method and call
 // OnExit() on program termination (but only if OnInit() succeeded)

-class WXDLLEXPORT wxModule : public wxObject
+class WXDLLIMPEXP_BASE wxModule : public wxObject

 {
 public:
     wxModule() {}
     virtual ~wxModule() {}
 
 {
 public:
     wxModule() {}
     virtual ~wxModule() {}
 

-    // if module init routine returns FALSE application will fail to startup
+    // if module init routine returns false the application
+    // will fail to startup
+

     bool Init() { return OnInit(); }
     void Exit() { OnExit(); }
 
     // Override both of these
     bool Init() { return OnInit(); }
     void Exit() { OnExit(); }
 
     // Override both of these

+

         // called on program startup
         // called on program startup

+

     virtual bool OnInit() = 0;
     virtual bool OnInit() = 0;

+

         // called just before program termination, but only if OnInit()
         // succeeded
         // called just before program termination, but only if OnInit()
         // succeeded

+

     virtual void OnExit() = 0;
 
     virtual void OnExit() = 0;
 

-    static void RegisterModule(wxModule* module);
+    static void RegisterModule(wxModule *module);

     static void RegisterModules();
     static bool InitializeModules();
     static void CleanUpModules();
 
     static void RegisterModules();
     static bool InitializeModules();
     static void CleanUpModules();
 

+    // used by wxObjectLoader when unloading shared libs's
+
+    static void UnregisterModule(wxModule *module);
+

 protected:
     static wxModuleList m_modules;
 
     DECLARE_CLASS(wxModule)
 };
 
 protected:
     static wxModuleList m_modules;
 
     DECLARE_CLASS(wxModule)
 };
 

-#endif // _WX_MODULEH__
+#endif // _WX_MODULE_H_