From: Stefan Csomor Date: Fri, 7 Jan 2011 22:01:22 +0000 (+0000) Subject: common rtti in fontcmn.cpp X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/46b03af7ae3afe6ab7d4be71fcd1625a006af6ff common rtti in fontcmn.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/cocoa/font.mm b/src/cocoa/font.mm index 2e2be8b5af..d46eae106c 100644 --- a/src/cocoa/font.mm +++ b/src/cocoa/font.mm @@ -281,8 +281,6 @@ static wxNativeFontInfo MakeNativeFontInfoForNSFont(NSFont *cocoaNSFont, bool un //#include "_font_test_2_8_abi_compat.h" -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - static wxNativeFontInfo MakeNativeFontInfo(int size, wxFontFamily family, wxFontStyle style, wxFontWeight weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) { wxNativeFontInfo m_info; // NOTE: not an i-var despite name diff --git a/src/dfb/font.cpp b/src/dfb/font.cpp index 7f780bdba7..cb36d55968 100644 --- a/src/dfb/font.cpp +++ b/src/dfb/font.cpp @@ -39,8 +39,6 @@ typedef wxFontMgrFontRefData wxFontRefData; // wxFont // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - bool wxFont::Create(const wxNativeFontInfo& info) { return Create(info.pointSize, info.family, info.style, info.weight, diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 17556c002f..3ac8f4590a 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -266,8 +266,6 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) // wxFont creation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - wxFont::wxFont(const wxNativeFontInfo& info) { Create( info.GetPointSize(), diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index 32c68402d6..93e30695a4 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -449,8 +449,6 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) // wxFont creation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - wxFont::wxFont(const wxNativeFontInfo& info) { (void) Create(info.GetXFontName()); diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp index bb68eba936..b464e5dc71 100644 --- a/src/mgl/font.cpp +++ b/src/mgl/font.cpp @@ -36,8 +36,6 @@ typedef wxFontMgrFontRefData wxFontRefData; // wxFont // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - bool wxFont::Create(const wxNativeFontInfo& info) { return Create(info.pointSize, info.family, info.style, info.weight, diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 3d5488cc42..5707d14729 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -42,8 +42,6 @@ #include "wx/tokenzr.h" #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- diff --git a/src/os2/font.cpp b/src/os2/font.cpp index eae1b4f880..8d046f78b9 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -40,8 +40,6 @@ #include -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font // ---------------------------------------------------------------------------- diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 573f8681d0..9c81bd9fe6 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -31,8 +31,6 @@ #include #include -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - class WXDLLEXPORT wxFontRefData: public wxGDIRefData { public: diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp index cf39e4dada..3a0cd03728 100644 --- a/src/palmos/font.cpp +++ b/src/palmos/font.cpp @@ -39,52 +39,6 @@ #include "wx/tokenzr.h" -#if wxUSE_EXTENDED_RTTI - -wxBEGIN_ENUM( wxFontFamily ) - wxENUM_MEMBER( wxDEFAULT ) - wxENUM_MEMBER( wxDECORATIVE ) - wxENUM_MEMBER( wxROMAN ) - wxENUM_MEMBER( wxSCRIPT ) - wxENUM_MEMBER( wxSWISS ) - wxENUM_MEMBER( wxMODERN ) - wxENUM_MEMBER( wxTELETYPE ) -wxEND_ENUM( wxFontFamily ) - -wxBEGIN_ENUM( wxFontStyle ) - wxENUM_MEMBER( wxNORMAL ) - wxENUM_MEMBER( wxITALIC ) - wxENUM_MEMBER( wxSLANT ) -wxEND_ENUM( wxFontStyle ) - -wxBEGIN_ENUM( wxFontWeight ) - wxENUM_MEMBER( wxNORMAL ) - wxENUM_MEMBER( wxLIGHT ) - wxENUM_MEMBER( wxBOLD ) -wxEND_ENUM( wxFontWeight ) - -IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h") - -wxBEGIN_PROPERTIES_TABLE(wxFont) - wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily - wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle - wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight - wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face ) - -wxBEGIN_HANDLERS_TABLE(wxFont) -wxEND_HANDLERS_TABLE() - -#else - IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#endif - - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/x11/font.cpp b/src/x11/font.cpp index 6423e578ea..97592a54c8 100644 --- a/src/x11/font.cpp +++ b/src/x11/font.cpp @@ -44,8 +44,6 @@ #include "wx/x11/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - // ---------------------------------------------------------------------------- // constants // ----------------------------------------------------------------------------