Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,11 +22,11 @@
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/log.h"
|
||||
#include "wx/utils.h"
|
||||
#endif
|
||||
|
||||
#include "wx/fontutil.h"
|
||||
#include "wx/cmndata.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "wx/settings.h"
|
||||
@@ -62,7 +62,7 @@ public:
|
||||
int family = wxFONTFAMILY_DEFAULT,
|
||||
int style = wxFONTSTYLE_NORMAL,
|
||||
int weight = wxFONTWEIGHT_NORMAL,
|
||||
bool underlined = FALSE,
|
||||
bool underlined = false,
|
||||
const wxString& faceName = wxEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
|
||||
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
bool HasNativeFont() const
|
||||
{
|
||||
// we always have a Pango font description
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
// setters: all of them also take care to modify m_nativeFontInfo if we
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
void SetFaceName(const wxString& facename);
|
||||
void SetEncoding(wxFontEncoding encoding);
|
||||
|
||||
void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
|
||||
void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
|
||||
bool GetNoAntiAliasing() const { return m_noAA; }
|
||||
|
||||
// and this one also modifies all the other font data fields
|
||||
@@ -159,7 +159,7 @@ void wxFontRefData::Init(int pointSize,
|
||||
m_underlined = underlined;
|
||||
m_encoding = encoding;
|
||||
|
||||
m_noAA = FALSE;
|
||||
m_noAA = false;
|
||||
|
||||
// Create native font info
|
||||
m_nativeFontInfo.description = pango_font_description_new();
|
||||
@@ -196,7 +196,7 @@ void wxFontRefData::Init(int pointSize,
|
||||
|
||||
void wxFontRefData::InitFromNative()
|
||||
{
|
||||
m_noAA = FALSE;
|
||||
m_noAA = false;
|
||||
|
||||
// Get native info
|
||||
PangoFontDescription *desc = m_nativeFontInfo.description;
|
||||
@@ -231,7 +231,7 @@ void wxFontRefData::InitFromNative()
|
||||
}
|
||||
|
||||
// Pango description are never underlined (?)
|
||||
m_underlined = FALSE;
|
||||
m_underlined = false;
|
||||
|
||||
// always with GTK+ 2
|
||||
m_encoding = wxFONTENCODING_UTF8;
|
||||
@@ -374,7 +374,7 @@ bool wxFont::Create( int pointSize,
|
||||
m_refData = new wxFontRefData(pointSize, family, style, weight,
|
||||
underlined, face, encoding);
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxFont::Create(const wxString& fontname)
|
||||
@@ -384,12 +384,12 @@ bool wxFont::Create(const wxString& fontname)
|
||||
{
|
||||
*this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
m_refData = new wxFontRefData(fontname);
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxFont::Unshare()
|
||||
@@ -483,7 +483,7 @@ int wxFont::GetWeight() const
|
||||
|
||||
bool wxFont::GetUnderlined() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
|
||||
wxCHECK_MSG( Ok(), false, wxT("invalid font") );
|
||||
|
||||
return M_FONTDATA->m_underlined;
|
||||
}
|
||||
@@ -511,7 +511,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
|
||||
|
||||
bool wxFont::IsFixedWidth() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
|
||||
wxCHECK_MSG( Ok(), false, wxT("invalid font") );
|
||||
|
||||
return wxFontBase::IsFixedWidth();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user