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

Simplify preprocessor guards for render tables and new

Browse Source 
font handling. Remove unused method.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-09-30 09:12:58 +00:00
parent 712593b003
commit eb9d223a9a
2 changed files with 26 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/motif/font.h
View File

@@ -14,8 +14,10 @@
#if __WXMOTIF20__ && !__WXLESSTIF__ #if __WXMOTIF20__ && !__WXLESSTIF__
#define wxMOTIF_NEW_FONT_HANDLING 1 #define wxMOTIF_NEW_FONT_HANDLING 1
#define wxMOTIF_USE_RENDER_TABLE 1
#else #else
#define wxMOTIF_NEW_FONT_HANDLING 0 #define wxMOTIF_NEW_FONT_HANDLING 0
#define wxMOTIF_USE_RENDER_TABLE 0
#endif #endif
class wxXFont; class wxXFont;
@@ -97,17 +99,18 @@ public:
WXDisplay* display = NULL) const; WXDisplay* display = NULL) const;
// These two are helper functions for convenient access of the above. // These two are helper functions for convenient access of the above.
#if !wxMOTIF_NEW_FONT_HANDLING #if wxMOTIF_NEW_FONT_HANDLING
WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
#else // if !wxMOTIF_NEW_FONT_HANDLING
WXFontStructPtr GetFontStruct(double scale = 1.0, WXFontStructPtr GetFontStruct(double scale = 1.0,
WXDisplay* display = NULL) const; WXDisplay* display = NULL) const;
#endif // wxMOTIF_NEW_FONT_HANDLING
#if wxMOTIF_USE_RENDER_TABLE
WXRenderTable GetRenderTable(WXDisplay* display) const;
#else // if !wxMOTIF_USE_RENDER_TABLE
WXFontList GetFontList(double scale = 1.0, WXFontList GetFontList(double scale = 1.0,
WXDisplay* display = NULL) const; WXDisplay* display = NULL) const;
#else #endif // wxMOTIF_USE_RENDER_TABLE
WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
#endif
#if __WXMOTIF20__ // && !__WXLESSTIF__ for 2.7
WXRenderTable GetRenderTable(WXDisplay* display) const;
#endif
// returns either a XmFontList or XmRenderTable, depending // returns either a XmFontList or XmRenderTable, depending
// on Motif version // on Motif version
WXFontType GetFontType(WXDisplay* display) const; WXFontType GetFontType(WXDisplay* display) const;
@@ -120,8 +123,6 @@ protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
// VZ: IMHO, we don't need it at all...
bool RealizeResource() { return true; }
void Unshare(); void Unshare();
private: private:

61
src/motif/font.cpp
View File

