From 71ada1a5fbecf774be6cb7ab7421a8f784d6c84c Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Wed, 1 Oct 2003 11:51:42 +0000 Subject: [PATCH] More (blind) wxMac configtool compilation fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/configtool/src/appsettings.cpp | 2 +- utils/configtool/src/appsettings.h | 2 +- utils/configtool/src/configitem.cpp | 2 +- utils/configtool/src/configitem.h | 2 +- utils/configtool/src/configitemselector.cpp | 2 +- utils/configtool/src/configitemselector.h | 2 +- utils/configtool/src/configtooldoc.cpp | 2 +- utils/configtool/src/configtooldoc.h | 2 +- utils/configtool/src/configtoolview.cpp | 2 +- utils/configtool/src/configtoolview.h | 2 +- utils/configtool/src/configtree.cpp | 2 +- utils/configtool/src/configtree.h | 2 +- utils/configtool/src/custompropertydialog.cpp | 2 +- utils/configtool/src/custompropertydialog.h | 2 +- utils/configtool/src/htmlparser.cpp | 2 +- utils/configtool/src/htmlparser.h | 2 +- utils/configtool/src/mainframe.cpp | 2 +- utils/configtool/src/mainframe.h | 2 +- utils/configtool/src/propeditor.cpp | 2 +- utils/configtool/src/propeditor.h | 2 +- utils/configtool/src/property.cpp | 2 +- utils/configtool/src/property.h | 2 +- utils/configtool/src/settingsdialog.cpp | 2 +- utils/configtool/src/settingsdialog.h | 2 +- utils/configtool/src/wxconfigtool.cpp | 2 +- utils/configtool/src/wxconfigtool.h | 3 +-- 26 files changed, 26 insertions(+), 27 deletions(-) diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp index ef7e249798..89da227b7d 100644 --- 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 c702d663a1..6ca8c42b89 100644 --- 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 1add25620a..c64056711d 100644 --- 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 8ebba6932b..c7989a70e5 100644 --- 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 4a08a3efca..ae71281e7f 100644 --- 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 7946d034ff..b2dc557b28 100644 --- 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 bd5af0ba9a..a2875fc05e 100644 --- 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 f5b036e108..b1abcab4a7 100644 --- 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 d0e585c4a5..7401279af4 100644 --- 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 85002eedf6..287f153523 100644 --- 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 3f30098263..6d36f3964f 100644 --- 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 57e7d057e5..757c746db6 100644 --- 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 4d6103c8a4..2c6af9c1b8 100644 --- 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 28488de734..9c27dba1a1 100644 --- 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 a07089fb5a..d486caad16 100644 --- 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 3c539914d1..486b2f0c3e 100644 --- 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 8bf876bf69..e2d828e391 100644 --- 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 9ad6366a86..d6ea7c4a74 100644 --- 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 1bf8c2023e..d45415fe2f 100644 --- 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 5c20030688..c1c3fa33c1 100644 --- 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 fa09d72870..d8e3c9ab88 100644 --- 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 119bc80ced..f9928c0471 100644 --- 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 ead817816d..ad3ac8e7d3 100644 --- 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 43939248de..507c151fe9 100644 --- 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 8c68072f16..2750da15d0 100644 --- 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 ef75fb7f99..130bfbeaad 100644 --- 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" -- 2.47.2