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

wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-18 09:56:17 +00:00
parent 18f3decb46
commit 7520f3da33
70 changed files with 284 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/motif/font.cpp
View File

@@ -20,8 +20,6 @@
// 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"
@@ -434,7 +432,7 @@ int wxFont::GetPointSize() const
wxString wxFont::GetFaceName() const
{
wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->m_faceName ;
}
@@ -478,7 +476,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
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);
@@ -536,7 +534,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
#endif
f->m_display = ( display ? display : wxGetDisplay() );
f->m_scale = intScale;
#if wxMOTIF_USE_RENDER_TABLE
XmRendition rendition;
XmRenderTable renderTable;
@@ -652,13 +650,13 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font, double scale,
{
XRectangle ink, logical;
WXFontSet fset = font.GetFontSet(scale, display);
XmbTextExtents( (XFontSet)fset, str.c_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