disable use of #pragma interface under Mac OS X

GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 424420c731fd739a7b9b9d2f6fc7733ff0c69bc0..29813a1978698e3beaae21a2e92f813d28eeb890 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -13,7 +13,7 @@
 #ifndef _WX_APP_H_BASE_
 #define _WX_APP_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "appbase.h"
 #endif
 
@@ -539,7 +539,7 @@ public:
 #elif defined(__WXMAC__) && defined(__UNIX__)
     // wxMac seems to have a specific wxEntry prototype
     #define IMPLEMENT_WXWIN_MAIN \
-        extern int wxEntry( int argc, char *argv[], bool enterLoop = 1 ); \
+        extern int wxEntry( int argc, char *argv[], bool enterLoop = TRUE ); \
         int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 #elif defined(__WXMSW__) && defined(WXUSINGDLL)
     // NT defines APIENTRY, 3.x not

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index d9a312e0964bd740059a7a50d32a8f1473c08aad..3bba43e060bdad34b6bb1b3f88404d867a2112b5 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ARTPROV_H_
 #define _WX_ARTPROV_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "artprov.h"
 #endif
 

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 1783afe29d9287816e02691d82a98c5942898581..cd701f737a0fdd069191b3d806e222524804c9da 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "bitmapbase.h"
 #endif
 

diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index 0050bfa08a5e3303cedf9c8f1636811f91b7678b..b5a94ba6dea3eaf77b22cb948d4c3327b55af312 100644 (file)
--- a/include/wx/busyinfo.h
+++ b/include/wx/busyinfo.h
@@ -10,8 +10,8 @@
 #ifndef __INFOWIN_H__
 #define __INFOWIN_H__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "busyinfo.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/include/wx/caret.h b/include/wx/caret.h
index f7d91c76f86fdfa456817629ab320dcf637be124..d1dba597613cc89830eb2ddcc426f96ddefd1e64 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_CARET
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "caret.h"
 #endif
 

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6664996a0b9f94d20f887ab4f3b07ac749f45803..a5fdf70f1136d7ed56c921158973f3c774e78699 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "choicebase.h"
 #endif
 

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 69c06bdce4291f46affed3a8c735534b4d99deeb..f0a58a62acad01a132fc9d73a75f180586c056da 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CLIPBRD_H_BASE_
 #define _WX_CLIPBRD_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "clipboardbase.h"
 #endif
 

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 1b0f1792aac61d2f8af1d2f0d7142b41cd51c12b..d6b7800d455073c5a448a230f13a57758b0ed4c6 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "clntdata.h"
 #endif
 

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 01e4ffc269faac74af4e09197ccfc913c0952ce1..bc8c8936549f483dfcd315597f275377275f7992 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -13,7 +13,7 @@
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "cmdline.h"
 #endif
 

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index 3b09e400bdcaa6f78dce111524730d9aea84d652..91ed5ee23428ee175dc0570988f0a5035c92d54b 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CMDPROC_H_
 #define _WX_CMDPROC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "cmdproc.h"
 #endif
 

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 61f5a204bdae31d108061fd2c7acd4c98248c89d..d1aed4df34f59d524e328a6d01c463d6e14d4012 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CMNDATA_H_BASE_
 #define _WX_CMNDATA_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "cmndata.h"
 #endif
 

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index b2a576c8582988bd9072c8524dc67a78cd9e6e7c..73c5e6a968e85fca5018dc7291dcbb1398e94f17 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -14,7 +14,7 @@
 #ifndef   _WX_CONFBASE_H_
 #define   _WX_CONFBASE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "confbase.h"
 #endif
 

diff --git a/include/wx/containr.h b/include/wx/containr.h
index d6df418e25ccd78aa09c7def9da5517b7a2cd7b6..234161da031e63fcb2740062af8f8cb7b813b392 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -13,7 +13,7 @@
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "containr.h"
 #endif
 

diff --git a/include/wx/control.h b/include/wx/control.h
index 24338b06b5dddc42ee2f220c32aa879b14bbd772..afbabb3ad74ad9b43f5e841cac66d520c127191f 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "controlbase.h"
 #endif
 

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index d72a3d92547e0307a98048e2605b7647c61345f4..89caf0084e58854299eda41a6e1804b15c09d2e3 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "cshelp.h"
 #endif
 

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 1db128f7bcb6b95ff01cdb8bb06c18785c630b41..0b98232f3ded847aeafd3a8f2b064f508f194af3 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CTRLSUB_H_BASE_
 #define _WX_CTRLSUB_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "controlwithitems.h"
 #endif
 

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index e367c29194e7e1206a2e38bb9dfb410f497238bd..d87edeaff7d17f25b11cb98bd18c80ee065fb50e 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DATAOBJ_H_BASE_
 #define _WX_DATAOBJ_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dataobjbase.h"
 #endif
 

diff --git a/include/wx/date.h b/include/wx/date.h
index b3b8dd97796e270cf438349128ac8949a7433434..e11792251191eb5cd7db579fc7b929a1454b6128 100644 (file)
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DATE_H_
 #define _WX_DATE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "date.h"
 #endif
 

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 017c226b8925a8f15cd3958364fed60adc668c92..654041d61c2a6ee7cddc6c5667e6487bfe91fb61 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DATETIME_H
 #define _WX_DATETIME_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "datetime.h"
 #endif
 

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 23630e63e2c0e0343c9ac0865c6bca4ac037824e..0551b437cc346e55dd30fe6c5c934650d3c097ad 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DATSTREAM_H_
 #define _WX_DATSTREAM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "datstrm.h"
 #endif
 

diff --git a/include/wx/db.h b/include/wx/db.h
index cebf1e45798cacf3f419e5ed2c2a094e9bbb9a5f..e43e77db956f0446fefe4f7d3f9640d895f8eea8 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -48,7 +48,7 @@
 
 #include "wx/version.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "db.h"
 #endif
 

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index 8919c86c6420d648c9e94339569b82843c23f9c3..af4145e7b53bceb58c8a624354366442a79ae53b 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -14,7 +14,7 @@
 #ifndef _WX_GENERIC_DBGRID_H_
 #define _WX_GENERIC_DBGRID_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dbgrid.h"
 #endif
 

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index d228f64a6d1cc3bd48b8ef9ca194138b43b79018..a005b30afc23abeddeb0c3cd4ff6245bdcf63c63 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -30,7 +30,7 @@
 
 #include "wx/version.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
   #pragma interface "dbtable.h"
 #endif
 

diff --git a/include/wx/dc.h b/include/wx/dc.h
index c414a9fdbe80f2d2b5664e4d508816ed668e1b54..11e282d8af73329f8722693d5548f0a14935aba0 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_BASE_
 #define _WX_DC_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dcbase.h"
 #endif
 

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 1f0c5a924f5c0ff265bcc02d191ab573e57a97ba..51682aad1ae52671ac0a1fd50b1db7aba09a0487 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCBUFFER_H_
 #define _WX_DCBUFFER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcbuffer.h"
 #endif
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 7d8651fea38979321497cfe3aa77549779ee1405..cf9dd6d06468abbf49602f7d5eefbc53e45a2074 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DEFS_H_
 #define _WX_DEFS_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "defs.h"
 #endif
 

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 7146986a5e6c62b2f0cc6fd73f7501d905772e70..c883f1cc21771fc25b0fc395e38ea72b1daf12c6 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dialogbase.h"
 #endif
 

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 0c0614de4e2e99795340a7cbf2359b4b7d29429c..fdd9d55fd85d1d466cf674853f9e99c7186e174b 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALUP_H
 #define _WX_DIALUP_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dialup.h"
 #endif
 

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 9c652c91ac3f1df9fe62a5c412a113bccec48a36..53d2214740a8a49f26d11c7c55e5956bb28780e4 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dir.h"
 #endif
 

diff --git a/include/wx/display.h b/include/wx/display.h
index e62be18768e697dd2b011e85c26ed22477e70e6e..fc020fee475084b95591c32fe46b25f88e337bd0 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -14,7 +14,7 @@
 
 #if wxUSE_DISPLAY
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "display.h"
 #endif
 

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 7ce567f72639d083200e433eca21a65cee8c9a83..9f623516474c8927986a1dfec2986a704672c8a9 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DND_H_BASE_
 #define _WX_DND_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dndbase.h"
 #endif
 

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index f4922834d8defd3a4aade7bf31aa2cbd74534251..37b2109475b94345178239651dfc1edb0c16302f 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "docmdi.h"
 #endif
 

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 9ffe9542467d6bdf5e471183c3f52ecdd95a7595..93e968d3348b1a9fda824c8bd18fe3944f49e003 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "docview.h"
 #endif
 

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 97e25174802bb543efc181cbc964d2fa2ce75925..f3dfbd09d39f083970b9d13bc3fa01a8e2c3e811 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -12,7 +12,7 @@
 #ifndef   _DYNARRAY_H
 #define   _DYNARRAY_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dynarray.h"
 #endif
 

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index a3c4f2d98b0fd9ed06bf9982cf1cb17897894cbf..6dd60bf12f377744daf1d4f59fc27cbdd1722010 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -12,8 +12,8 @@
 #ifndef _WX_DYNLIB_H__
 #define _WX_DYNLIB_H__
 
-#ifdef __GNUG__
-#   pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#   pragma interface "dynlib.h"
 #endif
 
 #include "wx/setup.h"

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 8aaa926807d81a31332993fb4a900c550f766be6..11462250d63f570f816da81aa26958b70a900cc0 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DYNAMICLOADER_H__
 #define _WX_DYNAMICLOADER_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dynload.h"
 #endif
 

