Replaced Ok() occurrences with IsOk() throughout trunk.
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:
@@ -734,10 +734,10 @@ wxString wxTextCtrl::GetRange(long from, long to) const
|
||||
wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
|
||||
|
||||
wxFont font = m_defaultStyle.GetFont();
|
||||
if ( !font.Ok() )
|
||||
if ( !font.IsOk() )
|
||||
font = GetFont();
|
||||
|
||||
if ( font.Ok() )
|
||||
if ( font.IsOk() )
|
||||
{
|
||||
encoding = font.GetEncoding();
|
||||
}
|
||||
@@ -1072,10 +1072,10 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags)
|
||||
if ( GetRichVersion() > 1 )
|
||||
{
|
||||
wxFont font = m_defaultStyle.GetFont();
|
||||
if ( !font.Ok() )
|
||||
if ( !font.IsOk() )
|
||||
font = GetFont();
|
||||
|
||||
if ( font.Ok() )
|
||||
if ( font.IsOk() )
|
||||
{
|
||||
wxFontEncoding encoding = font.GetEncoding();
|
||||
if ( encoding != wxFONTENCODING_SYSTEM )
|
||||
@@ -2657,7 +2657,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
|
||||
lf.lfWeight = FW_NORMAL;
|
||||
|
||||
wxFont font = wxCreateFontFromLogFont(& lf);
|
||||
if (font.Ok())
|
||||
if (font.IsOk())
|
||||
{
|
||||
style.SetFont(font);
|
||||
}
|
||||
|
Reference in New Issue
Block a user