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:
@@ -634,7 +634,7 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
|
||||
case wxPENSTYLE_STIPPLE :
|
||||
{
|
||||
wxBitmap* bmp = pen.GetStipple();
|
||||
if ( bmp && bmp->Ok() )
|
||||
if ( bmp && bmp->IsOk() )
|
||||
{
|
||||
m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),
|
||||
#if wxUSE_PALETTE
|
||||
@@ -745,7 +745,7 @@ wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxB
|
||||
else
|
||||
{
|
||||
wxBitmap* bmp = brush.GetStipple();
|
||||
if ( bmp && bmp->Ok() )
|
||||
if ( bmp && bmp->IsOk() )
|
||||
{
|
||||
wxDELETE( m_brushImage );
|
||||
m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),
|
||||
@@ -1988,7 +1988,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub
|
||||
wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
|
||||
{
|
||||
ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen);
|
||||
if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
|
||||
if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT )
|
||||
return wxNullGraphicsPen;
|
||||
else
|
||||
{
|
||||
@@ -2001,7 +2001,7 @@ wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
|
||||
wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush )
|
||||
{
|
||||
ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
|
||||
if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
|
||||
if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT )
|
||||
return wxNullGraphicsBrush;
|
||||
else
|
||||
{
|
||||
@@ -2044,7 +2044,7 @@ wxGDIPlusRenderer::CreateGDIPlusFont( const wxGDIPlusContext* gc,
|
||||
const wxColour &col )
|
||||
{
|
||||
ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
|
||||
if ( font.Ok() )
|
||||
if ( font.IsOk() )
|
||||
{
|
||||
wxGraphicsFont p;
|
||||
p.SetRefData(new wxGDIPlusFontData( this, gc, font, col ));
|
||||
@@ -2057,7 +2057,7 @@ wxGDIPlusRenderer::CreateGDIPlusFont( const wxGDIPlusContext* gc,
|
||||
wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap )
|
||||
{
|
||||
ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
|
||||
if ( bitmap.Ok() )
|
||||
if ( bitmap.IsOk() )
|
||||
{
|
||||
wxGraphicsBitmap p;
|
||||
p.SetRefData(new wxGDIPlusBitmapData( this , bitmap ));
|
||||
|
Reference in New Issue
Block a user