pragma and prec-header patch applied

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index e38374b2cc15ce93af29105cbd7cb9b5c441fb1f..7e6da680cf93c366b134af6a71f7d5c1b0908c6f 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "combobox.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 3bf9fce05d6546390ee7078d5777892163a0e260..fcbdd47b6b1bd8b4bcfdc0a6c034ef8c399deafa 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "combobox.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index e7fa4ffe52e87b34701a03d05f7ede475b977c8d..66c8c8f7c500a1dea40a97c8e25a1ce943c3ce7e 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "control.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/control.h"
 #include "wx/panel.h"

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index dc9ae3abe9d1b9d331b43d9d736273f3a174b85b..eace8c0b5d51cfff7f12eb66850cc6fe82e5a046 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "cursor.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/app.h"
 #include "wx/cursor.h"

diff --git a/src/mac/carbon/data.cpp b/src/mac/carbon/data.cpp
index 1f0bea00d2cd67fa4584383e4f860f7b88fb29e3..844ac0a4b92d5fa3d3ef0a82f156d481d2adf796 100644 (file)
--- a/src/mac/carbon/data.cpp
+++ b/src/mac/carbon/data.cpp
@@ -9,6 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/event.h"
 
 #if wxUSE_SHARED_LIBRARY

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index bec4f2bd605d14d75b1c96f681471ddaebefa93a..c7f7eb3961e9b3fab587e6e188cd0d065b41e594 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "dataobj.h"
 #endif
 
@@ -27,7 +27,6 @@
 #ifndef WX_PRECOMP
 #include "wx/intl.h"
 #endif
-#include "wx/defs.h"
 
 #include "wx/log.h"
 #include "wx/dataobj.h"

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 59657f38f55c78454b7ea1f5ba0a991c18ed0ad0..9e35a5d561c26f27f93a0dfa030d47f2a1bb9be6 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcclient.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index e850a59e4d431a92a96d7ef2ff3a6fad623c913c..5cf33361294b4267c00cf20b258bf4a6194c3178 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcmemory.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/dcmemory.h"
 #include "wx/mac/private.h"
 

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 85bc4669700038a282ccf5bfd9ee1ba551e37722..aa3af956193813e376bc8e39fc9c0f5499beda94 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcprint.h"
 #endif
 

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 6ed78b6353cd55bfc06be87fe3adf416f222b96f..437e612a3af3c47a22e28a9507507e96123d3e57 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcscreen.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/dcscreen.h"
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index cc581e9bf44fdae933614ae1f1bcd88cc919f172..832ff9bc3990b400761c93e9270044542e3e1f7e 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dialog.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 9b01d3e2364a0a5cd949beee5ca10e52214df9a9..259eba0f112401556289b8bf3e49cc76c083eb40 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -9,11 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dirdlg.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/dirdlg.h"

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index b6525e795149729e84646fa508041b4e9558de11..e9df6eedaccb8606444e262cc720846fd7a13e31 100644 (file)
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dir.h"
 #endif
 

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index 313c2f26cc1ff224c4f5832fb2983421fa4db14e..8c6bc2b09e76853a317dd116c3f64d62e0c2f274 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "display.h"
 #endif
 

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index c4f3c8cf63bc1b9e9f22edc4eafb5e544123716f..61db55a7d6b126beaeeeb1173f80d66957088bb0 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dnd.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_DRAG_AND_DROP
 

diff --git a/src/mac/carbon/drawer.cpp b/src/mac/carbon/drawer.cpp
index 0e77b2870220e4fb8a1d04cb5eb6b71da90138cb..bcf8785ca2e19c97710dcfb8af8d671c761ca871 100644 (file)
--- a/src/mac/carbon/drawer.cpp
+++ b/src/mac/carbon/drawer.cpp
@@ -12,11 +12,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "control.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
 #include "wx/mac/private.h"
 
 #if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 8e5b944b5755a80a376c0e0e36efbc3b78177c21..fc125d5921c6787771d420ac20a7d1cc1692b38c 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "filedlg.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 9d730720e290eb9cdd66f68d20bbaefee88b6477..23f99696b1088b52d9c622dfbac32c496d6da040 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "fontdlg.h"
 #endif
 
@@ -93,4 +93,4 @@ int wxFontDialog::ShowModal()
     return wxID_CANCEL;
 }
 
-#endif // 10.2+
\ No newline at end of file
+#endif // 10.2+

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 467bc95442901d39a1f47d1e7206f45e18f6bdd6..9b48a9fbf2b8f9ba5f819fcf48cc419dcca2287a 100644 (file)
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontenum.h"
 #endif
 

diff --git a/src/mac/carbon/fontutil.cpp b/src/mac/carbon/fontutil.cpp
index 1aa2298245ec4225ef616c4578e8965e9b886b98..6318e4a807f52a1944b19c517aa75fd9d9f0b28f 100644 (file)
--- a/src/mac/carbon/fontutil.cpp
+++ b/src/mac/carbon/fontutil.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontutil.h"
 #endif
 

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index ac1391d4de21a1d35396a719306b8bbc7a0ea142..d7cc70101e41c5fab226c2ecec34c82c2a3e5b6c 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "frame.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/frame.h"
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 6f97b0357833caff02f5efdc843f58bca035c85f..1970134e2f28440b72dd6b0af58b0a8bde27d0c2 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,14 +9,16 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "gauge.h"
 #endif
 
-#include "wx/gauge.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_GAUGE 
 
+#include "wx/gauge.h"
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif

diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp
index 528c5a7efe4467940b2f65a72bdbcec3b76aa440..f0c713329895bbac370e3352c136467a694d3084 100644 (file)
--- a/src/mac/carbon/gdiobj.cpp
+++ b/src/mac/carbon/gdiobj.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "gdiobj.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/gdiobj.h"
 
 #if !USE_SHARED_LIBRARIES

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index facd34a510bd3229c5d265e40aca9488619a47fc..7f44e45910675c2fb06c14621048056a02fb8cdb 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "glcanvas.h"
 #endif
 
@@ -19,8 +19,6 @@
 #pragma hdrstop
 #endif
 
-#include "wx/setup.h"
-
 #if wxUSE_GLCANVAS
 
 #ifndef WX_PRECOMP

diff --git a/src/mac/carbon/helpxxxx.cpp b/src/mac/carbon/helpxxxx.cpp
index 7d0e4d15314ef776d7949264d2adf578fb3d83ce..e330ce2d7981a4546a1a9b481eadcc7c572390d9 100644 (file)
--- a/src/mac/carbon/helpxxxx.cpp
+++ b/src/mac/carbon/helpxxxx.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "helpxxxx.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/stubs/helpxxxx.h"
 
 #include <string.h>

diff --git a/src/mac/carbon/hid.cpp b/src/mac/carbon/hid.cpp
index feb8e3a260c0ba986d423f8dc445ad1e8e0e1e96..3d17c726bdb5aa4d427615c67d5b250104852948 100644 (file)
--- a/src/mac/carbon/hid.cpp
+++ b/src/mac/carbon/hid.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "hid.h"
 #endif
 
@@ -28,11 +28,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-
 //DARWIN _ONLY_
 #ifdef __DARWIN__
 

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index ab1dffe712704289a251700b36e47673760da401..25543c1e9575bfbb6436302838d895d9fe0dfd66 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "icon.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/icon.h"
 
 #if !USE_SHARED_LIBRARIES

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 156b9b26570395a30a0686d8e3dda3480fdc2f02..8136d9e59b35a08a1bd17ffc7f2e8e9e0000a983 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -9,16 +9,16 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "joystick.h"
 #endif
 
-#include "wx/setup.h"
-
-#include "wx/joystick.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
+#include "wx/joystick.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 502651c1a45e2b083e6669718d16c242590e0afb..7c8ca90473a7d0543e69f4c9feca6fff7666c996 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "listbox.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index 2962de20f55f1297ff97c7c32d7de37b674f78c8..08d304bb49dc519789fc3306d8c478b0c6bc9cc6 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -7,6 +7,8 @@
  * -------------------------------------------------------------------------
  */
 
+#include "wx/wxprec.h"
+
 #include "wx/wx.h"
 
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 542a76cdc786e8daacfd198b16bc24d878efc09d..fa7f6c0b61a09af38bf99474b7410c6f5e2a55c4 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mdi.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index c31a56fb598829f0fa3c79db3e9efb5ed3970f25..7b596771ad97460a773149ca26b8b2696b94992c 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "menu.h"
 #pragma implementation "menuitem.h"
 #endif
@@ -21,6 +21,8 @@
 // wxWidgets headers
 // -----------------
 
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index e1062e4597b9f0db5f9fd97cca134f55af93be07..1d27c95fbf4a307c6069ac4a170a75170ac7d558 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -13,6 +13,8 @@
 // headers & declarations
 // ============================================================================
 
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 594fe43af521d1ef1aa85c16369595d50d35ed88..b5e3e7c7794b40cfca7c5530d2ce89e17c36eab4 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "metafile.h"
 #endif
 
@@ -20,10 +20,6 @@
 #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/setup.h"
-#endif
-
 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 1ea83612c2d1fa9c56bf28e6c11295f07d62e609..29449a6b60b45012af074abd2191b46f3a738f58 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef    __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mimetype.h"
 #endif
 
@@ -20,10 +20,6 @@
   #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-
 #ifndef WX_PRECOMP
   #include "wx/string.h"
   #if wxUSE_GUI

