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
This commit is contained in:
@@ -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&)
|
||||
{
|
||||
|
@@ -105,7 +105,7 @@ public:
|
||||
wxIDirectFBFontPtr m_font;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -127,7 +127,7 @@ private:
|
||||
friend class wxFont;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontRefData
|
||||
|
@@ -153,7 +153,7 @@ private:
|
||||
friend class wxFont;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontRefData
|
||||
|
@@ -154,7 +154,7 @@ public:
|
||||
wxNativeFontInfo m_info;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
|
||||
// ============================================================================
|
||||
|
@@ -133,7 +133,7 @@ public:
|
||||
void MacFindFont() ;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
@@ -79,7 +79,7 @@ private:
|
||||
friend class wxFont;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
@@ -211,7 +211,7 @@ wxFontRefData::~wxFontRefData()
|
||||
m_fonts.Clear();
|
||||
}
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFont
|
||||
|
@@ -321,7 +321,7 @@ protected:
|
||||
bool m_nativeFontInfoOk;
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
@@ -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
|
||||
|
@@ -315,6 +315,8 @@ protected:
|
||||
bool m_nativeFontInfoOk;
|
||||
};
|
||||
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
@@ -164,7 +164,7 @@ protected:
|
||||
#endif
|
||||
};
|
||||
|
||||
#define M_FONTDATA (wxFontRefData*)m_refData)
|
||||
#define M_FONTDATA ((wxFontRefData*)m_refData)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontRefData
|
||||
|
Reference in New Issue
Block a user