summaryrefslogtreecommitdiff
path: root/vcl/aqua
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-09-28 16:18:44 +0300
committerTor Lillqvist <tml@iki.fi>2011-09-28 17:43:37 +0300
commit2ae1b4eb996bd5665559837b0c24bb78e72acf4e (patch)
treee733e69b3f47bb062fa255ff42f4ce0c9938feb0 /vcl/aqua
parent63efb738e9aa833c65606b96ba1e8a7ea028f040 (diff)
WaE: ATSUI is deprecated in newer SDKs
So when using gcc 4.2.1, turn deprecation warnings off for most of these source files, sigh.
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/gdi/salatslayout.cxx10
-rw-r--r--vcl/aqua/source/gdi/salatsuifontutils.cxx10
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx10
3 files changed, 30 insertions, 0 deletions
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 1c193378b9cf..9cb413b00654 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -37,6 +37,16 @@
#include <math.h>
+// ATSUI is deprecated in 10.6 (or already 10.5?)
+#if defined __GNUC__
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+#if GCC_VERSION >= 40201
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#endif
+
// =======================================================================
class ATSLayout : public SalLayout
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index a8ded318e1e0..c92fec6705db 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -39,6 +39,16 @@
#include "aqua/saldata.hxx"
#include "aqua/salatsuifontutils.hxx"
+// ATSUI is deprecated in 10.6 (or already 10.5?)
+#if defined __GNUC__
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+#if GCC_VERSION >= 40201
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#endif
+
// we have to get the font attributes from the name table
// since neither head's macStyle nor OS/2's panose are easily available
// during font enumeration. macStyle bits would be not sufficient anyway
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 3f8829b1e72b..6b1a64c03187 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -66,6 +66,16 @@ using namespace vcl;
typedef std::vector<unsigned char> ByteVector;
+// ATSUI is deprecated in 10.6 (or already 10.5?)
+#if defined __GNUC__
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+#if GCC_VERSION >= 40201
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#endif
+
// =======================================================================
ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, ATSUFontID nFontId )