diff --git a/src/mac/carbon/minifram.cpp b/src/mac/carbon/minifram.cpp
index 6b49b9bdc74542e9dc97c5b87d83b06901742a35..5b2561f52b517a382d5e9a6517bb6fdf5288287e 100644 (file)
--- a/src/mac/carbon/minifram.cpp
+++ b/src/mac/carbon/minifram.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "minifram.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/minifram.h"
 
 #if !USE_SHARED_LIBRARY

diff --git a/src/mac/carbon/mpthread.cpp b/src/mac/carbon/mpthread.cpp
index 7eeabfa7a3dd9bed0a188082371efc701c863109..fe01a8bdd1047f2fe4b1ff5a81e45efd396c0b61 100755 (executable)
--- a/src/mac/carbon/mpthread.cpp
+++ b/src/mac/carbon/mpthread.cpp
@@ -10,7 +10,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "thread.h"
 #endif
 

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 6f1cfbfdc6e63f0cd449269a02a65a6f6757abd5..e0f43288d4d2416360cf90d221437dffd667d0cd 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "msgdlg.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/msgdlg.h"
 #include "wx/intl.h"

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index fa58eacad72834e444b290a228967847b8d1d6d7..6f2685f3c08944e58944137b97c169d3417e190b 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "notebook.h"
 #endif
 
@@ -20,6 +20,8 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/string.h"
 #include "wx/log.h"

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 60a0de6a8a57792b32270aa48ef3b1c3f21f9748..d3417248c84ab539da1c16469fc34b004aa9e0cf 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "palette.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_PALETTE
 

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index fea55ab34eb7394f3f30661355ad70238b4056af..56130732a93b683ce08d6582a883b23bfb1ec8dd 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -9,11 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "pen.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
 #include "wx/utils.h"
 #include "wx/pen.h"
 

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index 3241b88a3ace29ce82c01051759bb488db958f2a..084f5e4bb8a029c8eb5f8edd9e640c18c38f7101 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #  pragma implementation "pngread.h"
 #  pragma implementation "pnghand.h"
 #endif

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 38aa9582ae4921f9f3a8617c3edada920dde2cf9..e39c6dd1337aed4285389da5bf46e8e8a496b335 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "printdlg.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index f601443a28a76c4b22bebc3463a00ad6bb32a633..834d523ccf5616e65210ae22c0d328d13e2d213a 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "printwin.h"
 #endif
 
@@ -20,8 +20,6 @@
 #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 3695edf6cae5e335dd246735da2af9199da2664c..247071078253268ffdb6e064750a256779800ba5 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "radioboxbase.h"
 #pragma implementation "radiobox.h"
 #endif
@@ -18,7 +18,8 @@
 //         headers
 //-------------------------------------------------------------------------------------
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
 #include "wx/arrstr.h"
 
 #include "wx/radiobox.h"

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 1a31f44a25c95782a9389569d86de5d55905c2d9..3fd1a3fae2385821087c9abc8bdd50fa0c35cdfa 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/radiobut.h"
 

diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp
index aefaa806930ece47ecf515dfdb3dd78a2e661898..f0054d35bc8befeee76cb128be70bdd591f7a317 100644 (file)
--- a/src/mac/carbon/region.cpp
+++ b/src/mac/carbon/region.cpp
@@ -8,10 +8,12 @@
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "region.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/region.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 9098a0ad6d7cc64f9cea657ff2ca39e90907851f..4dd6127cfb8369a2cf62dfecfcd440798609ac36 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "scrolbar.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 3ba06cb040ea3371ac79e7fecc663469b244ba26..e61c589c6983da65461d5b5c1552991b966a01ca 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "settings.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 79f83f1b52ebbe378e69f8555950cb34fae5b1c5..6244a91ddced641f3abb41488cc68c5c5c441626 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "slider.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_SLIDER
 

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index af1144a5d702ad9ba6c61df02022f34cad8b7aed..93e36c103c395acf57c858fd741b28c62aa0e0b0 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "sound.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/log.h"

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index b3fd3830b1a102f3c160f5b8ca488ecd61d38f1b..35f00904d4c7a757feeceba15ae19196cf20f989 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -9,12 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "spinbutt.h"
 #pragma implementation "spinbuttbase.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_SPINBTN
 

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index e1c2f58cbe8d59328394effe3e262e48b706153a..40e5211fbd68109a77bd4a5dcce458e7c7fdf24c 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -12,7 +12,7 @@
 #pragma implementation "spinctrl.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_SPINCTRL
 

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index abe7a951b298e963401b826c91ee403c40bf807b..cb22a96bed3bc6d1a7d6ea3a3fb68c2969983ec1 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "statbmp.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index 87ec656d78230a2914bcdc5faddc61cc5f71ad2f..c2d3460d412562abdefae490e5f5f1429d3f8db4 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statbox.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 094c4a081d4148502444146137643ef4a2421b3d..86a80758d2ffe237536defce1f24e6dff350eb59 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statbrma.h"
 #endif
 
