Metrowerks Objective-C++ is more strict about types than Apple's.

[wxWidgets.git] / src / common / module.cpp

diff --git a/src/common/module.cpp b/src/common/module.cpp
index e8ddb80a0af439b6b9d44af11e0e4fe9f6843eb5..5534c4c2dd2aac24d42e97adee9b27923300aebc 100644 (file)
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "module.h"
 #endif
 
@@ -54,7 +54,7 @@ void wxModule::RegisterModules()
     {
         classInfo = (wxClassInfo *)node->GetData();
         if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
-            (classInfo != (& (wxModule::sm_classwxModule))) )
+            (classInfo != (& (wxModule::ms_classInfo))) )
         {
             wxModule* module = (wxModule *)classInfo->CreateObject();
             RegisterModule(module);
@@ -78,11 +78,11 @@ bool wxModule::InitializeModules()
                 n->GetData()->OnExit();
             }
 
-            return FALSE;
+            return false;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 void wxModule::CleanUpModules()