From 68c957045a3919d9ac241a1e775c233bb6d1a793 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Mon, 20 Nov 2006 16:21:08 +0000
Subject: [PATCH] don't expose M_FONTDATA in public header

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/cocoa/font.cpp       | 2 +-
 src/dfb/font.cpp         | 2 +-
 src/gtk/font.cpp         | 2 +-
 src/gtk1/font.cpp        | 2 +-
 src/mac/carbon/font.cpp  | 2 +-
 src/mac/classic/font.cpp | 2 +-
 src/mgl/font.cpp         | 2 +-
 src/motif/font.cpp       | 2 +-
 src/msw/font.cpp         | 2 +-
 src/os2/font.cpp         | 2 +-
 src/palmos/font.cpp      | 2 ++
 src/x11/font.cpp         | 2 +-
 12 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 7b2bbfecea..ed1fac7b70 100644
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -37,7 +37,7 @@ wxFontRefData::~wxFontRefData()
     // TODO: delete font data
 }
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 bool wxFont::Create(const wxNativeFontInfo&)
 {
diff --git a/src/dfb/font.cpp b/src/dfb/font.cpp
index f33dd66e8f..fe57bbb73a 100644
--- a/src/dfb/font.cpp
+++ b/src/dfb/font.cpp
@@ -105,7 +105,7 @@ public:
     wxIDirectFBFontPtr m_font;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 31338b9b5a..e355db0f1c 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -127,7 +127,7 @@ private:
     friend class wxFont;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 70260cca96..2125d30012 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -153,7 +153,7 @@ private:
     friend class wxFont;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index c95a5e8bdf..7766ff4e53 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -154,7 +154,7 @@ public:
     wxNativeFontInfo  m_info;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 
 // ============================================================================
diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index 99b3e542f3..0e37f57721 100644
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -133,7 +133,7 @@ public:
     void        MacFindFont() ;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ============================================================================
 // implementation
diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index d2e32d989b..32a206abaf 100644
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -79,7 +79,7 @@ private:
     friend class wxFont;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ============================================================================
 // implementation
diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index ba8aaedabb..a9c0b0ac48 100644
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -211,7 +211,7 @@ wxFontRefData::~wxFontRefData()
     m_fonts.Clear();
 }
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ----------------------------------------------------------------------------
 // wxFont
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index de28e3919e..5534e9ecd9 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -321,7 +321,7 @@ protected:
     bool             m_nativeFontInfoOk;
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ============================================================================
 // implementation
diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 61db533606..16c1473d6a 100644
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -297,7 +297,7 @@ protected:
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ============================================================================
 // implementation
diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp
index 643465f864..c2f192cbca 100644
--- a/src/palmos/font.cpp
+++ b/src/palmos/font.cpp
@@ -315,6 +315,8 @@ protected:
     bool             m_nativeFontInfoOk;
 };
 
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
 // ============================================================================
 // implementation
 // ============================================================================
diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 9567408aae..32ebc2ac85 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -164,7 +164,7 @@ protected:
 #endif
 };
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
-- 
2.45.2