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@16895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/artprov/artbrows.h b/samples/artprov/artbrows.h
index 2494a6ea3410dd9b2fcb68c374c52964c4167f76..40bca1ec81e0ce0bafb568c5cde3e34025120f5a 100644 (file)
--- a/samples/artprov/artbrows.h
+++ b/samples/artprov/artbrows.h
@@ -12,7 +12,7 @@
 #ifndef __ARTBROWS_H__
 #define __ARTBROWS_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "artbrows.h"
 #endif
 

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index b16e1b0c906ba866d34d2f9b718bd26b4ac16fb9..1d66e3925381593e456ad517667eb17bd16180bc 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "calendar.cpp"
     #pragma interface "calendar.cpp"
 #endif
@@ -32,6 +32,7 @@
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/panel.h"
     #include "wx/stattext.h"

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index c3c0b3796adcfcdcb89f77119f4b93b117d5e53c..9059c501b352cc3122b2ffe310be583e839e5933 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "drawing.cpp"
     #pragma interface "drawing.cpp"
 #endif

diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index 6eaf7eb1484c463e2793c3632734beff71ad8e09..308b391f82be748e4272851bbadfb77d3742e3a1 100644 (file)
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation "dynamic.cpp"
 #pragma interface "dynamic.cpp"
 #endif

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 8a708f79edd53fd102e35c06134e694a851e2659..1eeba32d3a86df284daa8c8cd49b816c830be19f 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "erase.cpp"
     #pragma interface "erase.cpp"
 #endif

diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index 380cdd17bd1c995463f5f78815a0b6a684977cf2..beeaad030d2b0570d96f33d7165982e19620da97 100644 (file)
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     // DO NOT use event.cpp here, it breaks statics initialization in
     // src/common/event.cpp and nothing works at all then!
     #pragma implementation "eventsample.cpp"

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 43858fa326dd5c993ead90fdf0386eb239dbcafd..30bed13776ad02a6eb1fd10764717740e5ca726c 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "exec.cpp"
     #pragma interface "exec.cpp"
 #endif
@@ -33,6 +33,7 @@
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/panel.h"
 

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index 7b6aec192e408eef9ecb067152e0af2ee81f123b..67b2bc01536e0f100db9c93377d9c4566d169214 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 1c344c68f8057c8857e48d943bdc7ecc46216b07..fb4609a90ec99c0b5effa0813d13f244f857f0bf 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -1,10 +1,9 @@
-
 /////////////////////////////////////////////////////////////////////////////
 // Name:        test.cpp
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "help.cpp"
     #pragma interface "help.cpp"
 #endif

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 71914be05a0e6b1fe762f5dfba7cf82e861613fc..1b07b468230e905b22b4c3ba9e6bdae914d8ad80 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -6,7 +6,7 @@
 // standalone help browser.
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation "help.cpp"
 #pragma interface "help.cpp"
 #endif

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 4519cfe8989c9de3c0d7b61c5fc9a5a1b00f2daa..9d1f1d98d996826ed07833e9f9f2ffd6587d48d8 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index 86e9fcb9b4a01f452961094f1b6963082d1cfbc6..f21e4d5b0fd34eab40dc9c4fdedfb6f249530e67 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -4,7 +4,7 @@
 //              demonstrates virtual file systems feature
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 1c8db4fa065ff50ffb9c7b2af8e0eae43b339832..d0849a04ceec501744dd7415686c2b382f0e6ddf 100644 (file)
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -4,7 +4,7 @@
 //              demonstrates virtual file systems feature
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 8152667459542f60fd692203f1e4734ed2891ad8..3eb2d0daa4d7344c7203ca81991ffaa922693981 100644 (file)
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index c7fc1feb08cfbb844149acf0a1b4432b05bf94e6..d009e1cbf8da2ee59814f8277f8d621f3764f9d5 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation
 #pragma interface
 #endif

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 02bf45444a8cda4a5a95715f764ec53719b1c766..2172b9472cf8d809b6008a551116d7e211d83654 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation
 #pragma interface
 #endif

diff --git a/samples/png/pngdemo.h b/samples/png/pngdemo.h
index c664e1a14566298347f030f97922674460260256..5653a14074a70c9403cedd6337844f16b22997d8 100644 (file)
--- a/samples/png/pngdemo.h
+++ b/samples/png/pngdemo.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined( __GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index 13933bb91fa72c9ea2640df743ab8c131278d968..927676794cb36d367c8187c1648df4e3c7a1d526 100644 (file)
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 

diff --git a/samples/proplist/proplist.h b/samples/proplist/proplist.h
index eb50e3f8158839118e2de007fa55f0c7a43a27b7..a277b1c85f74208d505ca5d6aa683dae47128c10 100644 (file)
--- a/samples/proplist/proplist.h
+++ b/samples/proplist/proplist.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "proplist_sample.h"
 #endif
 

diff --git a/samples/propsize/propsize.cpp b/samples/propsize/propsize.cpp
index af785b369df5c769d9893da1be5e4bf19477a27d..d17a0e57f5114ab1030074b4e3425eded9f21fc4 100644 (file)
--- a/samples/propsize/propsize.cpp
+++ b/samples/propsize/propsize.cpp
@@ -16,7 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "propsize.cpp"
     #pragma interface "propsize.cpp"
 #endif

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index f621bf370e3eb5d5c1075b0b5a35c1912dbbfb0c..94e010410e2960525df5e6b3f49d7d66ffbf3a26 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -17,7 +17,7 @@
 // headers
 // --------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #  pragma implementation "client.cpp"
 #  pragma interface "client.cpp"
 #endif

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index b3ddb96def0cf9f28329ae92e97dc4a91f5b0cef..ac8a2dd3f0b837d5a473b97a2d9c4fe130b398b6 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -17,7 +17,7 @@
 // headers
 // --------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #  pragma implementation "server.cpp"
 #  pragma interface "server.cpp"
 #endif

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 2b9924d343edfc62d913e9bcb294c138d33db803..9c1cbcd7c9b94d52a61a1cb977c4b3f7570bc690 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -31,6 +31,7 @@
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/statusbr.h"
     #include "wx/timer.h"

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index eab3c3f1ab5e294a44d9ae4861d8127a8005cdb3..8e868f2a82a7733651352032ed3a970a6a091db3 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
-#include <wx/msw/taskbar.h>
+#include "wx/msw/taskbar.h"
 #include "tbtest.h"
 
 // Declare two frames

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index 2c60f5442453e581b1e291078acf270f224fcecf..0b1ca03b17baaf9db016b8f5a4dc6de020c35a1e 100644 (file)
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "typetest.h"
 #endif
 

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 50e1a1ce22e68d37d3cb5db1fa983dee21eecbea..85c99f9d608982de3204715fa592e047a75ba580 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "wizard.cpp"
     #pragma interface "wizard.cpp"
 #endif