diff --git a/include/wx/effects.h b/include/wx/effects.h
index 449064e1394ccde5162cfa093d2f08a2be9ccd29..09db9151a13596c7c831ccc9fdafd1b685da57e0 100644 (file)
--- a/include/wx/effects.h
+++ b/include/wx/effects.h
@@ -10,7 +10,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "effects.h"
 #endif
 

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 84d26771755ce81d8f928ba6761539c068379e4b..013b9d76bfb31c4bc10136eb4c34fca62b4f5228 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -10,7 +10,7 @@
 #ifndef _WX_ENCCONV_H_
 #define _WX_ENCCONV_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "encconv.h"
 #endif
 

diff --git a/include/wx/event.h b/include/wx/event.h
index 4a4bb50f76bbec79e08d71224649af6a75ef34da..223502421d8edbd5f2f1fbb976cadfe5050d6421 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -12,7 +12,7 @@
 #ifndef _WX_EVENTH__
 #define _WX_EVENTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "event.h"
 #endif
 

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 4ff934f8a719fb431bd037c35510cee125a22d13..80f0916e85c1549e85b82d4c3dc2c9e9516e1d7b 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -12,7 +12,7 @@
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "evtloop.h"
 #endif
 

diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index 9b83c0584f6eb70867b366eb284e9cf788c7c342..aa3965ff6bbbb4c9687c080ee8c6cab614a3bef5 100644 (file)
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FINDREPLACEDLG_H_
 #define _WX_FINDREPLACEDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fdrepdlg.h"
 #endif
 

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index aee7d99257a047eb15828b523e0cc00e4474919b..e8c4e3a72d7b94eb17ae96e5f0ee43a25063777f 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "ffile.h"
 #endif
 

diff --git a/include/wx/file.h b/include/wx/file.h
index 850bb99ded1a8396b0b49ccc28e54477eb6a43ac..73778df34d51eea35832a77e2a954451e63c7374 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -13,7 +13,7 @@
 #ifndef _WX_FILEH__
 #define _WX_FILEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "file.h"
 #endif
 

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index f67f290dfb85e45f33516700ab3c9cb5877a74e7..f96d602b8a6c2e1814c8474dda04137b20d20ad7 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -13,7 +13,7 @@
 #ifndef   _FILECONF_H
 #define   _FILECONF_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fileconf.h"
 #endif
 

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 57260c5fe39bc64e7620f0af2e74b3db14f390ea..45e3648086afdfe9c2b6ec0fb3eefef487d5947a 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -12,7 +12,7 @@
 #ifndef   _FILEFN_H_
 #define   _FILEFN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "filefn.h"
 #endif
 

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 64a48aa5edca0fd44031a7e3d2486a9d360c0138..491e7deecc842cae10fe5f9a8f27967730258d5b 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "filename.h"
 #endif
 

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 06ca7ca97c191c54e29d50e2fd4bae7afbd428b5..b8e5da09272c68247e2c346d99e2c7e10624e7ca 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -10,8 +10,8 @@
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "filesys.h"
 #endif
 
 #include "wx/setup.h"

diff --git a/include/wx/font.h b/include/wx/font.h
index 7ca50d5dbbb2398d09e131983a70a10381b4157b..c627010124406d5edfa7ca4f1bd25755c3c86212 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_BASE_
 #define _WX_FONT_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fontbase.h"
 #endif
 

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 9c56ec51cd36349ef0a38e5707fa5981224472a7..587dad4a66f4a5761439a0ed2c041e589ce91c1f 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -13,7 +13,7 @@
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fontenum.h"
 #endif
 

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 53edf7f17c7fedaf4111ae5b48f07779762004cf..eb4c48ea7d34a953d564453c578f946b504a3c0b 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONTMAPPER_H_
 #define _WX_FONTMAPPER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fontmap.h"
 #endif
 

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 26369c39d2412d711f42e5c802a3a5741a8d8d75..90ec00dc1cabc5754f8d37a7d08ad1b79ab95185 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -16,7 +16,7 @@
 #ifndef _WX_FONTUTIL_H_
 #define _WX_FONTUTIL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fontutil.h"
 #endif
 

diff --git a/include/wx/frame.h b/include/wx/frame.h
index bb19f5a4da893ca7644661354a6ea668b04676fb..2af6cd1d8dde76a80adf04e22d4c3dd7f0368a82 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "framebase.h"
 #endif
 

diff --git a/include/wx/fs_inet.h b/include/wx/fs_inet.h
index 61f4e5d056a104b8a24580f14ad3b50402c3ebf2..16ef29757970d5a6b92388b4bcd773ce4454cd99 100644 (file)
--- a/include/wx/fs_inet.h
+++ b/include/wx/fs_inet.h
@@ -21,7 +21,7 @@ limitation)
 #ifndef _WX_FS_INET_H_
 #define _WX_FS_INET_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fs_inet.h"
 #endif
 

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 03fa523eee7e3e4eaf26a680cf14451c2b3b90ce..0d70b7be9ec70d19bb00a23052acf9b797d90b38 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -9,7 +9,7 @@
 #ifndef _WX_FS_MEM_H_
 #define _WX_FS_MEM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fs_mem.h"
 #endif
 

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 960a1fd1a5559f6003b3fa6b59c3a60f3e6217dd..cfc1a995252db1f2099d1b4fcc71e5d96f0c7361 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -10,7 +10,7 @@
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fs_zip.h"
 #endif
 

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 5f2634a6063adbb0573d205c00eeeca07a96460e..3e69e5bd406f225df53e9dbd19784e9b2adb3e7d 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -12,8 +12,8 @@
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
-#ifdef __GNUG__
-    #pragma implementation "gaugebase.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "gaugebase.h"
 #endif
 
 #include "wx/defs.h"

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 185d5e52e2293db9acd878c9982b9c0ba993ed80..9f206f30fcec33f9c0ee96702a450c2d441b52e6 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -16,7 +16,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "gdicmn.h"
 #endif
 

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 2067e0fd23551e72f1f66ee5c0cee6e195ba51b4..4ba1dc43003c2d9155ebe9ea632222884d3a0608 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "accel.h"
 #endif
 

diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
index ddd08810aeef723b18a56af9ffdfd30273422052..63f98225f890d8d575b2d2a8a6c173e39fd6b33c 100644 (file)
--- a/include/wx/generic/calctrl.h
+++ b/include/wx/generic/calctrl.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "calctrl.h"
 #endif
 

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 73dcaa463912eec1f1579376e27abaa226b37e5c..1fdd096d4e0503317e1c0258864023e467809d11 100644 (file)
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "caret.h"
 #endif
 

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index c1f264b3bb03132510a7f09b3f32552caf981105..683092a3eebcff748035cb23843db30a31f9852b 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -12,7 +12,7 @@
 #ifndef __CHOICEDLGH_G__
 #define __CHOICEDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "choicdgg.h"
 #endif
 

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index e246d079667c6059b003e35f9fc6740a5466f9a4..ebf0a901f93000b3f57c65fb2e1f204fee21e666 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __COLORDLGH_G__
 #define __COLORDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "colrdlgg.h"
 #endif
 

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index e35809d16c59a00c49e75a8a5219c8b58d77ee2a..b17f6b6ae4822bc9ebb9f032263bf29215b4a0cc 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -11,7 +11,7 @@
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcpsg.h"
 #endif
 

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index ec2b098c2967f0303ab889e62f2e827e2b179293..f0456997a9eeda7fcb741d0d04cba67a90cc0193 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -15,7 +15,7 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dirctrlg.h"
 #endif
 

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index cf0ae90d94c8b66a528a68cbd93e4d184cc71339..190b90e71549350ca0bbf932da825c169231f673 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -15,7 +15,7 @@
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dirdlgg.h"
 #endif
 

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 64fef65b2a4c5319d46ec63270e2ee34977d7969..0a907fdfacfd79eb3db295992cee459ba6f69f0d 100644 (file)
--- a/include/wx/generic/dragimgg.h
+++ b/include/wx/generic/dragimgg.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DRAGIMGG_H_
 #define _WX_DRAGIMGG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dragimgg.h"
 #endif
 

diff --git a/include/wx/generic/fdrepdlg.h b/include/wx/generic/fdrepdlg.h
index 7cb5e2f82990c2a04815a0c3a279b344aa15711f..1db7e96d7ef2ccf63fa414062ec24b4f1b292ebb 100644 (file)
--- a/include/wx/generic/fdrepdlg.h
+++ b/include/wx/generic/fdrepdlg.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "genericfdrepdlg.h"
 #endif
 

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 83b4d2da9783dd8e91aa69d3bfec07dd90f7ab5d..f08532241185d97d3edef11e55bacdd5830e662c 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "filedlgg.h"
 #endif
 

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index f0075ba7ea27413457a82f3102393a70023a532f..fdbd69163e7a3bbd8d3d16f830457a91ccee0370 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_FONTDLGG_H
 #define _WX_GENERIC_FONTDLGG_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fontdlgg.h"
 #endif
 

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 12f1db02ddedef3a6dc74fc023f47cd17be6b42c..1f8e0858740c5c5e0342bd05c358628af955f4a8 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -18,7 +18,7 @@
 #ifndef __WXGRID_H__
 #define __WXGRID_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "grid.h"
 #endif
 

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 5a852c6bd5f6635d8d93980299b34937bf64f048..eedc77cc45a103dc8c4341d06c7c527f431e9f60 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "gridctrl.h"
 #endif
 

