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

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 7b2bbfecea7efb8ad1746dc8fb772f6eee30d9fb..ed1fac7b70aeb04b2a96244adc158044819d8a5d 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -37,7 +37,7 @@ wxFontRefData::~wxFontRefData()
     // TODO: delete font data
 }
 
     // TODO: delete font data
 }
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 bool wxFont::Create(const wxNativeFontInfo&)
 {
 
 bool wxFont::Create(const wxNativeFontInfo&)
 {

diff --git a/src/dfb/font.cpp b/src/dfb/font.cpp
index f33dd66e8f075aceaa6d4da727ee1ff26d51c0d7..fe57bbb73a1dcdbd176edb487195f52df66ddddb 100644 (file)
--- a/src/dfb/font.cpp
+++ b/src/dfb/font.cpp
@@ -105,7 +105,7 @@ public:
     wxIDirectFBFontPtr m_font;
 };
 
     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 31338b9b5a85226648ccf97db0f83cb302e7f073..e355db0f1c7dbfe822772cb7d72fbefe8f0a5f30 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -127,7 +127,7 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 70260cca96aaf00b2d449ef6d74d4cf522c80ad5..2125d300121a178bb1958ed80b9d972801ce30f7 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -153,7 +153,7 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index c95a5e8bdfed1c0bd667f4b22e9d13a09b6b429e..7766ff4e538bba84f5a801f5f9078a82071037f5 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -154,7 +154,7 @@ public:
     wxNativeFontInfo  m_info;
 };
 
     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 99b3e542f33388590dcd431fd31ea6f2ca988604..0e37f5772146893dd60834c9fff9d88c5f894649 100644 (file)
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -133,7 +133,7 @@ public:
     void        MacFindFont() ;
 };
 
     void        MacFindFont() ;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index d2e32d989bfd56a44eb17e0a2a7daf1770634eba..32a206abafa0b7eaedf3c26b7f44b88aa7c0249e 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -79,7 +79,7 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index ba8aaedabb2775bafc320bdadb208d90f5d65099..a9c0b0ac4897a10f956a1c01233171a358e0566a 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -211,7 +211,7 @@ wxFontRefData::~wxFontRefData()
     m_fonts.Clear();
 }
 
     m_fonts.Clear();
 }
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFont
 
 // ----------------------------------------------------------------------------
 // wxFont

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index de28e3919e74e260e45bf272f54f477a59900ac4..5534e9ecd988b3c0c8a28260c0c77a5731b69abc 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -321,7 +321,7 @@ protected:
     bool             m_nativeFontInfoOk;
 };
 
     bool             m_nativeFontInfoOk;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 61db53360615337b4be49fb4a8337a3e6ea41a56..16c1473d6a1b4363faca502800127064f27df454 100644 (file)
--- 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
 
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp
index 643465f86491ba488790e1daaaa0f9a80562690a..c2f192cbcabd4290b585e3d7814c321158d53935 100644 (file)
--- a/src/palmos/font.cpp
+++ b/src/palmos/font.cpp
@@ -315,6 +315,8 @@ protected:
     bool             m_nativeFontInfoOk;
 };
 
     bool             m_nativeFontInfoOk;
 };
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 9567408aaed63efc045b313dd2cf2aca485fde01..32ebc2ac8531de13dd480e0945118f67b259a675 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -164,7 +164,7 @@ protected:
 #endif
 };
 
 #endif
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData