don't expose M_FONTDATA in public header

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 5d890e61765de4dcc791102ae8e9154cf150f029..4011aea3712a415d90071ca2c178a362e56c5a68 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -24,7 +24,6 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFontData;

 class WXDLLEXPORT wxFontBase;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxSize;
 class WXDLLEXPORT wxFontBase;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxSize;


@@ -212,10 +211,6 @@ public:
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
 protected:
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
 protected:

-    // get the internal data
-    wxFontRefData *GetFontData() const
-        { return (wxFontRefData *)m_refData; }
-

     // the function called by both overloads of SetNativeFontInfo()
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
     // the function called by both overloads of SetNativeFontInfo()
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 


@@ -252,11 +247,5 @@ private:
     #include "wx/os2/font.h"
 #endif
 
     #include "wx/os2/font.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_FONTDATA GetFontData()
-

 #endif
     // _WX_FONT_H_BASE_
 #endif
     // _WX_FONT_H_BASE_

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

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

 bool wxFont::Create(const wxNativeFontInfo&)
 {
     return false;
 bool wxFont::Create(const wxNativeFontInfo&)
 {
     return false;

diff --git a/src/dfb/font.cpp b/src/dfb/font.cpp
index e17ff385fda1fc7d8f86e7a7bbf7157decc35b2f..f33dd66e8f075aceaa6d4da727ee1ff26d51c0d7 100644 (file)
--- a/src/dfb/font.cpp
+++ b/src/dfb/font.cpp
@@ -105,6 +105,8 @@ public:
     wxIDirectFBFontPtr m_font;
 };
 
     wxIDirectFBFontPtr m_font;
 };
 

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index b3983ccb8a510cb864b67ac78e7e2f10f615c0e2..31338b9b5a85226648ccf97db0f83cb302e7f073 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -127,6 +127,8 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

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

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 0650fe78d91e26ebe89d9cfd794391ad6d5f1c43..c95a5e8bdfed1c0bd667f4b22e9d13a09b6b429e 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -154,6 +154,8 @@ public:
     wxNativeFontInfo  m_info;
 };
 
     wxNativeFontInfo  m_info;
 };
 

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index e2757af968e2ef26f84de2fedcad0861771f4999..99b3e542f33388590dcd431fd31ea6f2ca988604 100644 (file)
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -132,6 +132,9 @@ public:
 public:
     void        MacFindFont() ;
 };
 public:
     void        MacFindFont() ;
 };

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

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

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

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

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

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

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

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 0742d230705f289edec4b54bcb21e23df3557047..61db53360615337b4be49fb4a8337a3e6ea41a56 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -297,6 +297,8 @@ 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)
+

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

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

+#define M_FONTDATA (wxFontRefData*)m_refData)
+

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