diff --git a/include/wx/generic/gridg.h b/include/wx/generic/gridg.h
index 1fa85c62bd014e9eeac3ae4783562a7a6da641d9..86bbb6cd68c4a527754f63d58cb6b67b9ae7a106 100644 (file)
--- a/include/wx/generic/gridg.h
+++ b/include/wx/generic/gridg.h
@@ -14,7 +14,7 @@
 #ifndef __GRIDH_G__
 #define __GRIDH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "gridg.h"
 #endif
 

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index c44819a419100464ee7d7f1fd2d3c7b9d22c6434..6567e38bfa980554c0d0ead92522aef836d2c566 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -16,7 +16,7 @@
 #ifndef __WXGRIDSEL_H__
 #define __WXGRIDSEL_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "gridsel.h"
 #endif
 

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index 0b8c1dfccfd1b30f072107f60be40799bfb87e6f..ac1284f370a2403e26fc5032359ca026e2a24a64 100644 (file)
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -11,7 +11,7 @@
 
 #if wxUSE_HELP
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #   pragma interface "wxexthlp.h"
 #endif
 

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index 2386ee1c288cc2f12c39a73e2c24dbfe2d81085e..ca9914669348aa453b9a1eb5b8c32066cb92c6a5 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -11,7 +11,7 @@
 
 #if wxUSE_HELP
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #   pragma interface "helphtml.h"
 #endif
 

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 337d045258663c4aff8885c210565587a9a7e4a9..be21d3dcfa6a0188573f357ae5645471d793ccba 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -11,7 +11,7 @@
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imaglist.h"
 #endif
 

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 7f8b13cb39b62e123bb6ca30b62aad4a78bc55af..7a4908efdc2e51a0aaa7288479bfe20e094da532 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -15,7 +15,7 @@
 #ifndef _WX_LAYWIN_H_G_
 #define _WX_LAYWIN_H_G_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "laywin.h"
 #endif
 

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index c6c02d9802a2784f8a4df50b69318e3a9bfd9518..b29dd9b5166596b073598372d92877d3f0a7fe93 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -11,7 +11,7 @@
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "listctrl.h"
 #endif
 

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index b39318a65950b0320f141f8c77c8acfd9efe2d92..2a5ab74f226d806fbacae6c1dbb5552ac14b459a 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MDIG_H_
 #define _WX_MDIG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "mdig.h"
 #endif
 

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 471c7d052143358ca39d76cae38905c28c859fc7..864bffd3670115e73c87307e57fca8bdee461d78 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __MSGDLGH_G__
 #define __MSGDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "msgdlgg.h"
 #endif
 

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index b1d966034618abfea3f4501d35b2e1998d4d9d8d..e322e9430974289500e0cf9df87edd8d07c57031 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -11,7 +11,7 @@
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "notebook.h"
 #endif
 

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 9e63395c3de9e6bf32dbfa45bf43568542c9428f..0799841995f00cbedd986312eeca1080374da514 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -12,7 +12,7 @@
 #ifndef __WX_PALETTEG_H__
 #define __WX_PALETTEG_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "paletteg.h"
 #endif
 

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 526efda1a7fa386817db02b2bc5fd31858f82434..b7f14c0af22944aac86f27460f59901bb6c02d2b 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_PANEL_H_
 #define _WX_GENERIC_PANEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "panelg.h"
 #endif
 

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 45564cc70d875ac66a609052c8133f15352c5a65..0921b4b85f5b91f86157917598c0c9bdbbbf7b78 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -13,7 +13,7 @@
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "printps.h"
 #endif
 

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 40781a3941745427bcf25c886f9db7f3df1d5b3b..4cd5d9dadd108f26c978678c210ef5b1b18620e9 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -13,7 +13,7 @@
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "prntdlgg.h"
 #endif
 

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index e88b639386773f026f38b46048bece5d233ae1f2..08411b619f3a767baee696333b7daa31f0630616 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "progdlgg.h"
 #endif
 

diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index 2e90124cc75229c2c2ea7db6cfadbed2caf79bbe..f21b76c8a3fa50c3ed1511b9df0d4e268faa236f 100644 (file)
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -14,7 +14,7 @@
 #ifndef _WX_SASHWIN_H_G_
 #define _WX_SASHWIN_H_G_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "sashwin.h"
 #endif
 

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index ce9c0e75de816a01cbf6eea584c57aadc1c28a55..1d3a4d3404b9fda656c6715abfb9a58ed48ef2eb 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "genscrolwin.h"
 #endif
 

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index c442db8e9b884c827ad188f3266b228e7323dbb9..1175f102d03d5eeb41c158e25881c384a0a45310 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -22,7 +22,7 @@
 
 #if wxUSE_SPINBTN 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "spinctlg.h"
 #endif
 

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index dc5c195930cf9d89ff82c17b60566fbcef9dcdd5..2bc789fad8c382624f7310f7d37cb98f6a418ec2 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "splash.h"
 #endif
 

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index beaba72ac5e63ccff3dfcbc2f10f2d63df28c07c..2ea74a49d0c1da60ea13ee52b43bbfaecc8bdf6a 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -12,7 +12,7 @@
 #ifndef __SPLITTERH_G__
 #define __SPLITTERH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "splitter.h"
 #endif
 

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 67efb49f6c15994bca32cc4261e8d37f42e25eaa..32ec10dee64b8d063baf3d1f7e2cadd9dc153b4b 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -11,8 +11,8 @@
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
-#ifdef __GNUG__
-    #pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "statline.h"
 #endif
 
 class wxStaticBox;

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index b0d27f3ca901e49b2a0ec05aadc6cf82bce94f49..9145f7dbafecf1d91fbfd5020b93e8dff647e8ac 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "statusbr.h"
 #endif
 

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index c78b18a4708e6b21a0a7054c397c09d12d5f0e9f..b71a4e902b59a5d5330b9e7e34444933fd0888bd 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -12,7 +12,7 @@
 #ifndef __TABGH_G__
 #define __TABGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "tabg.h"
 #endif
 

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index f68bd873af5d08069d21889d177e6be457275e6f..74fa8fa12e6143a3147de09220347e46ce0e701e 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textdlgg.h"
 #endif
 

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index 3c381771a7ac4da16c12b88e8e9de5c6266e9355..7e80d8c754af9a402555d7f622a79bc1a297a47e 100644 (file)
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -11,7 +11,7 @@
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "timer.h"
 #endif
 

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 11a1574e20cbaf030063d154d9736d53bf3bb7ee..b5e4c2f5498dfa2c7ec0d5006f3f98fe02123db3 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -12,7 +12,7 @@
 #ifndef _GENERIC_TREECTRL_H_
 #define _GENERIC_TREECTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "treectlg.h"
 #endif
 

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index 875b4a0129341ea2ce77e56f0151ae9e568d46b2..4bcc4baf0f3b6f735c283233727d454a7378eaa0 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TREELAY_H_
 #define _WX_TREELAY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wxtree.h"
 #endif
 

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 99c2710a25989a67a76e8ab287cf3fe29f0505d5..68362e06ec8a499d6ca07c5939f55d26bccd5d35 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -13,7 +13,7 @@
 // wxWizard
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "wizardg.h"
 #endif
 

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 0c61a813bafd408b4062783f18a94549f61c77ef..c332ec0d5bc2bbfd81df0d1c8a211aa0df8a2f14 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GEOMETRY_H_
 #define _WX_GEOMETRY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "geometry.cpp"
 #endif
 

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index e40152cfa12ae3fd6d15bd98b4e20fe43a5f8929..13a3a7b5a8b3a9880e5a62f0d46a9d83365f34b7 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -11,7 +11,7 @@
 #ifndef _WX_GIFDECOD_H
 #define _WX_GIFDECOD_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "gifdecod.h"
 #endif
 

diff --git a/include/wx/hash.h b/include/wx/hash.h
index a42138a438ba540fa39d39ec84937fa73f8952c1..93405385693e1994b366c9e3f0a4baa1c3b8c05c 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "hash.h"
 #endif
 

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 801a03614008c9cdd08b41b7543f0f3c44ca215c..9b635e8a075aebfabb27926f8e7ea74c5ceb53ba 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HASHMAP_H_
 #define _WX_HASHMAP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "hashmap.h"
 #endif
 

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 0fd1148aa32c89191ccf5af1936d5abfed2cb242..9ac23f2e9f77020cb9135d9eb738b67a02173496 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPBASEH__
 #define _WX_HELPBASEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpbase.h"
 #endif
 

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index cd1efd1aee248ea98ea33139ae1c8f37792471e8..f5f285d8b77cf50a3862442ff3b1d7232eb35abe 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpctrl.h"
 #endif
 

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 0780cac6b0c6fd6fe3644733bb8660c47e514b48..72612cf2b14ea0a7357245a8e4b3d51d713878c8 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpdata.h"
 #endif
 

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 835a7b91006bf27726b0897cb692f59e238aed31..11a5e82961a2f0360a6ebcb31bbaa80570cc9a0d 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPFRM_H_
 #define _WX_HELPFRM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpfrm.h"
 #endif
 

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 59b6f265a821c866fb003b6c6d146527091cea5d..e2760ab1f8f8596504d584dbc86e322d1410a1c1 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HTMLCELL_H_
 #define _WX_HTMLCELL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmlcell.h"
 #endif
 

diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index 975461d50a2f76b7dc6dad4292c03e8fa1b90cce..57c5b471873a3b0f76de60572079c589c94f1ded 100644 (file)
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLFILT_H_
 #define _WX_HTMLFILT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmlfilt.h"
 #endif
 

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index a7f067b5a1dce8ec649e7ac33f824098f3ab6d98..ea6a99bc5c352af464e4e465708dad5c280679f7 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLPARS_H_
 #define _WX_HTMLPARS_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmlpars.h"
 #endif
 

diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h
index 4706915148fab7f8d78d85804aa016143911548b..59cb01ed946dd5063b0451babe391075904864ec 100644 (file)
--- a/include/wx/html/htmlproc.h
+++ b/include/wx/html/htmlproc.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLPREP_H_
 #define _WX_HTMLPREP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmlproc.h"
 // (implementation is in htmlwin.cpp, there's no htmlprep.cpp!)
 #endif

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 758e1d3a0e9d3a24c896c25444cb8694aa01a351..0dc91747ed0c758f348c809d600913a309741077 100644 (file)
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLTAG_H_
 #define _WX_HTMLTAG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmltag.h"
 #endif
 

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index d31dd8b880fa09f812e5254f8d736023f35fb85a..14ed7b410bba228c7eb50d82c711c74d08b27fe2 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLWIN_H_
 #define _WX_HTMLWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmlwin.h"
 #endif
 

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index a68eb03f2f4513d84b9b83463db942a20ddd9514..38575d5b5ac0d5ba349634a36fcad70fadab780b 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmprint.h"
 #endif
 

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 4ce8afd0f76eb172fd200297afca3d3c13871c4f..5e6866d069bbc251956ef113f3cc80613e23375c 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -11,7 +11,7 @@
 #ifndef _WX_WINPARS_H_
 #define _WX_WINPARS_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "winpars.h"
 #endif
 

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index e70715ff7a19779ed9d6f4c49259849149929b9e..8f04625360a17f28970726b35fd722de86dcc1d8 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "iconbndl.h"
 #endif
 

diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index 0ba6c31e9f8491ed5d470352fd2036d883ed3193..7ddbd1c3f5cd4f873f7163af63aeffed4cd12bd2 100644 (file)
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGBMP_H_
 #define _WX_IMAGBMP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagbmp.h"
 #endif
 

diff --git a/include/wx/image.h b/include/wx/image.h
index 7718cacdeb92ac5c93c9b2ef31fd144706dc0bf9..6d025c286b6fdac2fdc6cac7b57a5830d42b4ec0 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGE_H_
 #define _WX_IMAGE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "image.h"
 #endif
 

diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index f0cffd7fca900d4a5df477426d8d4470101a0e22..1eaba1b62e77bdd508dd544846c0d496b1274588 100644 (file)
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGGIF_H_
 #define _WX_IMAGGIF_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imaggif.h"
 #endif
 

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index df340cd7b0ea5661929e806ea352ac28d212078e..076cc115a949d4cefef04117cb0467dab3ed2b2c 100644 (file)
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGE_IFF_H_
 #define _WX_IMAGE_IFF_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagiff.h"
 #endif
 

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 999bc889cb1f57d64919724741bb330a69be7542..ff762392240b980b85249a3a2055beaae97fbce4 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagjpeg.h"
 #endif
 

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 1533483fff8227c8a93ff3945ffa6faf3a993703..f6e5908472c28c73089b9e2d2eb66362d3fccc02 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagpcx.h"
 #endif
 

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 87ff7f124b53d904d362b0380cfda45ba5bbdea8..232e880403e3a0fb038ac9aab1e32231066ec3e8 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGPNG_H_
 #define _WX_IMAGPNG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagpng.h"
 #endif
 

diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 8af0200a29303ee5615c5332beb0ad057c507f3b..21f2896b5791dc6f7d97015e6170157d69ebad04 100644 (file)
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagpnm.h"
 #endif
 

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index e6f80b3eba73b08bb495da62632b6c91772741c7..5d539336a84fecbacafa28db6a281c44653754a2 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagtiff.h"
 #endif
 

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 2b64bfb8bb6d3265246e928599c1dd8fb4c82d7b..658fa3d62232ca287969d7723502cfe3f5695e64 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagxpm.h"
 #endif
 

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 879f26be45b5bbe5703d861a54e9552398d8a81f..d73b1dcbcfa8d9d8b7b29de1a9eb8963122a2207 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "intl.h"
 #endif
 

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 6d3e80562cd165a4ec6fd742a86dbed7970fad70..819c6f50cf5f7213353683a2633c52fea01cc2a8 100644 (file)
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_IPCBASEH__
 #define _WX_IPCBASEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "ipcbase.h"
 #endif
 

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 0fcd64ecd8ff38766d60f02d9356345e41ba520a..ebfff6e6695df87e5cd1fd5861df62991014a818 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "layout.h"
 #endif
 

diff --git a/include/wx/list.h b/include/wx/list.h
index 1fd7c4808ef71c75dac0823eccb565b9b4eed2ef..886c744618bc5b49084c86a36b3d02e81879c80c 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -25,7 +25,7 @@
 #ifndef _WX_LISTH__
 #define _WX_LISTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "list.h"
 #endif
 

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 6659ab67d6b3cc91bb16131c000709ce5d67123c..a1d85937ffe2bbd53a1f9bcdd1662e842171b564 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_LISTBASE_H_BASE_
 #define _WX_LISTBASE_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 //    #pragma interface "listctrlbase.h"
 #endif
 

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 23f3100c5305c1ccf52ea4a7ff3038bdc890623c..3624531b20be1eb48165c59635ebcddd55b09512 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "listboxbase.h"
 #endif
 

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 7914d43ca40567dbec31ddaa973844cc8a5d5745..a89000e868ab6795c295dae9ecdddeace1c0e373 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_LISTCTRL_H_BASE_
 #define _WX_LISTCTRL_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "listctrlbase.h"
 #endif
 

diff --git a/include/wx/log.h b/include/wx/log.h
index 44266ab80e35ecc967c4a15dff898c9b55a064e4..2de7fe1e4b38a8f32af2edd87d253af50791bd0c 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_LOG_H_
 #define   _WX_LOG_H_
 
-#ifdef  __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "log.h"
 #endif
 

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 80272649a48c658aba497f2e861423b8797eac59..a4eb5f547d6c94ed8ac29b12983429fe341d1e30 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -13,7 +13,7 @@
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "longlong.h"
 #endif
 

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index c187c68fa3a165bd03c1ade75d37058b3081d305..da205da2c887a87cbeb4fa5cb469f1a27a794d45 100644 (file)
--- a/include/wx/mac/accel.h
+++ b/include/wx/mac/accel.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "accel.h"
 #endif
 

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index b62312527b550ac61d38f836d1b3691fb3ef5f79..7b475d5bb2df0f4ff35d512042204287c3a79856 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -12,7 +12,7 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "app.h"
 #endif
 

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 1b0873f0af36bac807758e60d127d57b5d273f1d..dae1493b874960ffb55e76a93feb22f038c27f2f 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
   #pragma interface "bitmap.h"
 #endif
 

diff --git a/include/wx/mac/bmpbuttn.h b/include/wx/mac/bmpbuttn.h
index f117362ec940e39dc072d46e35abb32686ee8e29..d588017989999e972b2aeaaee65b0bed5ffd0b4a 100644 (file)
--- a/include/wx/mac/bmpbuttn.h
+++ b/include/wx/mac/bmpbuttn.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "bmpbuttn.h"
 #endif
 

diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h
index af030c9dbecf2b0220c8f2f678c327597e91d3b8..b03a6b332ed9e2bb24fa077b94b19d9b38f5a5de 100644 (file)
--- a/include/wx/mac/brush.h
+++ b/include/wx/mac/brush.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "brush.h"
 #endif
 

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index 12faee340c3c4403710773d9529a7ef10be9c12b..2279d8231690ade44322d1c2e3159ce8102044ac 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "button.h"
 #endif
 

diff --git a/include/wx/mac/checkbox.h b/include/wx/mac/checkbox.h
index 3ca0a6f4152f2cbe984a1aa8421d4df1321a3474..5f7db2068fdd21060f1f5a75891ae488b2a3012f 100644 (file)
--- a/include/wx/mac/checkbox.h
+++ b/include/wx/mac/checkbox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "checkbox.h"
 #endif
 

diff --git a/include/wx/mac/checklst.h b/include/wx/mac/checklst.h
index 0f514889b0d60bee41f8d090f0c0037ac472ab14..ef452a1c21aacb21d0eef3f6064449a23abd13b2 100644 (file)
--- a/include/wx/mac/checklst.h
+++ b/include/wx/mac/checklst.h
@@ -13,7 +13,7 @@
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "checklst.h"
 #endif
 

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index f9d790df0641bd512c0ba0e855275ccb67e1c011..a122f95f3787de5c490d02a646f515b0dedcdad7 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "choice.h"
 #endif
 

diff --git a/include/wx/mac/clipbrd.h b/include/wx/mac/clipbrd.h
index 62fe3e51c471bccb3cd6173b5ad13cddc7a81466..17b7367b30f768ddf427263191ffc0ff6f70ae21 100644 (file)
--- a/include/wx/mac/clipbrd.h
+++ b/include/wx/mac/clipbrd.h
@@ -15,7 +15,7 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "clipbrd.h"
 #endif
 

diff --git a/include/wx/mac/colordlg.h b/include/wx/mac/colordlg.h
index 556c2f316ece1005c4d505096f083ec23ba1cf46..e12da2d92fc4afb1678609adb636614f27703cc2 100644 (file)
--- a/include/wx/mac/colordlg.h
+++ b/include/wx/mac/colordlg.h
@@ -13,7 +13,7 @@
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "colordlg.h"
 #endif
 

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index 02383e7ff2e384acf0ebf767312d29dd6e9974d3..857eb6143cc4d3e14e1316fed1677bff6ec59b0e 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "colour.h"
 #endif
 

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index 2f9d8e2f5c299bd5a52ed3a4caa6210c060e4f17..4b10550e60f9de485e6962de3c56427c0a118c31 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "combobox.h"
 #endif
 

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 417d5d5bb099c7b516183b92bc5a348d99c73342..c97686d258cc973ac3cd8099d31b6c03a96d7355 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "control.h"
 #endif
 

