wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide...

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

diff --git a/include/wx/module.h b/include/wx/module.h
index 0c50363a6d390782ecb5bf545d6d8c73ff3d8869..bbdfd7a42859a11e0f1fe8283ea002a362e4584b 100644 (file)
--- 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
 
@@ -21,12 +21,12 @@
 
 // declare a linked list of modules
 class wxModule;
-WX_DECLARE_EXPORTED_LIST(wxModule, wxModuleList);
+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)
-class WXDLLEXPORT wxModule : public wxObject
+class WXDLLIMPEXP_BASE wxModule : public wxObject
 {
 public:
     wxModule() {}