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

8
src/x11/window.cpp
View File

@@ -582,7 +582,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
wxCHECK_MSG( xwindow, false, wxT("invalid window") );
wxCursor cursorToUse;
if (m_cursor.Ok())
if (m_cursor.IsOk())
cursorToUse = m_cursor;
else
cursorToUse = *wxSTANDARD_CURSOR;
@@ -1031,7 +1031,7 @@ void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int inc
int wxWindowX11::GetCharHeight() const
{
wxFont font(GetFont());
wxCHECK_MSG( font.Ok(), 0, wxT("valid window font needed") );
wxCHECK_MSG( font.IsOk(), 0, wxT("valid window font needed") );
#if wxUSE_UNICODE
// There should be an easier way.
@@ -1059,7 +1059,7 @@ int wxWindowX11::GetCharHeight() const
int wxWindowX11::GetCharWidth() const
{
wxFont font(GetFont());
wxCHECK_MSG( font.Ok(), 0, wxT("valid window font needed") );
wxCHECK_MSG( font.IsOk(), 0, wxT("valid window font needed") );
#if wxUSE_UNICODE
// There should be an easier way.
@@ -1092,7 +1092,7 @@ void wxWindowX11::DoGetTextExtent(const wxString& string,
wxFont fontToUse = GetFont();
if (theFont) fontToUse = *theFont;
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") );
if (string.empty())
{