diff --git a/include/wx/mac/cursor.h b/include/wx/mac/cursor.h
index 7609aca59f17643636172201a947c09cae0d1773..fc610f95646421aa3a6757201bd81d79f5001906 100644 (file)
--- a/include/wx/mac/cursor.h
+++ b/include/wx/mac/cursor.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "cursor.h"
 #endif
 

diff --git a/include/wx/mac/dataobj.h b/include/wx/mac/dataobj.h
index e08abc2bd84872244d46202ddb503d47d09bcf04..3c1e8de47b73207ef424a72fb5f6b67a4d4f101d 100644 (file)
--- a/include/wx/mac/dataobj.h
+++ b/include/wx/mac/dataobj.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MAC_DATAOBJ_H_
 #define _WX_MAC_DATAOBJ_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dataobj.h"
 #endif
 

diff --git a/include/wx/mac/dataobj2.h b/include/wx/mac/dataobj2.h
index a936e226e920d3485d589cc330d6bcda85a8cf0e..744aa141ae38ce691d08657cd34db2cf24349450 100644 (file)
--- a/include/wx/mac/dataobj2.h
+++ b/include/wx/mac/dataobj2.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GTK_DATAOBJ2_H_
 #define _WX_GTK_DATAOBJ2_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dataobj.h"
 #endif
 

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index e48f2b7dee13d727176607edb447dcf424f8238f..679130d65bc2478b4c7618b720d3130f7411e2fa 100644 (file)
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dc.h"
 #endif
 

diff --git a/include/wx/mac/dcclient.h b/include/wx/mac/dcclient.h
index c2a118c6a1a2aff11b20c7fcdbb5529a1a60f742..c7078fe77ec585b8d25607b1d6e50dcaf6005358 100644 (file)
--- a/include/wx/mac/dcclient.h
+++ b/include/wx/mac/dcclient.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcclient.h"
 #endif
 

diff --git a/include/wx/mac/dcmemory.h b/include/wx/mac/dcmemory.h
index ab38f69f9cb3ef294138a7f83cca616fde46f0a1..c72e4017b7ff7392fe9175000bbc80e32e4ef434 100644 (file)
--- a/include/wx/mac/dcmemory.h
+++ b/include/wx/mac/dcmemory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcmemory.h"
 #endif
 

diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h
index fa2c71273bf61d6d74613d42acf17dc9870b765c..cc581688d3b54a19dfd81bcdc24934bcbb478446 100644 (file)
--- a/include/wx/mac/dcprint.h
+++ b/include/wx/mac/dcprint.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcprint.h"
 #endif
 

diff --git a/include/wx/mac/dcscreen.h b/include/wx/mac/dcscreen.h
index e04b450f69941e8ce90f5ac3e2da5dfc90f3a923..fcd6cf7eee900daa6815d2bceae6967d76b821bb 100644 (file)
--- a/include/wx/mac/dcscreen.h
+++ b/include/wx/mac/dcscreen.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcscreen.h"
 #endif
 

diff --git a/include/wx/mac/dialog.h b/include/wx/mac/dialog.h
index 2ba611bf9aff0855b33c7d7fb23164a067cedf16..fc58b6f03a1cb3782ea1e8479e50f242b10c8777 100644 (file)
--- a/include/wx/mac/dialog.h
+++ b/include/wx/mac/dialog.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dialog.h"
 #endif
 

diff --git a/include/wx/mac/dirdlg.h b/include/wx/mac/dirdlg.h
index fe343b9165d8c5d8936c4054f417a5b78907a928..13498f42e7a1c4ffe8e2967fa2f8edaa31e0bd56 100644 (file)
--- a/include/wx/mac/dirdlg.h
+++ b/include/wx/mac/dirdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dirdlg.h"
 #endif
 

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 252d2376147aa42be7de5dd39051b23172a9ead2..e77bb0025aa20df50d407e6138dbed7adeb8bf64 100644 (file)
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -10,7 +10,7 @@
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dnd.h"
 #endif
 

diff --git a/include/wx/mac/filedlg.h b/include/wx/mac/filedlg.h
index c0b724ecbb519782682d0fddd74111507bce2885..a013f9d8de31fa114cc43ed10b70299b97b3385d 100644 (file)
--- a/include/wx/mac/filedlg.h
+++ b/include/wx/mac/filedlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "filedlg.h"
 #endif
 

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index 09d7797a06e56ffebaf0200f7ca0917806e11956..b14155a75bfe099501c124509504c700bf5d2708 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "font.h"
 #endif
 

diff --git a/include/wx/mac/fontdlg.h b/include/wx/mac/fontdlg.h
index 99fdbcb93fed7d228394b10cb458e1146b3b3131..f21d96a7dae978d30e9a7effed610258449f022d 100644 (file)
--- a/include/wx/mac/fontdlg.h
+++ b/include/wx/mac/fontdlg.h
@@ -13,7 +13,7 @@
 #ifndef _WX_FONTDLG_H_
 #define _WX_FONTDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fontdlg.h"
 #endif
 

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 95ddac84d1c2a0d6e323b03095e192d9ebfbcbc0..6434553ebed9338030dc413f17cc03b768ed77c3 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "frame.h"
 #endif
 

diff --git a/include/wx/mac/gauge.h b/include/wx/mac/gauge.h
index b28a1996148790c537097946c047d6076334d361..d204ddc15dcff54f1d4a04c135fbea68b08f68d6 100644 (file)
--- a/include/wx/mac/gauge.h
+++ b/include/wx/mac/gauge.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "gauge.h"
 #endif
 

diff --git a/include/wx/mac/gdiobj.h b/include/wx/mac/gdiobj.h
index 3a9009372549fabf5ff9c9c3d27231aee42b07f9..0e1893f462a7c2cf9304d3f925b08d9e7f49a9fd 100644 (file)
--- a/include/wx/mac/gdiobj.h
+++ b/include/wx/mac/gdiobj.h
@@ -12,12 +12,12 @@
 #ifndef _WX_GDIOBJ_H_
 #define _WX_GDIOBJ_H_
 
-#include "wx/object.h"
-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "gdiobj.h"
 #endif
 
+#include "wx/object.h"
+
 class WXDLLEXPORT wxGDIRefData: public wxObjectRefData {
 public:
     inline wxGDIRefData()

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index 5231ed7196d5af60cc37462d0122b523e287003b..a5465fcc5b9ffef13e33578d079a12f286091131 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #  pragma interface "glcanvas.h"
 #endif
 

diff --git a/include/wx/mac/helpxxxx.h b/include/wx/mac/helpxxxx.h
index d53c28b7e46582020d16711166b559055c7cb999..20a596d8aedbbeb768b84ca140068dedf35f24a7 100644 (file)
--- a/include/wx/mac/helpxxxx.h
+++ b/include/wx/mac/helpxxxx.h
@@ -13,7 +13,7 @@
 #ifndef _WX_HELPXXXX_H_
 #define _WX_HELPXXXX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpxxxx.h"
 #endif
 

diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h
index e1aa18fea541706b14d12faf370060a83193b15f..c95b89aee22a2da5de8e4d7f82f5180b4df78b61 100644 (file)
--- a/include/wx/mac/icon.h
+++ b/include/wx/mac/icon.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "icon.h"
 #endif
 

diff --git a/include/wx/mac/imaglist.h b/include/wx/mac/imaglist.h
index 8f305419fea0103eb95f77c711b30e05d7cf5ec3..13b7be60faf7281023ed2f087bf32f35284eb23b 100644 (file)
--- a/include/wx/mac/imaglist.h
+++ b/include/wx/mac/imaglist.h
@@ -14,7 +14,7 @@
 #ifndef _WX_IMAGLIST_H_
 #define _WX_IMAGLIST_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imaglist.h"
 #endif
 

diff --git a/include/wx/mac/joystick.h b/include/wx/mac/joystick.h
index 30324fc035da5e6d6e49504afff284bc508d31b9..601b32f6bb6b23b55e212a765fb212c06c5d5cdc 100644 (file)
--- a/include/wx/mac/joystick.h
+++ b/include/wx/mac/joystick.h
@@ -12,7 +12,7 @@
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "joystick.h"
 #endif
 

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index e35fb87b2f6b204e5381f4e78ce1cea25eb8980f..8158bf673138cc8c0ac74b8aa035d2e34c5a27ce 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -13,7 +13,7 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "listbox.h"
 #endif
 

diff --git a/include/wx/mac/listctrl.h b/include/wx/mac/listctrl.h
index 6dfc25df982f2240ebdff744d894fdfdc3e04de8..b38b7973ddad522290da0c96e583347a4689c981 100644 (file)
--- a/include/wx/mac/listctrl.h
+++ b/include/wx/mac/listctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "listctrl.h"
 #endif
 

diff --git a/include/wx/mac/mdi.h b/include/wx/mac/mdi.h
index 091021d0fc7459f143ddc5c0d841c4c5e7830805..3886829522071f2cbea9b67060436362b41bc35d 100644 (file)
--- a/include/wx/mac/mdi.h
+++ b/include/wx/mac/mdi.h
@@ -14,7 +14,7 @@
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "mdi.h"
 #endif
 

diff --git a/include/wx/mac/menu.h b/include/wx/mac/menu.h
index 63a2598097c3d5f0207330c2bf82da53c3e324e3..4c79dbf2aa36d23d126ff87614e01c8358b52ddd 100644 (file)
--- a/include/wx/mac/menu.h
+++ b/include/wx/mac/menu.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "menu.h"
 #endif
 

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 155798089291ff9cf3e4f6303d6f80a0afd234ae..459452596103a0cb24b853fc15d9423457724cf1 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -12,7 +12,7 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "menuitem.h"
 #endif
 

diff --git a/include/wx/mac/mimetype.h b/include/wx/mac/mimetype.h
index b1af2186fc47a34c6a596c57ce46f5a4173e459e..475267c7badd051279df5f29805b6120b20f2ee3 100644 (file)
--- a/include/wx/mac/mimetype.h
+++ b/include/wx/mac/mimetype.h
@@ -12,7 +12,7 @@
 #ifndef _MIMETYPE_IMPL_H
 #define _MIMETYPE_IMPL_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "mimetype.h"
 #endif
 
@@ -43,8 +43,8 @@ public :
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
     // this are NOPs under MacOS
-    bool ReadMailcap(const wxString& filename, bool fallback = TRUE) { return TRUE; }
-    bool ReadMimeTypes(const wxString& filename) { return TRUE; }
+    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE) { return TRUE; }
+    bool ReadMimeTypes(const wxString& WXUNUSED(filename)) { return TRUE; }
 
     void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
 

