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:
@@ -1745,7 +1745,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour&
|
||||
// the colour doesn't use #RRGGBB format, check if it is symbolic
|
||||
// colour name:
|
||||
clr = GetSystemColour(v);
|
||||
if (clr.Ok())
|
||||
if (clr.IsOk())
|
||||
return clr;
|
||||
|
||||
ReportParamError
|
||||
@@ -1823,7 +1823,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node,
|
||||
art_id, art_client) )
|
||||
{
|
||||
wxBitmap stockArt(wxArtProvider::GetBitmap(art_id, art_client, size));
|
||||
if ( stockArt.Ok() )
|
||||
if ( stockArt.IsOk() )
|
||||
return stockArt;
|
||||
}
|
||||
|
||||
@@ -1847,7 +1847,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node,
|
||||
wxImage img(name);
|
||||
#endif
|
||||
|
||||
if (!img.Ok())
|
||||
if (!img.IsOk())
|
||||
{
|
||||
ReportParamError
|
||||
(
|
||||
@@ -2277,7 +2277,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
|
||||
// is this font based on a system font?
|
||||
wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));
|
||||
|
||||
if (font.Ok())
|
||||
if (font.IsOk())
|
||||
{
|
||||
if (hasSize && isize != -1)
|
||||
font.SetPointSize(isize);
|
||||
|
Reference in New Issue
Block a user