From edf6a063410b3fa401c913153a64f81d700fbda4 Mon Sep 17 00:00:00 2001
From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sun, 11 May 2003 18:08:58 +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 available updates 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@20586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/x11/app.h      | 2 +-
 include/wx/x11/bitmap.h   | 2 +-
 include/wx/x11/brush.h    | 2 +-
 include/wx/x11/clipbrd.h  | 2 +-
 include/wx/x11/colour.h   | 2 +-
 include/wx/x11/cursor.h   | 2 +-
 include/wx/x11/dataobj.h  | 2 +-
 include/wx/x11/dataobj2.h | 2 +-
 include/wx/x11/dc.h       | 2 +-
 include/wx/x11/dcclient.h | 2 +-
 include/wx/x11/dcmemory.h | 2 +-
 include/wx/x11/dcprint.h  | 2 +-
 include/wx/x11/dcscreen.h | 2 +-
 include/wx/x11/dnd.h      | 2 +-
 include/wx/x11/font.h     | 2 +-
 include/wx/x11/gdiobj.h   | 2 +-
 include/wx/x11/glcanvas.h | 2 +-
 include/wx/x11/icon.h     | 2 +-
 include/wx/x11/joystick.h | 2 +-
 include/wx/x11/minifram.h | 2 +-
 include/wx/x11/palette.h  | 2 +-
 include/wx/x11/pen.h      | 2 +-
 include/wx/x11/popupwin.h | 2 +-
 include/wx/x11/print.h    | 2 +-
 include/wx/x11/region.h   | 2 +-
 include/wx/x11/reparent.h | 2 +-
 include/wx/x11/textctrl.h | 2 +-
 include/wx/x11/toplevel.h | 2 +-
 include/wx/x11/window.h   | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index f61e293a66..80b3eafff0 100644
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/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/x11/bitmap.h b/include/wx/x11/bitmap.h
index 82daf63b50..9438522880 100644
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/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/x11/brush.h b/include/wx/x11/brush.h
index 7544f90877..8e42e3e03b 100644
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/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/x11/clipbrd.h b/include/wx/x11/clipbrd.h
index 1a42d17cb6..7565b1f1e9 100644
--- a/include/wx/x11/clipbrd.h
+++ b/include/wx/x11/clipbrd.h
@@ -11,7 +11,7 @@
 #ifndef __X11CLIPBOARDH__
 #define __X11CLIPBOARDH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 9002149bda..b915ac4022 100644
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/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/x11/cursor.h b/include/wx/x11/cursor.h
index 65fe7721a7..e259aa1773 100644
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/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/x11/dataobj.h b/include/wx/x11/dataobj.h
index 6dc89e60e4..b4cf0cb3b4 100644
--- a/include/wx/x11/dataobj.h
+++ b/include/wx/x11/dataobj.h
@@ -10,7 +10,7 @@
 #ifndef _WX_X11_DATAOBJ_H_
 #define _WX_X11_DATAOBJ_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dataobj.h"
 #endif
 
diff --git a/include/wx/x11/dataobj2.h b/include/wx/x11/dataobj2.h
index 21b98e717d..670b82641d 100644
--- a/include/wx/x11/dataobj2.h
+++ b/include/wx/x11/dataobj2.h
@@ -11,7 +11,7 @@
 #ifndef _WX_X11_DATAOBJ2_H_
 #define _WX_X11_DATAOBJ2_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dataobj.h"
 #endif
 
diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h
index f4e58fb5d9..c75ef56522 100644
--- a/include/wx/x11/dc.h
+++ b/include/wx/x11/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/x11/dcclient.h b/include/wx/x11/dcclient.h
index f2a16a37fe..cf2c5c8c5f 100644
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/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/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 0e49834acf..aec644d440 100644
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/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/x11/dcprint.h b/include/wx/x11/dcprint.h
index 2454826e8e..466a0f8d95 100644
--- a/include/wx/x11/dcprint.h
+++ b/include/wx/x11/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/x11/dcscreen.h b/include/wx/x11/dcscreen.h
index c1f9751d4a..67fd3d6df2 100644
--- a/include/wx/x11/dcscreen.h
+++ b/include/wx/x11/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/x11/dnd.h b/include/wx/x11/dnd.h
index fa392bd9d8..86701b9f7b 100644
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -11,7 +11,7 @@
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index a0850cd38f..05db8914e7 100644
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/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/x11/gdiobj.h b/include/wx/x11/gdiobj.h
index f55c95cec7..b532e20fd0 100644
--- a/include/wx/x11/gdiobj.h
+++ b/include/wx/x11/gdiobj.h
@@ -14,7 +14,7 @@
 
 #include "wx/object.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "gdiobj.h"
 #endif
 
diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 1932fef522..a99d009046 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -10,7 +10,7 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "glcanvas.h"
 #endif
 
diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
index 6ffa9e7903..1f3314b6bd 100644
--- a/include/wx/x11/icon.h
+++ b/include/wx/x11/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/x11/joystick.h b/include/wx/x11/joystick.h
index 7148fcd4c9..cf3b0313a2 100644
--- a/include/wx/x11/joystick.h
+++ b/include/wx/x11/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/x11/minifram.h b/include/wx/x11/minifram.h
index cbe4f63269..b7d4f89fa6 100644
--- a/include/wx/x11/minifram.h
+++ b/include/wx/x11/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/x11/palette.h b/include/wx/x11/palette.h
index 3cbf67020d..5611a697b1 100644
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/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/x11/pen.h b/include/wx/x11/pen.h
index 3f83b5ab43..79b8c0b683 100644
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/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/x11/popupwin.h b/include/wx/x11/popupwin.h
index 3fd5ddde05..19c01e248b 100644
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -11,7 +11,7 @@
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "popupwin.h"
 #endif
 
diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h
index 0576e30923..17417a4092 100644
--- a/include/wx/x11/print.h
+++ b/include/wx/x11/print.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PRINT_H_
 #define _WX_PRINT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "print.h"
 #endif
 
diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index cfbfe80e2d..ca7e628dce 100644
--- a/include/wx/x11/region.h
+++ b/include/wx/x11/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/x11/reparent.h b/include/wx/x11/reparent.h
index 37f358edfa..055e0456a8 100644
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REPARENT_H_
 #define _WX_REPARENT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "reparent.h"
 #endif
 
diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 61d313a51e..87fdd5b393 100644
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -11,7 +11,7 @@
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textctrl.h"
 #endif
 
diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 013d3a2909..e94060f208 100644
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -12,7 +12,7 @@
 #ifndef _WX_X11_TOPLEVEL_H_
 #define _WX_X11_TOPLEVEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "toplevel.h"
 #endif
 
diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index f6c76873d3..16ca8b298e 100644
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/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
 
-- 
2.45.2