diff --git a/include/wx/mac/minifram.h b/include/wx/mac/minifram.h
index 2e9daeed8609581e21c99215117da739f1b20a44..08e145ba32a5d61f4bd552a93c2db3b9a225940f 100644 (file)
--- a/include/wx/mac/minifram.h
+++ b/include/wx/mac/minifram.h
@@ -14,7 +14,7 @@
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "minifram.h"
 #endif
 

diff --git a/include/wx/mac/msgdlg.h b/include/wx/mac/msgdlg.h
index 2a237648dfb2093b6bac33771010117c71a78b3f..30a8d7e4cc3479ad8f655543cf20e4bbbf145ed5 100644 (file)
--- a/include/wx/mac/msgdlg.h
+++ b/include/wx/mac/msgdlg.h
@@ -13,7 +13,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "msgdlg.h"
 #endif
 

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index 516b9d29e9428e8b2c8f38947dffe60056e8a657..e461360b9f984df81c12c65522d88de0654f076d 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -11,7 +11,7 @@
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "notebook.h"
 #endif
 

diff --git a/include/wx/mac/palette.h b/include/wx/mac/palette.h
index 8894340703043de6e03bba2b3d2feb9e9d231d65..420e0f16fcde4792950f612b6a5b0fb4e5926449 100644 (file)
--- a/include/wx/mac/palette.h
+++ b/include/wx/mac/palette.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "palette.h"
 #endif
 

diff --git a/include/wx/mac/pen.h b/include/wx/mac/pen.h
index 5a36f8aeac2769ad474c03371b14c69eceaa53c3..f13fcdfdacc4ca94a0d332f1d0c376db8c3b9cd5 100644 (file)
--- a/include/wx/mac/pen.h
+++ b/include/wx/mac/pen.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "pen.h"
 #endif
 

diff --git a/include/wx/mac/pnghand.h b/include/wx/mac/pnghand.h
index 6d4fbfe41e81402f918057689a153e416c9414c6..426b0c448302be3b1969913743637172c403ded1 100644 (file)
--- a/include/wx/mac/pnghand.h
+++ b/include/wx/mac/pnghand.h
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "pnghand.h"
 #endif
 

diff --git a/include/wx/mac/pngread.h b/include/wx/mac/pngread.h
index 2a9307ba9ba433a53d38abd7450cc608b9407977..8aa50a09d44520a0f3245db2279f3f46d6283007 100644 (file)
--- a/include/wx/mac/pngread.h
+++ b/include/wx/mac/pngread.h
@@ -11,7 +11,7 @@
 #ifndef _WX_PNGREAD__
 #define _WX_PNGREAD__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "pngread.h"
 #endif
 

diff --git a/include/wx/mac/printdlg.h b/include/wx/mac/printdlg.h
index 1c6eb915cb1577c4e08b52440659ec3eb77a9f61..d17e9599bb8bd35d08c402264a13c9e5899d7c14 100644 (file)
--- a/include/wx/mac/printdlg.h
+++ b/include/wx/mac/printdlg.h
@@ -14,7 +14,7 @@
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "printdlg.h"
 #endif
 

diff --git a/include/wx/mac/printmac.h b/include/wx/mac/printmac.h
index 243ed2fefeee67a8c91122556e4e8fb198348b5a..6e155b947079f6255da8440405ca82af0991d8ea 100644 (file)
--- a/include/wx/mac/printmac.h
+++ b/include/wx/mac/printmac.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "printwin.h"
 #endif
 

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index 21910dc6f917d134512365dcea91f0d39a7ec713..5e0f3644e07d87d388c9f0d2e42e4f6553b7bb45 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "radiobox.h"
 #endif
 

diff --git a/include/wx/mac/radiobut.h b/include/wx/mac/radiobut.h
index 752fa59b46afab06baffa43166d614bf297bb8e1..e418d3f49542da870a7a1689c766a41e8e0ba3e3 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "radiobut.h"
 #endif
 

diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h
index d9fc31f073d89aca2c6e5631bd81afbb0e52bc96..019c9a4365a828d3a163d39be10aecae3102f64f 100644 (file)
--- a/include/wx/mac/region.h
+++ b/include/wx/mac/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "region.h"
 #endif
 

diff --git a/include/wx/mac/scrolbar.h b/include/wx/mac/scrolbar.h
index 1ae57c18d1b8a3bd86c4fa4a00faefdb3e334627..61c7f5b13944e9e20f92cccbd17f65dd7c5feace 100644 (file)
--- a/include/wx/mac/scrolbar.h
+++ b/include/wx/mac/scrolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "scrolbar.h"
 #endif
 

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index 93839af765e908c114439eade003a2a17e7cc257..5a3c76f86a1364eac5d9e8b2db6b5249d514f453 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "slider.h"
 #endif
 

diff --git a/include/wx/mac/spinbutt.h b/include/wx/mac/spinbutt.h
index f5b1206a19663b8a0025978b5605353b9e56c005..80e67b942cd7918531491874ba17576d4d251b4a 100644 (file)
--- a/include/wx/mac/spinbutt.h
+++ b/include/wx/mac/spinbutt.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "spinbutt.h"
 #endif
 

diff --git a/include/wx/mac/spinctrl.h b/include/wx/mac/spinctrl.h
index 75ef209fc0facd5ef67605f290b8b19f38a61bcc..76f0dc3412c6696bd956a8868c08581211abe28e 100755 (executable)
--- a/include/wx/mac/spinctrl.h
+++ b/include/wx/mac/spinctrl.h
@@ -22,7 +22,7 @@
 
 #if wxUSE_SPINBTN 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "spinctlg.h"
 #endif
 

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index f2cbc707309b18c59ab440018e558a882e982c0f..04b36469bfb477754e05ad98c02956ccc9420185 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "statbmp.h"
 #endif
 

diff --git a/include/wx/mac/statbox.h b/include/wx/mac/statbox.h
index a70d8e11c6c577a5f71b21166064779aca7be390..0f25961c37eb50f3addbc831b85eadf04ed44067 100644 (file)
--- a/include/wx/mac/statbox.h
+++ b/include/wx/mac/statbox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "statbox.h"
 #endif
 

diff --git a/include/wx/mac/statline.h b/include/wx/mac/statline.h
index 51eda5000209c2eaebcecb3493aac4b278e3f371..4651d0455791823f01c1f7aadfb0b447684ae6fb 100644 (file)
--- a/include/wx/mac/statline.h
+++ b/include/wx/mac/statline.h
@@ -11,8 +11,8 @@
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
-#ifdef __GNUG__
-    #pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "statline.h"
 #endif
 
 class wxStaticBox;

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 787eaf29ed6d25d2e134df8f8765d6abd93b6966..8884f70452a33e569a510a7cdc5304b051b8b356 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "stattext.h"
 #endif
 

diff --git a/include/wx/mac/statusbr.h b/include/wx/mac/statusbr.h
index 0f11fb91ef0e8a4a10b8bd84d7832228ea00391d..232390ab21c9f6deebbde0ab7f7a10c154a5ba78 100644 (file)
--- a/include/wx/mac/statusbr.h
+++ b/include/wx/mac/statusbr.h
@@ -13,7 +13,7 @@
 #ifndef   _WX_STATBAR_H_
 #define   _WX_STATBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "statbrma.h"
 #endif
 

diff --git a/include/wx/mac/tabctrl.h b/include/wx/mac/tabctrl.h
index 80740019b432287a5217841dd1acd14203b0b8bf..96aae8306897803e072c4ca8db4b2372ccb22033 100644 (file)
--- a/include/wx/mac/tabctrl.h
+++ b/include/wx/mac/tabctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TABCTRL_H_
 #define _WX_TABCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "tabctrl.h"
 #endif
 

diff --git a/include/wx/mac/taskbar.h b/include/wx/mac/taskbar.h
index dd17b4930bc599bb5da0ee817d85dd74488a54ec..a37d0702b754bb44f6abe08f22fa7c94e059f022 100644 (file)
--- a/include/wx/mac/taskbar.h
+++ b/include/wx/mac/taskbar.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TASKBAR_H_
 #define _WX_TASKBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "taskbar.h"
 #endif
 

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 799265855285c34ef7c748a7b04b22f9b517891a..1d9b21833374107d85e56a8ca746df861840859b 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "textctrl.h"
 #endif
 

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index a050d3a1c30717894bacad4d55415f904a24a6dc..397edf7485acd2db22b896fec55e19960420dd6c 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "timer.h"
 #endif
 

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 2c24882618d70a15c382422540207ddd6a3456ff..caef6bccd2a83d4eeb166c4d654541476b14ee86 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "toolbar.h"
 #endif
 

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index 5c3672f37ade58bfcf01f45124978b45523fffa4..f5da13f8708636616ef245bdbc8759acf5ddf544 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "toplevel.h"
 #endif
 

