From af49c4b8a2d3553e733e71c7dd3911881f4c1a2a Mon Sep 17 00:00:00 2001
From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sat, 31 Aug 2002 11:29:13 +0000
Subject: [PATCH] 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
---
 include/wx/app.h               | 4 ++--
 include/wx/artprov.h           | 2 +-
 include/wx/bitmap.h            | 2 +-
 include/wx/busyinfo.h          | 4 ++--
 include/wx/caret.h             | 2 +-
 include/wx/choice.h            | 2 +-
 include/wx/clipbrd.h           | 2 +-
 include/wx/clntdata.h          | 2 +-
 include/wx/cmdline.h           | 2 +-
 include/wx/cmdproc.h           | 2 +-
 include/wx/cmndata.h           | 2 +-
 include/wx/confbase.h          | 2 +-
 include/wx/containr.h          | 2 +-
 include/wx/control.h           | 2 +-
 include/wx/cshelp.h            | 2 +-
 include/wx/ctrlsub.h           | 2 +-
 include/wx/dataobj.h           | 2 +-
 include/wx/date.h              | 2 +-
 include/wx/datetime.h          | 2 +-
 include/wx/datstrm.h           | 2 +-
 include/wx/db.h                | 2 +-
 include/wx/dbgrid.h            | 2 +-
 include/wx/dbtable.h           | 2 +-
 include/wx/dc.h                | 2 +-
 include/wx/dcbuffer.h          | 2 +-
 include/wx/defs.h              | 2 +-
 include/wx/dialog.h            | 2 +-
 include/wx/dialup.h            | 2 +-
 include/wx/dir.h               | 2 +-
 include/wx/display.h           | 2 +-
 include/wx/dnd.h               | 2 +-
 include/wx/docmdi.h            | 2 +-
 include/wx/docview.h           | 2 +-
 include/wx/dynarray.h          | 2 +-
 include/wx/dynlib.h            | 4 ++--
 include/wx/dynload.h           | 2 +-
 include/wx/effects.h           | 2 +-
 include/wx/encconv.h           | 2 +-
 include/wx/event.h             | 2 +-
 include/wx/evtloop.h           | 2 +-
 include/wx/fdrepdlg.h          | 2 +-
 include/wx/ffile.h             | 2 +-
 include/wx/file.h              | 2 +-
 include/wx/fileconf.h          | 2 +-
 include/wx/filefn.h            | 2 +-
 include/wx/filename.h          | 2 +-
 include/wx/filesys.h           | 4 ++--
 include/wx/font.h              | 2 +-
 include/wx/fontenum.h          | 2 +-
 include/wx/fontmap.h           | 2 +-
 include/wx/fontutil.h          | 2 +-
 include/wx/frame.h             | 2 +-
 include/wx/fs_inet.h           | 2 +-
 include/wx/fs_mem.h            | 2 +-
 include/wx/fs_zip.h            | 2 +-
 include/wx/gauge.h             | 4 ++--
 include/wx/gdicmn.h            | 2 +-
 include/wx/generic/accel.h     | 2 +-
 include/wx/generic/calctrl.h   | 2 +-
 include/wx/generic/caret.h     | 2 +-
 include/wx/generic/choicdgg.h  | 2 +-
 include/wx/generic/colrdlgg.h  | 2 +-
 include/wx/generic/dcpsg.h     | 2 +-
 include/wx/generic/dirctrlg.h  | 2 +-
 include/wx/generic/dirdlgg.h   | 2 +-
 include/wx/generic/dragimgg.h  | 2 +-
 include/wx/generic/fdrepdlg.h  | 2 +-
 include/wx/generic/filedlgg.h  | 2 +-
 include/wx/generic/fontdlgg.h  | 2 +-
 include/wx/generic/grid.h      | 2 +-
 include/wx/generic/gridctrl.h  | 2 +-
 include/wx/generic/gridg.h     | 2 +-
 include/wx/generic/gridsel.h   | 2 +-
 include/wx/generic/helpext.h   | 2 +-
 include/wx/generic/helphtml.h  | 2 +-
 include/wx/generic/imaglist.h  | 2 +-
 include/wx/generic/laywin.h    | 2 +-
 include/wx/generic/listctrl.h  | 2 +-
 include/wx/generic/mdig.h      | 2 +-
 include/wx/generic/msgdlgg.h   | 2 +-
 include/wx/generic/notebook.h  | 2 +-
 include/wx/generic/paletteg.h  | 2 +-
 include/wx/generic/panelg.h    | 2 +-
 include/wx/generic/printps.h   | 2 +-
 include/wx/generic/prntdlgg.h  | 2 +-
 include/wx/generic/progdlgg.h  | 2 +-
 include/wx/generic/sashwin.h   | 2 +-
 include/wx/generic/scrolwin.h  | 2 +-
 include/wx/generic/spinctlg.h  | 2 +-
 include/wx/generic/splash.h    | 2 +-
 include/wx/generic/splitter.h  | 2 +-
 include/wx/generic/statline.h  | 4 ++--
 include/wx/generic/statusbr.h  | 2 +-
 include/wx/generic/tabg.h      | 2 +-
 include/wx/generic/textdlgg.h  | 2 +-
 include/wx/generic/timer.h     | 2 +-
 include/wx/generic/treectlg.h  | 2 +-
 include/wx/generic/treelay.h   | 2 +-
 include/wx/generic/wizard.h    | 2 +-
 include/wx/geometry.h          | 2 +-
 include/wx/gifdecod.h          | 2 +-
 include/wx/hash.h              | 2 +-
 include/wx/hashmap.h           | 2 +-
 include/wx/helpbase.h          | 2 +-
 include/wx/html/helpctrl.h     | 2 +-
 include/wx/html/helpdata.h     | 2 +-
 include/wx/html/helpfrm.h      | 2 +-
 include/wx/html/htmlcell.h     | 2 +-
 include/wx/html/htmlfilt.h     | 2 +-
 include/wx/html/htmlpars.h     | 2 +-
 include/wx/html/htmlproc.h     | 2 +-
 include/wx/html/htmltag.h      | 2 +-
 include/wx/html/htmlwin.h      | 2 +-
 include/wx/html/htmprint.h     | 2 +-
 include/wx/html/winpars.h      | 2 +-
 include/wx/iconbndl.h          | 2 +-
 include/wx/imagbmp.h           | 2 +-
 include/wx/image.h             | 2 +-
 include/wx/imaggif.h           | 2 +-
 include/wx/imagiff.h           | 2 +-
 include/wx/imagjpeg.h          | 2 +-
 include/wx/imagpcx.h           | 2 +-
 include/wx/imagpng.h           | 2 +-
 include/wx/imagpnm.h           | 2 +-
 include/wx/imagtiff.h          | 2 +-
 include/wx/imagxpm.h           | 2 +-
 include/wx/intl.h              | 2 +-
 include/wx/ipcbase.h           | 2 +-
 include/wx/layout.h            | 2 +-
 include/wx/list.h              | 2 +-
 include/wx/listbase.h          | 2 +-
 include/wx/listbox.h           | 2 +-
 include/wx/listctrl.h          | 2 +-
 include/wx/log.h               | 2 +-
 include/wx/longlong.h          | 2 +-
 include/wx/mac/accel.h         | 2 +-
 include/wx/mac/app.h           | 2 +-
 include/wx/mac/bitmap.h        | 2 +-
 include/wx/mac/bmpbuttn.h      | 2 +-
 include/wx/mac/brush.h         | 2 +-
 include/wx/mac/button.h        | 2 +-
 include/wx/mac/checkbox.h      | 2 +-
 include/wx/mac/checklst.h      | 2 +-
 include/wx/mac/choice.h        | 2 +-
 include/wx/mac/clipbrd.h       | 2 +-
 include/wx/mac/colordlg.h      | 2 +-
 include/wx/mac/colour.h        | 2 +-
 include/wx/mac/combobox.h      | 2 +-
 include/wx/mac/control.h       | 2 +-
 include/wx/mac/cursor.h        | 2 +-
 include/wx/mac/dataobj.h       | 2 +-
 include/wx/mac/dataobj2.h      | 2 +-
 include/wx/mac/dc.h            | 2 +-
 include/wx/mac/dcclient.h      | 2 +-
 include/wx/mac/dcmemory.h      | 2 +-
 include/wx/mac/dcprint.h       | 2 +-
 include/wx/mac/dcscreen.h      | 2 +-
 include/wx/mac/dialog.h        | 2 +-
 include/wx/mac/dirdlg.h        | 2 +-
 include/wx/mac/dnd.h           | 2 +-
 include/wx/mac/filedlg.h       | 2 +-
 include/wx/mac/font.h          | 2 +-
 include/wx/mac/fontdlg.h       | 2 +-
 include/wx/mac/frame.h         | 2 +-
 include/wx/mac/gauge.h         | 2 +-
 include/wx/mac/gdiobj.h        | 6 +++---
 include/wx/mac/glcanvas.h      | 2 +-
 include/wx/mac/helpxxxx.h      | 2 +-
 include/wx/mac/icon.h          | 2 +-
 include/wx/mac/imaglist.h      | 2 +-
 include/wx/mac/joystick.h      | 2 +-
 include/wx/mac/listbox.h       | 2 +-
 include/wx/mac/listctrl.h      | 2 +-
 include/wx/mac/mdi.h           | 2 +-
 include/wx/mac/menu.h          | 2 +-
 include/wx/mac/menuitem.h      | 2 +-
 include/wx/mac/mimetype.h      | 6 +++---
 include/wx/mac/minifram.h      | 2 +-
 include/wx/mac/msgdlg.h        | 2 +-
 include/wx/mac/notebook.h      | 2 +-
 include/wx/mac/palette.h       | 2 +-
 include/wx/mac/pen.h           | 2 +-
 include/wx/mac/pnghand.h       | 2 +-
 include/wx/mac/pngread.h       | 2 +-
 include/wx/mac/printdlg.h      | 2 +-
 include/wx/mac/printmac.h      | 2 +-
 include/wx/mac/radiobox.h      | 2 +-
 include/wx/mac/radiobut.h      | 2 +-
 include/wx/mac/region.h        | 2 +-
 include/wx/mac/scrolbar.h      | 2 +-
 include/wx/mac/slider.h        | 2 +-
 include/wx/mac/spinbutt.h      | 2 +-
 include/wx/mac/spinctrl.h      | 2 +-
 include/wx/mac/statbmp.h       | 2 +-
 include/wx/mac/statbox.h       | 2 +-
 include/wx/mac/statline.h      | 4 ++--
 include/wx/mac/stattext.h      | 2 +-
 include/wx/mac/statusbr.h      | 2 +-
 include/wx/mac/tabctrl.h       | 2 +-
 include/wx/mac/taskbar.h       | 2 +-
 include/wx/mac/textctrl.h      | 2 +-
 include/wx/mac/timer.h         | 2 +-
 include/wx/mac/toolbar.h       | 2 +-
 include/wx/mac/toplevel.h      | 2 +-
 include/wx/mac/treectrl.h      | 2 +-
 include/wx/mac/wave.h          | 2 +-
 include/wx/mac/window.h        | 2 +-
 include/wx/matrix.h            | 2 +-
 include/wx/memory.h            | 2 +-
 include/wx/menu.h              | 2 +-
 include/wx/mgl/bitmap.h        | 2 +-
 include/wx/mimetype.h          | 2 +-
 include/wx/module.h            | 2 +-
 include/wx/msgout.h            | 2 +-
 include/wx/notebook.h          | 2 +-
 include/wx/object.h            | 2 +-
 include/wx/odbc.h              | 2 +-
 include/wx/paper.h             | 2 +-
 include/wx/popupwin.h          | 2 +-
 include/wx/prntbase.h          | 2 +-
 include/wx/process.h           | 2 +-
 include/wx/prop.h              | 2 +-
 include/wx/propform.h          | 2 +-
 include/wx/proplist.h          | 2 +-
 include/wx/protocol/file.h     | 2 +-
 include/wx/protocol/ftp.h      | 2 +-
 include/wx/protocol/protocol.h | 2 +-
 include/wx/quantize.h          | 2 +-
 include/wx/radiobox.h          | 2 +-
 include/wx/regex.h             | 2 +-
 include/wx/resource.h          | 2 +-
 include/wx/sckaddr.h           | 4 ++--
 include/wx/sckipc.h            | 2 +-
 include/wx/sckstrm.h           | 2 +-
 include/wx/sizer.h             | 2 +-
 include/wx/snglinst.h          | 2 +-
 include/wx/socket.h            | 2 +-
 include/wx/spawnbrowser.h      | 2 +-
 include/wx/statbmp.h           | 2 +-
 include/wx/statusbr.h          | 2 +-
 include/wx/strconv.h           | 2 +-
 include/wx/stream.h            | 4 ++--
 include/wx/string.h            | 2 +-
 include/wx/tbarbase.h          | 2 +-
 include/wx/tbarsmpl.h          | 2 +-
 include/wx/textbuf.h           | 2 +-
 include/wx/textctrl.h          | 2 +-
 include/wx/textfile.h          | 2 +-
 include/wx/thread.h            | 2 +-
 include/wx/time.h              | 2 +-
 include/wx/timer.h             | 2 +-
 include/wx/tipdlg.h            | 2 +-
 include/wx/tipwin.h            | 2 +-
 include/wx/tokenzr.h           | 2 +-
 include/wx/toplevel.h          | 8 ++++----
 include/wx/treebase.h          | 2 +-
 include/wx/txtstrm.h           | 2 +-
 include/wx/types.h             | 2 +-
 include/wx/unix/mimetype.h     | 2 +-
 include/wx/url.h               | 4 ++--
 include/wx/utils.h             | 2 +-
 include/wx/valgen.h            | 2 +-
 include/wx/validate.h          | 2 +-
 include/wx/valtext.h           | 2 +-
 include/wx/variant.h           | 2 +-
 include/wx/volume.h            | 2 +-
 include/wx/wfstream.h          | 2 +-
 include/wx/window.h            | 2 +-
 include/wx/wxchar.h            | 2 +-
 include/wx/wxexpr.h            | 2 +-
 include/wx/wxhtml.h            | 3 +--
 include/wx/xpmdecod.h          | 2 +-
 include/wx/zipstrm.h           | 2 +-
 include/wx/zstream.h           | 4 ++--
 274 files changed, 292 insertions(+), 293 deletions(-)

