More (blind) wxMac configtool compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index ef7e2497981858496fb5d494884fcbb5161c7d23..89da227b7d7b5a98bb1b03063925e506424b0617 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -9,7 +9,7 @@
 // Licence:    
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "appsettings.h"
 #endif
 

diff --git a/utils/configtool/src/appsettings.h b/utils/configtool/src/appsettings.h
index c702d663a126052a236256715b4314313752448a..6ca8c42b891d2c82595b435011209dfc203fa810 100644 (file)
--- a/utils/configtool/src/appsettings.h
+++ b/utils/configtool/src/appsettings.h
@@ -12,7 +12,7 @@
 #ifndef _AP_APPSETTINGS_H_
 #define _AP_APPSETTINGS_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "appsettings.cpp"
 #endif
 

diff --git a/utils/configtool/src/configitem.cpp b/utils/configtool/src/configitem.cpp
index 1add25620a06bebad0cab7b043ebc235ef39fa36..c64056711d1bd976bf4149b461e980bff9287b8a 100644 (file)
--- a/utils/configtool/src/configitem.cpp
+++ b/utils/configtool/src/configitem.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "configitem.h"
 #endif
 

diff --git a/utils/configtool/src/configitem.h b/utils/configtool/src/configitem.h
index 8ebba6932b575c9bffe22b30efcb001bd382ef4d..c7989a70e5d617e1d504a8f0df1af7065b44fb47 100644 (file)
--- a/utils/configtool/src/configitem.h
+++ b/utils/configtool/src/configitem.h
@@ -12,7 +12,7 @@
 #ifndef _CT_CONFIGITEM_H_
 #define _CT_CONFIGITEM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "configitem.cpp"
 #endif
 

diff --git a/utils/configtool/src/configitemselector.cpp b/utils/configtool/src/configitemselector.cpp
index 4a08a3efca8b270d1580e69ba6d98e238fc03533..ae71281e7f04b6beca130a7b8a9acd9c4999f73e 100644 (file)
--- a/utils/configtool/src/configitemselector.cpp
+++ b/utils/configtool/src/configitemselector.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "configitemselector.h"
 #endif
 

diff --git a/utils/configtool/src/configitemselector.h b/utils/configtool/src/configitemselector.h
index 7946d034ff15b5de3176546316a00941aa2b8be3..b2dc557b28974509733fb9bf944d8c97952fa003 100644 (file)
--- a/utils/configtool/src/configitemselector.h
+++ b/utils/configtool/src/configitemselector.h
@@ -12,7 +12,7 @@
 #ifndef _CONFIGITEMSELECTOR_H_
 #define _CONFIGITEMSELECTOR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "configitemselector.cpp"
 #endif
 

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index bd5af0ba9aa578d3e5a84bc812b1f4a0348deaa2..a2875fc05e0a7ee775a27cf936a07cde3b59cb15 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "configtooldoc.h"
 #endif
 

diff --git a/utils/configtool/src/configtooldoc.h b/utils/configtool/src/configtooldoc.h
index f5b036e1087c717449f9e7946118b419edbdffad..b1abcab4a71ae7ad09533a16c05bd363342e1d2b 100644 (file)
--- a/utils/configtool/src/configtooldoc.h
+++ b/utils/configtool/src/configtooldoc.h
@@ -12,7 +12,7 @@
 #ifndef _CT_CONFIGTOOLDOC_H_
 #define _CT_CONFIGTOOLDOC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "configtooldoc.cpp"
 #endif
 

diff --git a/utils/configtool/src/configtoolview.cpp b/utils/configtool/src/configtoolview.cpp
index d0e585c4a57bdef66057db0523c748e76b6cf1e6..7401279af43cd6fa8cb93029651e4bdadd5ef6c1 100644 (file)
--- a/utils/configtool/src/configtoolview.cpp
+++ b/utils/configtool/src/configtoolview.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "configtoolview.h"
 #endif
 