diff --git a/include/wx/mac/treectrl.h b/include/wx/mac/treectrl.h
index cb307ec0e97284e31b80b0ea031e5f84ada85f87..d4b3ad029e73079e281179318787e116fd6d80f0 100644 (file)
--- a/include/wx/mac/treectrl.h
+++ b/include/wx/mac/treectrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TREECTRL_H_
 #define _WX_TREECTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "treectrl.h"
 #endif
 

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
index 6f9f959b81542281100d8630a444daa11ab30591..c203db629f69dcd7b9df10b07b3ac3debda64237 100644 (file)
--- a/include/wx/mac/wave.h
+++ b/include/wx/mac/wave.h
@@ -13,7 +13,7 @@
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wave.h"
 #endif
 

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 96f1c62b241edb3e5b3874cb3d3fb491bfd1ea10..a3a31e301df198060b16ae9fd3c736edd9da45c2 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "window.h"
 #endif
 

diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index e329c01f24d591ef8b51af0a9744fb4ceca0486e..c5a7d41a663f1e8ff716111c940ea28ee8b66f0b 100644 (file)
--- a/include/wx/matrix.h
+++ b/include/wx/matrix.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MATRIXH__
 #define _WX_MATRIXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "matrix.h"
 #endif
 

diff --git a/include/wx/memory.h b/include/wx/memory.h
index eebfc3890c14c3ea4af8ef0dccc25bf1a1c8bb06..e69b1b03bc230a62a2572cad80f1c0467ce13423 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MEMORYH__
 #define _WX_MEMORYH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "memory.h"
 #endif
 

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 181781b0a59c2586bcf4bc9c3aa9ace86b1e929b..ccdac72ffac560b297ced16bc890a442416bc3dc 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MENU_H_BASE_
 #define _WX_MENU_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "menubase.h"
 #endif
 

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index e204c1425ad99082d1c4162db624cd56e25059a7..51400743f648474438da01b80cc0d2a060d97f04 100644 (file)
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -11,7 +11,7 @@
 #define __WX_BITMAP_H__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "bitmap.h"
 #endif
 
 #include "wx/defs.h"

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 773d4a76728cd76a33f2424d59861d6feeee5ab9..87c55befac2142e4daaca6fdc51480d4b07bbd6d 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -13,7 +13,7 @@
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "mimetypebase.h"
 #endif // __GNUG__
 

diff --git a/include/wx/module.h b/include/wx/module.h
index 0c50363a6d390782ecb5bf545d6d8c73ff3d8869..aeee79b942142ef14295fdbaf3769f4d81218009 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
 

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 9b9e020fe27947c17f9921e34c9618af60d156c9..7a43ada630f47cded8cd56e431f1c352383f092e 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "msgout.h"
 #endif
 

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index be8ba1d89f8358a18d62383c3882b48b990edbe7..a7583c58571a00d4a0384e67941f5f8e8d3472c1 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -12,7 +12,7 @@
 #ifndef _WX_NOTEBOOK_H_BASE_
 #define _WX_NOTEBOOK_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "notebookbase.h"
 #endif
 

diff --git a/include/wx/object.h b/include/wx/object.h
index 8a5f1bb96e280cd95b74511215e5a052c48cd30d..4fcb3c178c1f0b4682dfcd92ab65b9e4bca4268e 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,7 +13,7 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "object.h"
 #endif
 

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index d55fe5a14b5ffd8bbd385be10a6a98f1786a213e..c75a316369a3355ffb21fe6abd7c2a4c8b9d823e 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -13,7 +13,7 @@
 
 #if wxUSE_ODBC
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "odbc.h"
 #endif
 

diff --git a/include/wx/paper.h b/include/wx/paper.h
index f81b15507978c86a9bff6d03da50b18156dc2ac0..322e7e002f1f6d0569e15cd4fd77581be4277907 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "paper.h"
 #endif
 

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index b4558ee4d468106c8301be95fe3ff0b228316cd3..185d8c7f6573f1566240bf0b0fc1c45be6c6df77 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "popupwinbase.h"
 #endif
 

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 701964170cbcd2c48836958cf22ea07bc00d943e..688a95748112238ff2f591ca63b8b69fc3e65754 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PRNTBASEH__
 #define _WX_PRNTBASEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "prntbase.h"
 #endif
 

diff --git a/include/wx/process.h b/include/wx/process.h
index c5136d203a3681bd677a72319724368a78836bb7..e488f264d26e23266b480fda4788982e42132b00 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "process.h"
 #endif
 

diff --git a/include/wx/prop.h b/include/wx/prop.h
index 9207cb2d93b3704b88defbd6252e3ba4809ad455..6ddf2f3b5f0a2b3b9a528c2b1c1b76101810b80d 100644 (file)
--- a/include/wx/prop.h
+++ b/include/wx/prop.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PROP_H_
 #define _WX_PROP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "prop.h"
 #endif
 

diff --git a/include/wx/propform.h b/include/wx/propform.h
index 426bd05a526d8af9138bc9f8548336513e6ff0c6..723fc50333783c64387e77651337feddf83a9e3f 100644 (file)
--- a/include/wx/propform.h
+++ b/include/wx/propform.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PROPFORM_H_
 #define _WX_PROPFORM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "propform.h"
 #endif
 

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index 5fdf1bdcce15cb613f79fc5a60d00edae4d15b20..b21f36aa098f540b7ab60d7b55cd704626f5eb5a 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -42,7 +42,7 @@
 #ifndef _WX_PROPLIST_H_
 #define _WX_PROPLIST_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "proplist.h"
 #endif
 

diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index 49f5182b1dc9b47c4280f27a0b52d59fab0b3453..3b2d3470e0510418ab1f2355ea595f5561463aee 100644 (file)
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -12,7 +12,7 @@
 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "sckfile.h"
 #endif
 

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index ae7391d45ef11f8a586b756def060de5b4e04e53..c3631a4278b582a39dd6f3b2de5e98f8b71082e9 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -13,7 +13,7 @@
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "ftp.h"
 #endif
 

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index a98c0527db5ca7229f107db4544df2e290495c47..d17e4dd6373db16b2ecdd01cdee478839a3de22e 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PROTOCOL_PROTOCOL_H
 #define _WX_PROTOCOL_PROTOCOL_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 

diff --git a/include/wx/quantize.h b/include/wx/quantize.h
index fac092df9a9e9b7ad267e4f681cd3e110f43ec7b..bb935dbcd7a9b30e1bd771e43b482e7fa9b58be2 100644 (file)
--- a/include/wx/quantize.h
+++ b/include/wx/quantize.h
@@ -17,7 +17,7 @@
  * For conditions of distribution and use, see the accompanying README file.
  */
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "quantize.h"
 #endif
 

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index caa8fbbe9160a3af0550286a0a8ccf091036d361..81ac1737bfe9ff3cd62d5fde1844e920f6e90e01 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "radioboxbase.h"
 #endif
 

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 946d106cb2d15c0e2e1a238ad1240b07eb378587..812405852f9a1b44dea102ec1083b056ff1113aa 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "regex.h"
 #endif
 

diff --git a/include/wx/resource.h b/include/wx/resource.h
index d4e0463f0d9225c0a38b67c2045fdfd7d4380fb1..37c4e864567d6536a9f89ea6d6373fa08d9913d7 100644 (file)
--- a/include/wx/resource.h
+++ b/include/wx/resource.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RESOURCEH__
 #define _WX_RESOURCEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "resource.h"
 #endif
 

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index ab0f989e81be4c119de7a12bb0dd4dea804c5638..5cdc79252c5a956433907648c6aff49b94dfabb3 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -12,8 +12,8 @@
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "sckaddr.h"
 #endif
 
 #include "wx/defs.h"

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 47f506184f3e6c8f55e3b7e2bf6a57951a819f87..50e4c18494035023ad89a52e2a51f955e8a83b6a 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -16,7 +16,7 @@
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "sckipc.h"
 #endif
 

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 6ef70e4e91b0dfdab398189519e3d58fe439271b..d649b7479393bedfe21983b3c15fd689e66cbb4f 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,7 +11,7 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index cd92e216b73322cbf5c270b32f69b9846869ed77..3857f28d25f7496cfd8ed0b12a1ae75c56fdd720 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -12,7 +12,7 @@
 #ifndef __WXSIZER_H__
 #define __WXSIZER_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "sizer.h"
 #endif
 

diff --git a/include/wx/snglinst.h b/include/wx/snglinst.h
index 2bcce17a820da4ebb62962d9b43b6d19a8ce264f..b940f3dd12d31dfad96f17f0433c1b16d8839979 100644 (file)
--- a/include/wx/snglinst.h
+++ b/include/wx/snglinst.h
@@ -13,7 +13,7 @@
 #ifndef _WX_SNGLINST_H_
 #define _WX_SNGLINST_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "snglinst.h"
 #endif
 

diff --git a/include/wx/socket.h b/include/wx/socket.h
index b8ebcb846b31d3394198e7d9b5a87ef5a5c310bd..605e15c5b6a4d6ff13128ac700027a0bbbacaa91 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -12,7 +12,7 @@
 #ifndef _WX_NETWORK_SOCKET_H
 #define _WX_NETWORK_SOCKET_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
   #pragma interface "socket.h"
 #endif
 

