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

Changes for some wxNativeFontInfo methods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-01-01 05:19:16 +00:00
parent 4e60199541
commit 490c977984
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
wxPython/src/fonts.i
View File

@@ -156,26 +156,11 @@ enum wxFontEncoding
// ToString() and restore them using FromString())
struct wxNativeFontInfo
{
#ifdef __WXGTK__
// init the elements from an XLFD, return TRUE if ok
bool FromXFontName(const wxString& xFontName);
// return false if we were never initialized with a valid XLFD
bool IsDefault() const;
// generate an XLFD using the fontElements
wxString GetXFontName() const;
// set the XFLD
void SetXFontName(const wxString& xFontName);
#endif
wxNativeFontInfo() { Init(); }
wxNativeFontInfo();
// reset to the default state
void Init();
#ifndef __WXGTK__
// accessors and modifiers for the font elements
int GetPointSize() const;
wxFontStyle GetStyle() const;
@@ -192,7 +177,6 @@ struct wxNativeFontInfo
void SetFaceName(wxString facename);
void SetFamily(wxFontFamily family);
void SetEncoding(wxFontEncoding encoding);
#endif
// it is important to be able to serialize wxNativeFontInfo objects to be
// able to store them (in config file, for example)
@@ -213,6 +197,34 @@ struct wxNativeFontInfo
};
%{
// Fix some link errors... Remove this when these methods get real implementations...
#if defined(__WXGTK__) || defined(__WXX11__)
#if wxUSE_PANGO
void wxNativeFontInfo::SetPointSize(int pointsize)
{ wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetStyle(wxFontStyle style)
{ wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetWeight(wxFontWeight weight)
{ wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
{ wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetFaceName(wxString facename)
{ wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetFamily(wxFontFamily family)
{ wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
{ wxFAIL_MSG( _T("not implemented") ); }
#endif
#endif
%}
//---------------------------------------------------------------------------
// wxFontMapper manages user-definable correspondence between logical font
// names and the fonts present on the machine.