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:
@@ -490,49 +490,49 @@ void wxPen::SetCap(
|
||||
|
||||
wxColour wxPen::GetColour() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_vColour;
|
||||
}
|
||||
|
||||
int wxPen::GetWidth() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_nWidth;
|
||||
}
|
||||
|
||||
wxPenStyle wxPen::GetStyle() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_nStyle;
|
||||
}
|
||||
|
||||
wxPenJoin wxPen::GetJoin() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_nJoin;
|
||||
}
|
||||
|
||||
wxPenCap wxPen::GetCap() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_nCap;
|
||||
}
|
||||
|
||||
int wxPen::GetPS() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), 0, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), 0, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_hPen;
|
||||
}
|
||||
|
||||
int wxPen::GetDashes(wxDash** ptr) const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
|
||||
|
||||
*ptr = M_PENDATA->m_dash;
|
||||
return M_PENDATA->m_nbDash;
|
||||
@@ -540,21 +540,21 @@ int wxPen::GetDashes(wxDash** ptr) const
|
||||
|
||||
wxDash* wxPen::GetDash() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_dash;
|
||||
}
|
||||
|
||||
int wxPen::GetDashCount() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
|
||||
|
||||
return M_PENDATA->m_nbDash;
|
||||
}
|
||||
|
||||
wxBitmap* wxPen::GetStipple() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
|
||||
wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
|
||||
|
||||
return &(M_PENDATA->m_vStipple);
|
||||
}
|
||||
|
Reference in New Issue
Block a user