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:
@@ -55,7 +55,7 @@ void wxMemoryDCImpl::Init()
|
||||
|
||||
wxMemoryDCImpl::~wxMemoryDCImpl()
|
||||
{
|
||||
if ( m_selected.Ok() )
|
||||
if ( m_selected.IsOk() )
|
||||
{
|
||||
m_selected.EndRawAccess() ;
|
||||
wxDELETE(m_graphicContext);
|
||||
@@ -64,14 +64,14 @@ wxMemoryDCImpl::~wxMemoryDCImpl()
|
||||
|
||||
void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
|
||||
{
|
||||
if ( m_selected.Ok() )
|
||||
if ( m_selected.IsOk() )
|
||||
{
|
||||
m_selected.EndRawAccess() ;
|
||||
wxDELETE(m_graphicContext);
|
||||
}
|
||||
|
||||
m_selected = bitmap;
|
||||
if (m_selected.Ok())
|
||||
if (m_selected.IsOk())
|
||||
{
|
||||
if ( m_selected.GetDepth() != 1 )
|
||||
m_selected.UseAlpha() ;
|
||||
@@ -97,7 +97,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
|
||||
|
||||
void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
|
||||
{
|
||||
if (m_selected.Ok())
|
||||
if (m_selected.IsOk())
|
||||
{
|
||||
if (width)
|
||||
(*width) = m_selected.GetWidth();
|
||||
|
Reference in New Issue
Block a user