// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
#ifdef __VMS
#pragma message disable nosimpint
#include "wx/vms_x_fix.h"
#pragma message enable nosimpint
#endif
-#include "wx/string.h"
#include "wx/font.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h" // for wxGetDisplay()
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/utils.h" // for wxGetDisplay()
+ #include "wx/settings.h"
+ #include "wx/gdicmn.h"
+#endif
+
#include "wx/fontutil.h" // for wxNativeFontInfo
#include "wx/tokenzr.h"
-#include "wx/settings.h"
#include "wx/motif/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
{
public:
wxXFont();
- ~wxXFont();
+ virtual ~wxXFont();
#if !wxMOTIF_NEW_FONT_HANDLING
WXFontStructPtr m_fontStruct; // XFontStruct
#endif
-#if !wxMOTIF_USE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
+#if !wxMOTIF_USE_RENDER_TABLE
WXFontList m_fontList; // Motif XmFontList
#else // if wxUSE_RENDER_TABLE
WXRenderTable m_renderTable; // Motif XmRenderTable
data.m_underlined, data.m_faceName, data.m_encoding);
}
- ~wxFontRefData();
+ virtual ~wxFontRefData();
protected:
// common part of all ctors
#if !wxMOTIF_NEW_FONT_HANDLING
m_fontStruct = (WXFontStructPtr) 0;
#endif
-#if !wxMOTIF_USE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
+#if !wxMOTIF_USE_RENDER_TABLE
m_fontList = (WXFontList) 0;
#else // if wxMOTIF_USE_RENDER_TABLE
m_renderTable = (WXRenderTable) 0;
m_fonts.Clear();
}
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
tmp = tn.GetNextToken(); // pointsize
if (tmp != wxT("*"))
{
- long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+ long num = wxStrtol (tmp.mb_str(), (wxChar **) NULL, 10);
M_FONTDATA->m_pointSize = (int)(num / 10);
}
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
M_FONTDATA->m_faceName = faceName;
M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
+
+ return wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->m_faceName ;
}
{
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
- if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
+ if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty())
GetInternalFont();
return &(M_FONTDATA->m_nativeFontInfo);
#endif
f->m_display = ( display ? display : wxGetDisplay() );
f->m_scale = intScale;
-
+
#if wxMOTIF_USE_RENDER_TABLE
XmRendition rendition;
XmRenderTable renderTable;
int count = 0;
#if wxMOTIF_NEW_FONT_HANDLING
- wxChar* fontSpec = wxStrdup( xFontSpec.c_str() );
+ wxChar* fontSpec = wxStrdup( xFontSpec.mb_str() );
XtSetArg( args[count], XmNfontName, fontSpec ); ++count;
XtSetArg( args[count], XmNfontType, XmFONT_IS_FONTSET ); ++count;
#else
#endif
}
-#if wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_USE_RENDER_TABLE
WXFontSet wxFont::GetFontSet(double scale, WXDisplay* display) const
{
{
XRectangle ink, logical;
WXFontSet fset = font.GetFontSet(scale, display);
-
- XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(), &ink, &logical);
+
+ XmbTextExtents( (XFontSet)fset, str.mb_str(), str.length(), &ink, &logical);
if( width ) *width = logical.width;
if( height ) *height = logical.height;
- if( ascent ) *ascent = -logical.y;
- if( descent ) *descent = logical.height + logical.y;
+ if( ascent ) *ascent = -logical.y;
+ if( descent ) *descent = logical.height + logical.y;
}
-#else // if !wxMOTIF_NEW_FONT_HANDLING
+#else // if !wxMOTIF_USE_RENDER_TABLE
void wxGetTextExtent(WXDisplay* display, const wxFont& font,
double scale, const wxString& str,
int direction, ascent2, descent2;
XCharStruct overall;
- int slen = str.Len();
+ int slen = str.length();
- XTextExtents((XFontStruct*) pFontStruct, (char*) str.c_str(), slen,
+ XTextExtents((XFontStruct*) pFontStruct, (char*) str.mb_str(), slen,
&direction, &ascent2, &descent2, &overall);
if ( width )
*ascent = ascent2;
}
-#endif // !wxMOTIF_NEW_FONT_HANDLING
+#endif // !wxMOTIF_USE_RENDER_TABLE