diff --git a/utils/configtool/src/configtoolview.h b/utils/configtool/src/configtoolview.h
index 85002eedf60ec5e2e9634e83d24fb868d3666b5a..287f153523b8b9f6d2cb58891af615c67c9ffc04 100644 (file)
--- a/utils/configtool/src/configtoolview.h
+++ b/utils/configtool/src/configtoolview.h
@@ -12,7 +12,7 @@
 #ifndef _CT_CONFIGTOOLVIEW_H_
 #define _CT_CONFIGTOOLVIEW_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "configtoolview.cpp"
 #endif
 

diff --git a/utils/configtool/src/configtree.cpp b/utils/configtool/src/configtree.cpp
index 3f30098263cc218d520de382227d58d3ee91bafc..6d36f3964f9035dc2ccc8a13164d03daceceaa52 100644 (file)
--- a/utils/configtool/src/configtree.cpp
+++ b/utils/configtool/src/configtree.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "configtree.h"
 #endif
 

diff --git a/utils/configtool/src/configtree.h b/utils/configtool/src/configtree.h
index 57e7d057e5bf25773f847dfcf3176e355a417d6f..757c746db6f18cf60d91085f00550e9d352c2b9c 100644 (file)
--- a/utils/configtool/src/configtree.h
+++ b/utils/configtool/src/configtree.h
@@ -13,7 +13,7 @@
 #ifndef _CT_CONFIGTREE_H_
 #define _CT_CONFIGTREE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "configtree.cpp"
 #endif
 

diff --git a/utils/configtool/src/custompropertydialog.cpp b/utils/configtool/src/custompropertydialog.cpp
index 4d6103c8a446c63f7dd8cb49e4f9e22c97f27731..2c6af9c1b8a70c4149707ce5c85075206260febc 100644 (file)
--- a/utils/configtool/src/custompropertydialog.cpp
+++ b/utils/configtool/src/custompropertydialog.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "custompropertydialog.h"
 #endif
 

diff --git a/utils/configtool/src/custompropertydialog.h b/utils/configtool/src/custompropertydialog.h
index 28488de734c5bef72277d0fc9f139c1f328aa7a1..9c27dba1a14ea999f6b45b33ede55b3eb4d48dff 100644 (file)
--- a/utils/configtool/src/custompropertydialog.h
+++ b/utils/configtool/src/custompropertydialog.h
@@ -12,7 +12,7 @@
 #ifndef _CUSTOMPROPERTYDIALOG_H_
 #define _CUSTOMPROPERTYDIALOG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "custompropertydialog.cpp"
 #endif
 

diff --git a/utils/configtool/src/htmlparser.cpp b/utils/configtool/src/htmlparser.cpp
index a07089fb5a0029fc998def9f7d214579dd8cd13c..d486caad1658d3a88b9fa5cbdc1af436d7bda6f3 100644 (file)
--- a/utils/configtool/src/htmlparser.cpp
+++ b/utils/configtool/src/htmlparser.cpp
@@ -12,7 +12,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "htmlparser.h"
 #endif
 

diff --git a/utils/configtool/src/htmlparser.h b/utils/configtool/src/htmlparser.h
index 3c539914d14da62b76a099986a0717d6555b03a2..486b2f0c3ec4e9d61f5aaeb215062c60fb0209df 100644 (file)
--- a/utils/configtool/src/htmlparser.h
+++ b/utils/configtool/src/htmlparser.h
@@ -12,7 +12,7 @@
 #ifndef _HTMLPARSER_H_
 #define _HTMLPARSER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "htmlparser.cpp"
 #endif
 

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 8bf876bf69bbda9ac8db5a340e8b67123ade7c26..e2d828e3913e6420ae50f3da9eea89b8c1ee5891 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mainframe.h"
 #endif
 

diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h
index 9ad6366a866747f86e84e2cfb942e454bd07faae..d6ea7c4a748c3b93c416b4d633f7a84640380bac 100644 (file)
--- a/utils/configtool/src/mainframe.h
+++ b/utils/configtool/src/mainframe.h
@@ -12,7 +12,7 @@
 #ifndef _AP_MAINFRAME_H_
 #define _AP_MAINFRAME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "mainframe.cpp"
 #endif
 

diff --git a/utils/configtool/src/propeditor.cpp b/utils/configtool/src/propeditor.cpp
index 1bf8c2023e19f242c4297fb3993447de72e3ccc0..d45415fe2fc6edfeeec03064e84611e36bc17c90 100644 (file)
--- a/utils/configtool/src/propeditor.cpp
+++ b/utils/configtool/src/propeditor.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "propeditor.h"
 #endif
 

diff --git a/utils/configtool/src/propeditor.h b/utils/configtool/src/propeditor.h
index 5c20030688cf6886d9f0ec4499bc83aa8839866a..c1c3fa33c1ce1e7f2dc8773e6d595e5e4d46f932 100644 (file)
--- a/utils/configtool/src/propeditor.h
+++ b/utils/configtool/src/propeditor.h
@@ -12,7 +12,7 @@
 #ifndef _CT_PROPEDITOR_H_
 #define _CT_PROPEDITOR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "propeditor.cpp"
 #endif
 

diff --git a/utils/configtool/src/property.cpp b/utils/configtool/src/property.cpp
index fa09d728705b85ed8d36ddee1efcd3fce642698d..d8e3c9ab88e6b07a054f44e84f91538a583811e1 100644 (file)
--- a/utils/configtool/src/property.cpp
+++ b/utils/configtool/src/property.cpp
@@ -10,7 +10,7 @@
 // Licence:    
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "property.h"
 #endif
 

diff --git a/utils/configtool/src/property.h b/utils/configtool/src/property.h
index 119bc80ced8ed780f149eb84fe9d9730bc3db416..f9928c0471fcf0d44fe3d9afc33f0c86aa8b1dd0 100644 (file)
--- a/utils/configtool/src/property.h
+++ b/utils/configtool/src/property.h
@@ -13,7 +13,7 @@
 #ifndef _CT_PROPERTY_H_
 #define _CT_PROPERTY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "property.cpp"
 #endif
 

diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index ead817816da86d46937997f2ce1b37910a21876a..ad3ac8e7d38473a9943b55856e318ada41bb814e 100644 (file)
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -9,7 +9,7 @@
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "settingsdialog.h"
 #endif
 

diff --git a/utils/configtool/src/settingsdialog.h b/utils/configtool/src/settingsdialog.h
index 43939248deb3a83529a57dbd36d9dbbea8354f1e..507c151fe93befef5c720c96c28611a6c290392b 100644 (file)
--- a/utils/configtool/src/settingsdialog.h
+++ b/utils/configtool/src/settingsdialog.h
@@ -12,7 +12,7 @@
 #ifndef _SETTINGSDIALOG_H_
 #define _SETTINGSDIALOG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "settingsdialog.cpp"
 #endif
 

diff --git a/utils/configtool/src/wxconfigtool.cpp b/utils/configtool/src/wxconfigtool.cpp
index 8c68072f16fdd6b9ef5a9c5e9d03ffefb3b69be6..2750da15d09e5c2ab0c34da5763269f46ce03c79 100644 (file)
--- a/utils/configtool/src/wxconfigtool.cpp
+++ b/utils/configtool/src/wxconfigtool.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "wxconfigtool.h"
 #endif
 

diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index ef75fb7f995edddf0d54492a963170612664bf4f..130bfbeaadff16f9b07f08214ab00a8894a4b7c9 100644 (file)
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -12,13 +12,12 @@
 #ifndef _AP_WXCONFIGTOOL_H_
 #define _AP_WXCONFIGTOOL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "wxconfigtool.cpp"
 #endif
 
 #include "wx/docview.h"
 #include "wx/help.h"
-#include "wx/app.h"
 
 #ifdef __WXMSW__
 #include "wx/msw/helpchm.h"