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

Replaced Ok() occurrences with IsOk() throughout trunk.

Browse Source 
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-05-03 16:29:04 +00:00
parent ddd7e4307b
commit a1b806b982
322 changed files with 1261 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk1/font.cpp
View File

@@ -520,14 +520,14 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
int wxFont::GetPointSize() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceName() const
{
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->m_faceName;
}
@@ -539,28 +539,28 @@ wxFontFamily wxFont::DoGetFamily() const
wxFontStyle wxFont::GetStyle() const
{
wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
return M_FONTDATA->m_style;
}
wxFontWeight wxFont::GetWeight() const
{
wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
return M_FONTDATA->m_weight;
}
bool wxFont::GetUnderlined() const
{
wxCHECK_MSG( Ok(), false, wxT("invalid font") );
wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
wxFontEncoding wxFont::GetEncoding() const
{
wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
// m_encoding is unused in wxGTK2, return encoding that the user set.
return M_FONTDATA->m_encoding;
@@ -568,7 +568,7 @@ wxFontEncoding wxFont::GetEncoding() const
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
if ( !M_FONTDATA->HasNativeFont() )
{
@@ -583,7 +583,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
bool wxFont::IsFixedWidth() const
{
wxCHECK_MSG( Ok(), false, wxT("invalid font") );
wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
if ( M_FONTDATA->HasNativeFont() )
{
@@ -696,7 +696,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
{
GdkFont *font = NULL;
wxCHECK_MSG( Ok(), font, wxT("invalid font") );
wxCHECK_MSG( IsOk(), font, wxT("invalid font") );
long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);