From a8e9860d9fa86d3cf354b0b05739da379d3e9ae1 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 27 Jan 2005 11:00:32 +0000 Subject: [PATCH] pragma and prec-header patch applied git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/accel.cpp | 5 +++-- src/mac/carbon/bitmap.cpp | 4 ++-- src/mac/carbon/bmpbuttn.cpp | 4 +++- src/mac/carbon/brush.cpp | 7 ++++--- src/mac/carbon/button.cpp | 4 ++-- src/mac/carbon/checkbox.cpp | 4 ++-- src/mac/carbon/checklst.cpp | 4 ++-- src/mac/carbon/choice.cpp | 4 ++-- src/mac/carbon/clipbrd.cpp | 4 +++- src/mac/carbon/colordlg.cpp | 4 +++- src/mac/carbon/colour.cpp | 4 +++- 11 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp index 16d871aeb0..69ad642818 100644 --- a/src/mac/carbon/accel.cpp +++ b/src/mac/carbon/accel.cpp @@ -9,11 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "accel.h" #endif -#include "wx/setup.h" +#include "wx/wxprec.h" + #include "wx/accel.h" #include "wx/string.h" diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp index 67ec567512..71aaca2aa7 100644 --- a/src/mac/carbon/bitmap.cpp +++ b/src/mac/carbon/bitmap.cpp @@ -9,11 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bitmap.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #include "wx/bitmap.h" #include "wx/icon.h" diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 2e9f9c6675..6f8bd14088 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -9,10 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bmpbuttn.h" #endif +#include "wx/wxprec.h" + #include "wx/window.h" #include "wx/bmpbuttn.h" diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index f94401052f..8716a58535 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -9,11 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "brush.h" #endif -#include "wx/setup.h" +#include "wx/wxprec.h" + #include "wx/utils.h" #include "wx/brush.h" @@ -226,4 +227,4 @@ wxBitmap *wxBrush::GetStipple() const wxMacBrushKind wxBrush::MacGetBrushKind() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); -} \ No newline at end of file +} diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 28b8697630..0298236cc3 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -9,11 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "button.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #include "wx/button.h" #include "wx/panel.h" diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp index 9c4f5f75d2..c8f2f6eda4 100644 --- a/src/mac/carbon/checkbox.cpp +++ b/src/mac/carbon/checkbox.cpp @@ -9,11 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checkbox.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #include "wx/checkbox.h" diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 9b2278c116..1169800ec4 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -13,11 +13,11 @@ // headers & declarations // ============================================================================ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checklst.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_CHECKLISTBOX diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index c8554b81f0..548eee9e53 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -9,11 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "choice.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_CHOICE diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index 7e48c9ec34..be0973dd38 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -9,10 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "clipbrd.h" #endif +#include "wx/wxprec.h" + #include "wx/app.h" #include "wx/frame.h" #include "wx/bitmap.h" diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index 6ca0354761..bea3f01b82 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/colordlg.cpp @@ -10,10 +10,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colordlg.h" #endif +#include "wx/wxprec.h" + #include "wx/mac/colordlg.h" #include "wx/fontdlg.h" diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 86487f7a35..51123f9c50 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -9,10 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colour.h" #endif +#include "wx/wxprec.h" + #include "wx/gdicmn.h" #include "wx/colour.h" -- 2.45.2