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:
@@ -84,7 +84,7 @@ void wxColourPickerCtrl::SetColour(const wxColour &col)
|
||||
bool wxColourPickerCtrl::SetColour(const wxString &text)
|
||||
{
|
||||
wxColour col(text); // smart wxString->wxColour conversion
|
||||
if ( !col.Ok() )
|
||||
if ( !col.IsOk() )
|
||||
return false;
|
||||
M_PICKER->SetColour(col);
|
||||
UpdateTextCtrlFromPicker();
|
||||
@@ -105,7 +105,7 @@ void wxColourPickerCtrl::UpdatePickerFromTextCtrl()
|
||||
|
||||
// wxString -> wxColour conversion
|
||||
wxColour col(m_text->GetValue());
|
||||
if ( !col.Ok() )
|
||||
if ( !col.IsOk() )
|
||||
return; // invalid user input
|
||||
|
||||
if (M_PICKER->GetColour() != col)
|
||||
|
||||
Reference in New Issue
Block a user