diff --git a/include/wx/app.h b/include/wx/app.h
index 424420c731..29813a1978 100644
--- 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 d9a312e096..3bba43e060 100644
--- 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 1783afe29d..cd701f737a 100644
--- 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 0050bfa08a..b5a94ba6de 100644
--- 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 f7d91c76f8..d1dba59761 100644
--- 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 6664996a0b..a5fdf70f11 100644
--- 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 69c06bdce4..f0a58a62ac 100644
--- 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 1b0f1792aa..d6b7800d45 100644
--- 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 01e4ffc269..bc8c893654 100644
--- 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 3b09e400bd..91ed5ee234 100644
--- 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 61f5a204bd..d1aed4df34 100644
--- 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 b2a576c858..73c5e6a968 100644
--- 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 d6df418e25..234161da03 100644
--- 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 24338b06b5..afbabb3ad7 100644
--- 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 d72a3d9254..89caf0084e 100644
--- 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 1db128f7bc..0b98232f3d 100644
--- 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 e367c29194..d87edeaff7 100644
--- 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 b3b8dd9779..e117922511 100644
--- 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 017c226b89..654041d61c 100644
--- 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 23630e63e2..0551b437cc 100644
--- 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 cebf1e4579..e43e77db95 100644
--- 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 8919c86c64..af4145e7b5 100644
--- 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 d228f64a6d..a005b30afc 100644
--- 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 c414a9fdbe..11e282d8af 100644
--- 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 1f0c5a924f..51682aad1a 100644
--- 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 7d8651fea3..cf9dd6d064 100644
--- 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 7146986a5e..c883f1cc21 100644
--- 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 0c0614de4e..fdd9d55fd8 100644
--- 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 9c652c91ac..53d2214740 100644
--- 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 e62be18768..fc020fee47 100644
--- 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 7ce567f726..9f62351647 100644
--- 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 f4922834d8..37b2109475 100644
--- 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 9ffe954246..93e968d334 100644
--- 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 97e2517480..f3dfbd09d3 100644
--- 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 a3c4f2d98b..6dd60bf12f 100644
--- 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 8aaa926807..11462250d6 100644
--- 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 449064e139..09db9151a1 100644
--- 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 84d2677175..013b9d76bf 100644
--- 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 4a4bb50f76..223502421d 100644
--- 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 4ff934f8a7..80f0916e85 100644
--- 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 9b83c0584f..aa3965ff6b 100644
--- 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 aee7d99257..e8c4e3a72d 100644
--- 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 850bb99ded..73778df34d 100644
--- 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 f67f290dfb..f96d602b8a 100644
--- 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 57260c5fe3..45e3648086 100644
--- 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 64a48aa5ed..491e7deecc 100644
--- 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 06ca7ca97c..b8e5da0927 100644
--- 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 7ca50d5dbb..c627010124 100644
--- 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 9c56ec51cd..587dad4a66 100644
--- 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 53edf7f17c..eb4c48ea7d 100644
--- 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 26369c39d2..90ec00dc1c 100644
--- 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 bb19f5a4da..2af6cd1d8d 100644
--- 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 61f4e5d056..16ef297579 100644
--- 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 03fa523eee..0d70b7be9e 100644
--- 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 960a1fd1a5..cfc1a99525 100644
--- 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 5f2634a606..3e69e5bd40 100644
--- 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 185d5e52e2..9f206f30fc 100644
--- 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 2067e0fd23..4ba1dc4300 100644
--- 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 ddd08810ae..63f98225f8 100644
--- 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 73dcaa4639..1fdd096d4e 100644
--- 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 c1f264b3bb..683092a3ee 100644
--- 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 e246d07966..ebf0a901f9 100644
--- 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 e35809d16c..b17f6b6ae4 100644
--- 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 ec2b098c29..f0456997a9 100644
--- 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 cf0ae90d94..190b90e715 100644
--- 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 64fef65b2a..0a907fdfac 100644
--- 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 7cb5e2f829..1db7e96d7e 100644
--- 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 83b4d2da97..f085322411 100644
--- 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 f0075ba7ea..fdbd69163e 100644
--- 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 12f1db02dd..1f8e085874 100644
--- 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 5a852c6bd5..eedc77cc45 100644
--- 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 1fa85c62bd..86bbb6cd68 100644
--- 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 c44819a419..6567e38bfa 100644
--- 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 0b8c1dfccf..ac1284f370 100644
--- 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 2386ee1c28..ca99146693 100644
--- 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 337d045258..be21d3dcfa 100644
--- 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 7f8b13cb39..7a4908efdc 100644
--- 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 c6c02d9802..b29dd9b516 100644
--- 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 b39318a659..2a5ab74f22 100644
--- 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 471c7d0521..864bffd367 100644
--- 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 b1d9660346..e322e94309 100644
--- 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 9e63395c3d..0799841995 100644
--- 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 526efda1a7..b7f14c0af2 100644
--- 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 45564cc70d..0921b4b85f 100644
--- 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 40781a3941..4cd5d9dadd 100644
--- 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 e88b639386..08411b619f 100644
--- 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 2e90124cc7..f21b76c8a3 100644
--- 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 ce9c0e75de..1d3a4d3404 100644
--- 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 c442db8e9b..1175f102d0 100644
--- 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 dc5c195930..2bc789fad8 100644
--- 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 beaba72ac5..2ea74a49d0 100644
--- 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 67efb49f6c..32ec10dee6 100644
--- 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 b0d27f3ca9..9145f7dbaf 100644
--- 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 c78b18a470..b71a4e902b 100644
--- 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 f68bd873af..74fa8fa12e 100644
--- 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 3c381771a7..7e80d8c754 100644
--- 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 11a1574e20..b5e4c2f549 100644
--- 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 875b4a0129..4bcc4baf0f 100644
--- 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 99c2710a25..68362e06ec 100644
--- 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 0c61a813ba..c332ec0d5b 100644
--- 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 e40152cfa1..13a3a7b5a8 100644
--- 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 a42138a438..9340538569 100644
--- 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 801a036140..9b635e8a07 100644
--- 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 0fd1148aa3..9ac23f2e9f 100644
--- 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 cd1efd1aee..f5f285d8b7 100644
--- 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 0780cac6b0..72612cf2b1 100644
--- 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 835a7b9100..11a5e82961 100644
--- 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 59b6f265a8..e2760ab1f8 100644
--- 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 975461d50a..57c5b47187 100644
--- 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 a7f067b5a1..ea6a99bc5c 100644
--- 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 4706915148..59cb01ed94 100644
--- 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 758e1d3a0e..0dc91747ed 100644
--- 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 d31dd8b880..14ed7b410b 100644
--- 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 a68eb03f2f..38575d5b5a 100644
--- 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 4ce8afd0f7..5e6866d069 100644
--- 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 e70715ff7a..8f04625360 100644
--- 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 0ba6c31e9f..7ddbd1c3f5 100644
--- 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 7718cacdeb..6d025c286b 100644
--- 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 f0cffd7fca..1eaba1b62e 100644
--- 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 df340cd7b0..076cc115a9 100644
--- 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 999bc889cb..ff76239224 100644
--- 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 1533483fff..f6e5908472 100644
--- 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 87ff7f124b..232e880403 100644
--- 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 8af0200a29..21f2896b57 100644
--- 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 e6f80b3eba..5d539336a8 100644
--- 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 2b64bfb8bb..658fa3d622 100644
--- 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 879f26be45..d73b1dcbcf 100644
--- 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 6d3e80562c..819c6f50cf 100644
--- 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 0fcd64ecd8..ebfff6e669 100644
--- 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 1fd7c4808e..886c744618 100644
--- 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 6659ab67d6..a1d85937ff 100644
--- 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 23f3100c53..3624531b20 100644
--- 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 7914d43ca4..a89000e868 100644
--- 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 44266ab80e..2de7fe1e4b 100644
--- 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 80272649a4..a4eb5f547d 100644
--- 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 c187c68fa3..da205da2c8 100644
--- 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 b62312527b..7b475d5bb2 100644
--- 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 1b0873f0af..dae1493b87 100644
--- 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 f117362ec9..d588017989 100644
--- 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 af030c9dbe..b03a6b332e 100644
--- 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 12faee340c..2279d82316 100644
--- 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 3ca0a6f415..5f7db2068f 100644
--- 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 0f514889b0..ef452a1c21 100644
--- 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 f9d790df06..a122f95f37 100644
--- 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 62fe3e51c4..17b7367b30 100644
--- 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 556c2f316e..e12da2d92f 100644
--- 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 02383e7ff2..857eb6143c 100644
--- 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 2f9d8e2f5c..4b10550e60 100644
--- 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 417d5d5bb0..c97686d258 100644
--- 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 7609aca59f..fc610f9564 100644
--- 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 e08abc2bd8..3c1e8de47b 100644
--- 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 a936e226e9..744aa141ae 100644
--- 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 e48f2b7dee..679130d65b 100644
--- 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 c2a118c6a1..c7078fe77e 100644
--- 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 ab38f69f9c..c72e4017b7 100644
--- 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 fa2c71273b..cc581688d3 100644
--- 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 e04b450f69..fcd6cf7eee 100644
--- 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 2ba611bf9a..fc58b6f03a 100644
--- 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 fe343b9165..13498f42e7 100644
--- 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 252d237614..e77bb0025a 100644
--- 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 c0b724ecbb..a013f9d8de 100644
--- 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 09d7797a06..b14155a75b 100644
--- 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 99fdbcb93f..f21d96a7da 100644
--- 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 95ddac84d1..6434553ebe 100644
--- 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 b28a199614..d204ddc15d 100644
--- 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 3a90093725..0e1893f462 100644
--- 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 5231ed7196..a5465fcc5b 100644
--- 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 d53c28b7e4..20a596d8ae 100644
--- 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 e1aa18fea5..c95b89aee2 100644
--- 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 8f305419fe..13b7be60fa 100644
--- 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 30324fc035..601b32f6bb 100644
--- 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 e35fb87b2f..8158bf6731 100644
--- 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 6dfc25df98..b38b7973dd 100644
--- 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 091021d0fc..3886829522 100644
--- 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 63a2598097..4c79dbf2aa 100644
--- 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 1557980892..4594525961 100644
--- 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 b1af2186fc..475267c7ba 100644
--- 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 2e9daeed86..08e145ba32 100644
--- 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 2a237648df..30a8d7e4cc 100644
--- 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 516b9d29e9..e461360b9f 100644
--- 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 8894340703..420e0f16fc 100644
--- 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 5a36f8aeac..f13fcdfdac 100644
--- 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 6d4fbfe41e..426b0c4483 100644
--- 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 2a9307ba9b..8aa50a09d4 100644
--- 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 1c6eb915cb..d17e9599bb 100644
--- 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 243ed2fefe..6e155b9470 100644
--- 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 21910dc6f9..5e0f3644e0 100644
--- 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 752fa59b46..e418d3f495 100644
--- 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 d9fc31f073..019c9a4365 100644
--- 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 1ae57c18d1..61c7f5b139 100644
--- 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 93839af765..5a3c76f86a 100644
--- 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 f5b1206a19..80e67b942c 100644
--- 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 75ef209fc0..76f0dc3412 100755
--- 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 f2cbc70730..04b36469bf 100644
--- 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 a70d8e11c6..0f25961c37 100644
--- 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 51eda50002..4651d04557 100644
--- 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 787eaf29ed..8884f70452 100644
--- 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 0f11fb91ef..232390ab21 100644
--- 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 80740019b4..96aae83068 100644
--- 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 dd17b4930b..a37d0702b7 100644
--- 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 7992658552..1d9b218333 100644
--- 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 a050d3a1c3..397edf7485 100644
--- 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 2c24882618..caef6bccd2 100644
--- 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 5c3672f37a..f5da13f870 100644
--- 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 cb307ec0e9..d4b3ad029e 100644
--- 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 6f9f959b81..c203db629f 100644
--- 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 96f1c62b24..a3a31e301d 100644
--- 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 e329c01f24..c5a7d41a66 100644
--- 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 eebfc3890c..e69b1b03bc 100644
--- 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 181781b0a5..ccdac72ffa 100644
--- 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 e204c1425a..51400743f6 100644
--- 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 773d4a7672..87c55befac 100644
--- 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 0c50363a6d..aeee79b942 100644
--- 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 9b9e020fe2..7a43ada630 100755
--- 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 be8ba1d89f..a7583c5857 100644
--- 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 8a5f1bb96e..4fcb3c178c 100644
--- 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 d55fe5a14b..c75a316369 100644
--- 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 f81b155079..322e7e002f 100644
--- 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 b4558ee4d4..185d8c7f65 100644
--- 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 701964170c..688a957481 100644
--- 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 c5136d203a..e488f264d2 100644
--- 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 9207cb2d93..6ddf2f3b5f 100644
--- 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 426bd05a52..723fc50333 100644
--- 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 5fdf1bdcce..b21f36aa09 100644
--- 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 49f5182b1d..3b2d3470e0 100644
--- 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 ae7391d45e..c3631a4278 100644
--- 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 a98c0527db..d17e4dd637 100644
--- 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 fac092df9a..bb935dbcd7 100644
--- 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 caa8fbbe91..81ac1737bf 100644
--- 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 946d106cb2..812405852f 100644
--- 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 d4e0463f0d..37c4e86456 100644
--- 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 ab0f989e81..5cdc79252c 100644
--- 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 47f506184f..50e4c18494 100644
--- 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 6ef70e4e91..d649b74793 100644
--- 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 cd92e216b7..3857f28d25 100644
--- 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 2bcce17a82..b940f3dd12 100644
--- 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 b8ebcb846b..605e15c5b6 100644
--- 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 94fa83bd66..2805d2ba6e 100644
--- 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 9f90791f5b..d007045208 100644
--- 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 103e8479f7..adafc8bfce 100644
--- 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 ba1e84d579..60aef2c1dd 100644
--- 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 d035bde1cf..488d1905dc 100644
--- 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 087a46e225..1c6dbc1f0b 100644
--- 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 dfa4dcb40d..c96bef2acf 100644
--- 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 b6b5d229e7..3dbeac1ae7 100644
--- 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 ad6081eec3..c7087c669a 100644
--- 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 56646fa242..61240469af 100644
--- 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 01fe351f28..b66afc76c4 100644
--- 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 6c126b9fbd..8652d6cbf8 100644
--- 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 4e4bdf1535..101ee45a4a 100644
--- 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 115c9c33f7..2c030fbd07 100644
--- 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 9b02046705..594eb151b4 100644
--- 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 ceab97f7fe..be2b8bbc28 100644
--- 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 e9e11c30df..2090ba7889 100644
--- 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 3b33682aa6..d7a8fddd7a 100644
--- 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 aac2cab5c6..1cce85d260 100644
--- 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 9553ce1356..d7948933f7 100644
--- 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 962783f387..bd785f75b5 100644
--- 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 8d094010c6..07a88a5018 100644
--- 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 f9cfdbdb75..4caf681652 100644
--- 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 3f10fd277f..076d32c6d7 100644
--- 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 6e2e80b20b..f80ced14c3 100644
--- 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 3851adada2..f4be5b093d 100644
--- 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 c879505abc..cf15da9903 100644
--- 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 4ddfbc10fa..3c47bc497e 100644
--- 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 902e74bf82..8b6038d057 100644
--- 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 fedadfae4a..3987d3e1dc 100644
--- 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 48c0020e7a..59a9769b1b 100644
--- 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 e507b251b4..d120ab33d8 100644
--- 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 acad013bcf..8730ce773b 100644
--- 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 90ef6770cf..f1311201b7 100644
--- 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 2f9645df51..99c9895eb5 100644
--- 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 4b8b4cf346..4f53254dc0 100644
--- 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 3cac08f945..fa3d534fe9 100644
--- 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"