@@ -17,6 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/wxprec.h"
+
 #include "wx/statusbr.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

diff --git a/src/mac/carbon/statline.cpp b/src/mac/carbon/statline.cpp
index 52f3d407331cc40daa2fa89eaa99d9acd7821e42..71db41eddd5d9c0f4bd78dd74e9fff53cd88fc6a 100644 (file)
--- a/src/mac/carbon/statline.cpp
+++ b/src/mac/carbon/statline.cpp
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "statline.h"
 #endif
 

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index 34ca6e86cfda1a9cf5f2dd28aa8c0b2352697d2b..92d31f27e27f168036cc36d5d9463b952802d3aa 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "statline.h"
 #endif
 

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 16e9aca2fb5d4d8e3bd5fc0c71cc94abbf7d1f97..f01e11f66652f8a4b79cbacfbb78325dfb8cd1d1 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "stattext.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/stattext.h"
 #include "wx/notebook.h"

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index 33bf35469b5fe3e52a76671ec7fbd1ce0f1f24e9..6f4b3006ed2096c03542caeb514fd2591809374e 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "tabctrl.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/control.h"
 #include "wx/tabctrl.h"

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index 62b912bbe86d3b75826cbe0e1b0ed34aa992e288..e94ae77d65587c3063b216561178e76193e5dad0 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -11,8 +11,6 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef wxHAS_TASK_BAR_ICON
 
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 54cb030e19ca785d41d9fa9cf79be22683c9d58d..90551cf59c8d3b54e38c5f3702d31b1e79bc4198 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "textctrl.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_TEXTCTRL
 

diff --git a/src/mac/carbon/tglbtn.cpp b/src/mac/carbon/tglbtn.cpp
index 0e7af69d62fc11e84dfd96bc9cc32cf1aa1ad846..1c3c21b8cd7337d539c426f25bd39958355393d7 100644 (file)
--- a/src/mac/carbon/tglbtn.cpp
+++ b/src/mac/carbon/tglbtn.cpp
@@ -18,15 +18,15 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "button.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/tglbtn.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
 #include "wx/mac/uma.h"
 // Button
 

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 6809af50f6e8f69d7663bfcdd3d92d556e4413b6..010a4c5cffa0b5a2a6cca461b0ee66b9cb34f7a1 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -10,7 +10,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "thread.h"
 #endif
 

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 6830dd25cbd4fff86a79383390f606fb8d1fd337..5fe0c8428e3488adf4b7db569782728387848192 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "timer.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/timer.h"
 
 #if !USE_SHARED_LIBRARY

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index bdb6e6bad37a962616c5a6ee151fb1d483a2f42e..ef6f7623c4008ca66ac7a222d04023d76e400eb1 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -9,14 +9,15 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "toolbar.h"
 #endif
 
-#include "wx/wx.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_TOOLBAR
 
+#include "wx/wx.h"
 #include "wx/toolbar.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 73e70849f0e3ce8e2e3d53cced7d828ee24616ec..0c16019c4745148ac7a4ddbbaa3cf461152990ff 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -7,11 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "tooltip.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_TOOLTIPS
 

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 1fbb44d100ce2dffced576fff61a249b5bb87fcc..d4f3e31c9712b8ece44f3b536cca021f038aa468 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "toplevel.h"
 #endif
 

diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 7a548a743646328e7e24f73973c8ef446102337f..0fa15e39ef86a659212c8c3bdf1b6b00a168ba0e 100644 (file)
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "treectrl.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/stubs/textctrl.h"
 #include "wx/treebase.h"
 #include "wx/stubs/treectrl.h"

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 7f1fa17db934f2d5554035522a3eb0459e256fd1..9f577b30f575baf40e0fd5bc74b3e32a951837f1 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -9,7 +9,7 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_GUI
 

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 26b435433be3577ab639f897f631b08ba0085b7a..c20126d12cb84fac07938b4f8c7713c7f472e58e 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -9,12 +9,13 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 // Note: this is done in utilscmn.cpp now.
 // #pragma implementation "utils.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"

diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp
index fc4b8d28ff5d5ff3f10dc13f4f579afbc2a9a6eb..6c82d0ca87310800d3ca616ce6007a5ad4ca6933 100644 (file)
--- a/src/mac/carbon/utilsexc.cpp
+++ b/src/mac/carbon/utilsexc.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-//#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index c4562922362180a5f06c7e7d885c15d247552bbb..7f8e6417d83b030329774b43a75fa00ba5095801 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "window.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
 #include "wx/menu.h"
 #include "wx/window.h"
 #include "wx/dc.h"