diff --git a/include/wx/spawnbrowser.h b/include/wx/spawnbrowser.h
index 94fa83bd66871785c476b1fc2f715d29aaf0579c..2805d2ba6ecd440b8eee07ef3ae645c9b0cbe940 100644 (file)
--- a/include/wx/spawnbrowser.h
+++ b/include/wx/spawnbrowser.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SPAWNBROWSER_H_
 #define _WX_SPAWNBROWSER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "spawnbrowser.h"
 #endif
 

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 9f90791f5b15322028eea947bbd58601ea5f495f..d00704520859934ed9b237de5b9b09293f77ab90 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "statbmpbase.h"
 #endif
 

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 103e8479f74c2e951a85c80c049929d6ef21aa17..adafc8bfce155776c69178f5a830707212979998 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "statbar.h"
 #endif
 

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index ba1e84d5791a126d156f99f61f5c70d160c36f52..60aef2c1ddefc78dc745f573a6c7b0027a58f02a 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXSTRCONVH__
 #define _WX_WXSTRCONVH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
   #pragma interface "strconv.h"
 #endif
 

diff --git a/include/wx/stream.h b/include/wx/stream.h
index d035bde1cfbbffd1ec560d3e97aa272423ce22df..488d1905dca86f30cbceab17eb1deebc93a353bd 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -12,8 +12,8 @@
 #ifndef _WX_WXSTREAM_H__
 #define _WX_WXSTREAM_H__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "stream.h"
 #endif
 
 #include "wx/defs.h"

diff --git a/include/wx/string.h b/include/wx/string.h
index 087a46e2258090ba99b7b7928c5afcc2b091417b..1c6dbc1f0b6a49201c5ae4278dff38e6c8a165dc 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -18,7 +18,7 @@
 #ifndef _WX_WXSTRINGH__
 #define _WX_WXSTRINGH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "string.h"
 #endif
 

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index dfa4dcb40d2bffab99c54580564a740feee397ca..c96bef2acf9279b59487e3fe0a6050815808b5e3 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "tbarbase.h"
 #endif
 

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index b6b5d229e7b85f352d1806ffadd9b28d6af2a49a..3dbeac1ae7dec3d25565067542fde69c40edc8b1 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TBARSMPLH__
 #define _WX_TBARSMPLH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "tbarsmpl.h"
 #endif
 

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index ad6081eec3135ffe588d6d7ffdb87f9fb77eff7e..c7087c669aa86996e936d11046da92ffd24879a8 100644 (file)
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textbuf.h"
 #endif
 

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 56646fa242c361f8cd55065bbdf5bf07a87faaec..61240469af4fea367def5e563ed0d735412fca04 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textctrlbase.h"
 #endif
 

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 01fe351f282f54e66797919044f15d56ba4ef877..b66afc76c410b35ca2a68e783c3473e11dc362c3 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -14,7 +14,7 @@
 #ifndef _WX_TEXTFILE_H
 #define _WX_TEXTFILE_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textfile.h"
 #endif
 

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 6c126b9fbd9d4d80dd4291f6a7128efaf026f07e..8652d6cbf810208c171fada3ce8cccb8660cfd20 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -23,7 +23,7 @@
 #if wxUSE_THREADS
 
 // only for wxUSE_THREADS - otherwise we'd get undefined symbols
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "thread.h"
 #endif
 

diff --git a/include/wx/time.h b/include/wx/time.h
index 4e4bdf1535997988547f531ab6794210e0fcf22c..101ee45a4a4f41a31f94eddb4e3af322639e88c0 100644 (file)
--- a/include/wx/time.h
+++ b/include/wx/time.h
@@ -21,7 +21,7 @@
 #include "wx/datetime.h"
 #include "wx/date.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "time.h"
 #endif
 

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 115c9c33f716db2483421a1956ff258e0492dc19..2c030fbd07e640dde65ecd53a1c1cb428ccfff72 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TIMER_H_BASE_
 #define _WX_TIMER_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "timerbase.h"
 #endif
 

diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h
index 9b02046705a02d1d4438d0ac59beae835b0c8945..594eb151b4dd4355d441f01ebb3a366ba2cf37fd 100644 (file)
--- a/include/wx/tipdlg.h
+++ b/include/wx/tipdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TIPDLG_H_
 #define _WX_TIPDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "tipdlg.h"
 #endif
 

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index ceab97f7feab0034d67a0787fee53298a2539f0f..be2b8bbc28240a54e917c9dab4966edc9470eca0 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TIPWIN_H_
 #define _WX_TIPWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "tipwin.h"
 #endif
 

diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index e9e11c30df9d5612a65fe73336b90fc3d908a897..2090ba7889ab0c215cbb20eb7c12325ac329f901 100644 (file)
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOKENZRH
 #define _WX_TOKENZRH
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "tokenzr.h"
 #endif
 

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 3b33682aa693c1965588b690abaa288ab2fd78c1..d7a8fddd7af904cf0efa0d47ce447223cc076d98 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -14,14 +14,14 @@
 #ifndef _WX_TOPLEVEL_BASE_H_
 #define _WX_TOPLEVEL_BASE_H_
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "toplevelbase.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma interface "toplevelbase.h"
-#endif
-
 #include "wx/window.h"
 #include "wx/iconbndl.h"
 

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index aac2cab5c6fe5c603e6463cf96a00c7e4e06d20d..1cce85d260f67c4add490d29bdb698da807064cb 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TREEBASE_H_
 #define _WX_TREEBASE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "treebase.h"
 #endif
 

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 9553ce13560626d692016923489163295ea985ec..d7948933f7e3a3d6794d4d54342b1261769f8214 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TXTSTREAM_H_
 #define _WX_TXTSTREAM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "txtstrm.h"
 #endif
 

diff --git a/include/wx/types.h b/include/wx/types.h
index 962783f38785343e31ac36c977518c2bbff41103..bd785f75b57cdd863632f1af3cdb952f6447cfde 100644 (file)
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TYPESH__
 #define _WX_TYPESH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface "types.h"
 #endif
 

diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index 8d094010c6d78b8994081dcf0e6f0aa447d86c76..07a88a50187f426350ba35393701e39907f98672 100644 (file)
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -12,7 +12,7 @@
 #ifndef _MIMETYPE_IMPL_H
 #define _MIMETYPE_IMPL_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "mimetype.h"
 #endif
 

diff --git a/include/wx/url.h b/include/wx/url.h
index f9cfdbdb75b8646ce1f833bbe53c7bb70184a3b3..4caf68165285b2857f79c2af99389dd6934b4485 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -12,8 +12,8 @@
 #ifndef _WX_URL_H
 #define _WX_URL_H
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "url.h"
 #endif
 
 #include "wx/defs.h"

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 3f10fd277f73eeab67c269872adfdf96ee6b2dd7..076d32c6d706f580af6f9a498bfe0139a7a0fa0e 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "utils.h"
 #endif
 

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 6e2e80b20bfe909fc56b102103d7ab56a1cf5588..f80ced14c3f9b2a127bd52bd7d588574250a385b 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VALGENH__
 #define _WX_VALGENH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "valgen.h"
 #endif
 

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 3851adada2853fe0515ab6fee7cdf3be855bc269..f4be5b093d501ee9377c2476de77e6d9b811808b 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VALIDATEH__
 #define _WX_VALIDATEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "validate.h"
 #endif
 

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index c879505abc9e0c2855ff803186d960cba269cf25..cf15da9903600d7fcf9467f9799cd4f3701273d8 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "valtext.h"
 #endif
 

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 4ddfbc10fa986d183e2506d0c0305a26683ead8b..3c47bc497e7bbbcbecd494b449e4a3628d14e7ce 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "variant.h"
 #endif
 

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 902e74bf82b200e0686ef4142d67d192a6d4e508..8b6038d057a1233eb19ded34f1e314720a91d3bb 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -16,7 +16,7 @@
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fsvolume.h"
 #endif
 

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index fedadfae4ad23e92df81805bfc8a10ac5fe65129..3987d3e1dc5a29bfb09f7717b03c2224936e3027 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wfstream.h"
 #endif
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 48c0020e7a615d00cc39b53f9802cb825da787b5..59a9769b1b5fe65d4d3e0ad0b006d380ff0c9c7e 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_BASE_
 #define _WX_WINDOW_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "windowbase.h"
 #endif
 

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index e507b251b4f793f8e8bd709212c756ded7adc9dc..d120ab33d831c9a582c8b155eac99fe0772c6d60 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "wxchar.h"
 #endif
 

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index acad013bcfe1b8694628c6442ff8e06d9d7e40da..8730ce773b54431a28db4b0f2cb71eb6a5bea3f6 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXEXPRH__
 #define _WX_WXEXPRH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wxexpr.h"
 #endif
 

diff --git a/include/wx/wxhtml.h b/include/wx/wxhtml.h
index 90ef6770cf3ed958a9b9e54855ca0a5e1a11f118..f1311201b7ead8e1bc9ea2a5bcb34ea6d10b2842 100644 (file)
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -10,11 +10,10 @@
 #ifndef _WX_HTML_H_
 #define _WX_HTML_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-
 #include "wx/html/htmldefs.h"
 #include "wx/html/htmltag.h"
 #include "wx/html/htmlcell.h"

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 2f9645df51c29855ab444d61cf473c2d7f336f11..99c9895eb5c7e985514f01e5d4b304bfe0900eec 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -10,7 +10,7 @@
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "xpmdecod.h"
 #endif
 

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 4b8b4cf34687e6cb81c84ee361c9347644f90ffe..4f53254dc02cb27931682a628b13d37ae8010e2c 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -9,7 +9,7 @@
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "zipstrm.h"
 #endif
 

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 3cac08f9459c9a67f05952a580201054a7e218ce..fa3d534fe90857276ba801f7ca6194ecfb4ac461 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -11,8 +11,8 @@
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "zstream.h"
 #endif
 
 #include "wx/defs.h"