Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common rtti in fontcmn.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-07 22:01:22 +00:00
parent 54912101ff
commit 46b03af7ae
10 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cocoa/font.mm
View File

@@ -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

2
src/dfb/font.cpp
View File

@@ -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,

2
src/gtk/font.cpp
View File

@@ -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(),

2
src/gtk1/font.cpp
View File

@@ -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());

2
src/mgl/font.cpp
View File

@@ -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,

2
src/motif/font.cpp
View File

@@ -42,8 +42,6 @@
#include "wx/tokenzr.h"
#include "wx/motif/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------

2
src/os2/font.cpp
View File

@@ -40,8 +40,6 @@
#include <malloc.h>
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
// ----------------------------------------------------------------------------
// wxFontRefData - the internal description of the font
// ----------------------------------------------------------------------------

2
src/osx/carbon/font.cpp
View File

@@ -31,8 +31,6 @@
#include <map>
#include <string>
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
class WXDLLEXPORT wxFontRefData: public wxGDIRefData
{
public:

46
src/palmos/font.cpp
View File

@@ -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
// ----------------------------------------------------------------------------

2
src/x11/font.cpp
View File

@@ -44,8 +44,6 @@
#include "wx/x11/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------