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

[wxGTK2] Move wxFontRefData::SetPointSize to wxNativeFontInfo. Implement SetFaceName()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2005-08-23 00:03:27 +00:00
parent 7533ba252b
commit 8a15e8ba7a
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/font.cpp
View File

@@ -464,10 +464,7 @@ void wxFontRefData::SetPointSize(int pointSize)
m_pointSize = pointSize; m_pointSize = pointSize;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Get native info m_nativeFontInfo.SetPointSize(pointSize);
PangoFontDescription *desc = m_nativeFontInfo.description;
pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
#else #else
if ( HasNativeFont() ) if ( HasNativeFont() )
{ {
@@ -567,7 +564,9 @@ void wxFontRefData::SetFaceName(const wxString& facename)
{ {
m_faceName = facename; m_faceName = facename;
#ifndef __WXGTK20__ #ifdef __WXGTK20__
m_nativeFontInfo.SetFaceName(facename);
#else
if ( HasNativeFont() ) if ( HasNativeFont() )
{ {
m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);

9
src/gtk1/font.cpp
View File

@@ -464,10 +464,7 @@ void wxFontRefData::SetPointSize(int pointSize)
m_pointSize = pointSize; m_pointSize = pointSize;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Get native info m_nativeFontInfo.SetPointSize(pointSize);
PangoFontDescription *desc = m_nativeFontInfo.description;
pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
#else #else
if ( HasNativeFont() ) if ( HasNativeFont() )
{ {
@@ -567,7 +564,9 @@ void wxFontRefData::SetFaceName(const wxString& facename)
{ {
m_faceName = facename; m_faceName = facename;
#ifndef __WXGTK20__ #ifdef __WXGTK20__
m_nativeFontInfo.SetFaceName(facename);
#else
if ( HasNativeFont() ) if ( HasNativeFont() )
{ {
m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);

8
src/unix/fontutil.cpp
View File

@@ -202,9 +202,9 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
} }
void wxNativeFontInfo::SetPointSize(int WXUNUSED(pointsize)) void wxNativeFontInfo::SetPointSize(int pointsize)
{ {
wxFAIL_MSG( _T("not implemented") ); pango_font_description_set_size( description, pointsize * PANGO_SCALE );
} }
void wxNativeFontInfo::SetStyle(wxFontStyle style) void wxNativeFontInfo::SetStyle(wxFontStyle style)
@@ -249,9 +249,9 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
wxFAIL_MSG( _T("not implemented") ); wxFAIL_MSG( _T("not implemented") );
} }
void wxNativeFontInfo::SetFaceName(wxString WXUNUSED(facename)) void wxNativeFontInfo::SetFaceName(wxString facename)
{ {
wxFAIL_MSG( _T("not implemented") ); pango_font_description_set_family( description, wxGTK_CONV(facename) );
} }
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family)) void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))