Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Ok() occurrences with IsOk() throughout trunk.

Browse Source 
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:
Dimitri Schoolwerth
2011-05-03 16:29:04 +00:00
parent ddd7e4307b
commit a1b806b982
322 changed files with 1261 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/dcpsg.cpp
View File

@@ -968,11 +968,11 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!bitmap.Ok()) return;
if (!bitmap.IsOk()) return;
wxImage image = bitmap.ConvertToImage();
if (!image.Ok()) return;
if (!image.IsOk()) return;
wxCoord w = image.GetWidth();
wxCoord h = image.GetHeight();
@@ -1038,7 +1038,7 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font )
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!font.Ok()) return;
if (!font.IsOk()) return;
m_font = font;
@@ -1133,7 +1133,7 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!pen.Ok()) return;
if (!pen.IsOk()) return;
int oldStyle = m_pen.GetStyle();
@@ -1240,7 +1240,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!brush.Ok()) return;
if (!brush.IsOk()) return;
m_brush = brush;
@@ -1288,7 +1288,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
if ( !textbuf )
return;
if (m_textForegroundColour.Ok())
if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
@@ -1398,7 +1398,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
SetFont( m_font );
if (m_textForegroundColour.Ok())
if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
@@ -1957,7 +1957,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord wxPostScriptDCImpl::GetCharHeight() const
{
if (m_font.Ok())
if (m_font.IsOk())
return m_font.GetPointSize();
else
return 12;
@@ -2055,7 +2055,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
/ example:
/
/ wxPostScriptDC dc(NULL, true);
/ if (dc.Ok()){
/ if (dc.IsOk()){
/ wxSetAFMPath("d:\\wxw161\\afm\\");
/ dc.StartDoc("Test");
/ dc.StartPage();