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
2002-08-31 22:31:03 +00:00
parent 6c5672c0d4
commit 788233da90
26 changed files with 29 additions and 27 deletions
--- 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

--- 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"
--- 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
--- 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
--- 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
--- 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"
--- 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"

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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

--- 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