@@ -42,12 +42,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
#define wxUSE_RENDER_TABLE 1
#else
#define wxUSE_RENDER_TABLE 0
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private classes // private classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -63,7 +57,7 @@ public:
#if !wxMOTIF_NEW_FONT_HANDLING #if !wxMOTIF_NEW_FONT_HANDLING
WXFontStructPtr m_fontStruct; // XFontStruct WXFontStructPtr m_fontStruct; // XFontStruct
#endif #endif
#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING #if !wxMOTIF_USE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
WXFontList m_fontList; // Motif XmFontList WXFontList m_fontList; // Motif XmFontList
#else // if wxUSE_RENDER_TABLE #else // if wxUSE_RENDER_TABLE
WXRenderTable m_renderTable; // Motif XmRenderTable WXRenderTable m_renderTable; // Motif XmRenderTable
@@ -135,9 +129,9 @@ wxXFont::wxXFont()
#if !wxMOTIF_NEW_FONT_HANDLING #if !wxMOTIF_NEW_FONT_HANDLING
m_fontStruct = (WXFontStructPtr) 0; m_fontStruct = (WXFontStructPtr) 0;
#endif #endif
#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING #if !wxMOTIF_USE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
m_fontList = (WXFontList) 0; m_fontList = (WXFontList) 0;
#else // if wxUSE_RENDER_TABLE #else // if wxMOTIF_USE_RENDER_TABLE
m_renderTable = (WXRenderTable) 0; m_renderTable = (WXRenderTable) 0;
m_rendition = (WXRendition) 0; m_rendition = (WXRendition) 0;
#endif #endif
@@ -147,7 +141,7 @@ wxXFont::wxXFont()
wxXFont::~wxXFont() wxXFont::~wxXFont()
{ {
#if !wxUSE_RENDER_TABLE #if !wxMOTIF_USE_RENDER_TABLE
if (m_fontList) if (m_fontList)
XmFontListFree ((XmFontList) m_fontList); XmFontListFree ((XmFontList) m_fontList);
m_fontList = NULL; m_fontList = NULL;
@@ -242,8 +236,6 @@ bool wxFont::Create(int pointSize,
m_refData = new wxFontRefData(pointSize, family, style, weight, m_refData = new wxFontRefData(pointSize, family, style, weight,
underlined, faceName, encoding); underlined, faceName, encoding);
RealizeResource();
return true; return true;
} }
@@ -379,8 +371,6 @@ void wxFont::SetPointSize(int pointSize)
M_FONTDATA->m_pointSize = pointSize; M_FONTDATA->m_pointSize = pointSize;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
RealizeResource();
} }
void wxFont::SetFamily(int family) void wxFont::SetFamily(int family)
@@ -389,8 +379,6 @@ void wxFont::SetFamily(int family)
M_FONTDATA->m_family = family; M_FONTDATA->m_family = family;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
RealizeResource();
} }
void wxFont::SetStyle(int style) void wxFont::SetStyle(int style)
@@ -399,8 +387,6 @@ void wxFont::SetStyle(int style)
M_FONTDATA->m_style = style; M_FONTDATA->m_style = style;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
RealizeResource();
} }
void wxFont::SetWeight(int weight) void wxFont::SetWeight(int weight)
@@ -409,8 +395,6 @@ void wxFont::SetWeight(int weight)
M_FONTDATA->m_weight = weight; M_FONTDATA->m_weight = weight;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
RealizeResource();
} }
void wxFont::SetFaceName(const wxString& faceName) void wxFont::SetFaceName(const wxString& faceName)
@@ -419,8 +403,6 @@ void wxFont::SetFaceName(const wxString& faceName)
M_FONTDATA->m_faceName = faceName; M_FONTDATA->m_faceName = faceName;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
RealizeResource();
} }
void wxFont::SetUnderlined(bool underlined) void wxFont::SetUnderlined(bool underlined)
@@ -428,8 +410,6 @@ void wxFont::SetUnderlined(bool underlined)
Unshare(); Unshare();
M_FONTDATA->m_underlined = underlined; M_FONTDATA->m_underlined = underlined;
RealizeResource();
} }
void wxFont::SetEncoding(wxFontEncoding encoding) void wxFont::SetEncoding(wxFontEncoding encoding)
@@ -438,8 +418,6 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
M_FONTDATA->m_encoding = encoding; M_FONTDATA->m_encoding = encoding;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
RealizeResource();
} }
void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
@@ -565,7 +543,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
f->m_display = ( display ? display : wxGetDisplay() ); f->m_display = ( display ? display : wxGetDisplay() );
f->m_scale = intScale; f->m_scale = intScale;
#if wxUSE_RENDER_TABLE #if wxMOTIF_USE_RENDER_TABLE
XmRendition rendition; XmRendition rendition;
XmRenderTable renderTable; XmRenderTable renderTable;
Arg args[5]; Arg args[5];
@@ -589,7 +567,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
f->m_renderTable = (WXRenderTable)renderTable; f->m_renderTable = (WXRenderTable)renderTable;
f->m_rendition = (WXRendition)rendition; f->m_rendition = (WXRendition)rendition;
wxASSERT( f->m_renderTable != NULL ); wxASSERT( f->m_renderTable != NULL );
#else // if !wxUSE_RENDER_TABLE #else // if !wxMOTIF_USE_RENDER_TABLE
f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET); f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
wxASSERT( f->m_fontList != NULL ); wxASSERT( f->m_fontList != NULL );
#endif #endif
@@ -608,38 +586,31 @@ WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
return (f ? f->m_fontStruct : (WXFontStructPtr) 0); return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
} }
#endif
#if !wxMOTIF_USE_RENDER_TABLE
WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
{ {
#if !wxUSE_RENDER_TABLE
wxXFont* f = GetInternalFont(scale, display); wxXFont* f = GetInternalFont(scale, display);
return (f ? f->m_fontList : (WXFontList) 0); return (f ? f->m_fontList : (WXFontList) 0);
#else
return NULL;
#endif
} }
#endif // !wxMOTIF_NEW_FONT_HANDLING #else // if wxMOTIF_USE_RENDER_TABLE
// declared in the header, can't use wxUSE_RENDER_TABLE
#if wxCHECK_MOTIF_VERSION( 2, 0 )
WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
{ {
#if wxUSE_RENDER_TABLE
wxXFont* f = GetInternalFont(1.0, display); wxXFont* f = GetInternalFont(1.0, display);
return (f ? f->m_renderTable : (WXFontList) 0); return (f ? f->m_renderTable : (WXRenderTable) 0);
#else
return NULL;
#endif
} }
#endif // wxCHECK_MOTIF_VERSION( 2, 0 ) #endif // wxMOTIF_USE_RENDER_TABLE
WXFontType wxFont::GetFontType(WXDisplay* display) const WXFontType wxFont::GetFontType(WXDisplay* display) const
{ {
#if wxUSE_RENDER_TABLE #if wxMOTIF_USE_RENDER_TABLE
return Ok() ? GetRenderTable(display) : NULL; return Ok() ? GetRenderTable(display) : NULL;
#else #else
return Ok() ? GetFontList(1.0, display) : NULL; return Ok() ? GetFontList(1.0, display) : NULL;
@@ -648,7 +619,7 @@ WXFontType wxFont::GetFontType(WXDisplay* display) const
WXFontType wxFont::GetFontTypeC(WXDisplay* display) const WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
{ {
#if wxUSE_RENDER_TABLE #if wxMOTIF_USE_RENDER_TABLE
return Ok() ? GetRenderTable(display) : NULL; return Ok() ? GetRenderTable(display) : NULL;
#else #else
return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL; return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL;
@@ -657,7 +628,7 @@ WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
/*static*/ WXString wxFont::GetFontTag() /*static*/ WXString wxFont::GetFontTag()
{ {
#if wxUSE_RENDER_TABLE #if wxMOTIF_USE_RENDER_TABLE
return (WXString)XmNrenderTable; return (WXString)XmNrenderTable;
#else #else
return (WXString)XmNfontList; return (WXString)XmNfontList;