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

12
src/generic/srchctlg.cpp
View File

@@ -799,7 +799,7 @@ bool wxSearchCtrl::SetFont(const wxFont& font)
void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
{
m_searchBitmap = bitmap;
m_searchBitmapUser = bitmap.Ok();
m_searchBitmapUser = bitmap.IsOk();
if ( m_searchBitmapUser )
{
if ( m_searchButton && !HasMenu() )
@@ -819,7 +819,7 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
{
m_searchMenuBitmap = bitmap;
m_searchMenuBitmapUser = bitmap.Ok();
m_searchMenuBitmapUser = bitmap.IsOk();
if ( m_searchMenuBitmapUser )
{
if ( m_searchButton && m_menu )
@@ -839,7 +839,7 @@ void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
{
m_cancelBitmap = bitmap;
m_cancelBitmapUser = bitmap.Ok();
m_cancelBitmapUser = bitmap.IsOk();
if ( m_cancelBitmapUser )
{
if ( m_cancelButton )
@@ -1119,7 +1119,7 @@ void wxSearchCtrl::RecalcBitmaps()
if ( !m_searchBitmapUser )
{
if (
!m_searchBitmap.Ok() ||
!m_searchBitmap.IsOk() ||
m_searchBitmap.GetHeight() != bitmapHeight ||
m_searchBitmap.GetWidth() != bitmapWidth
)
@@ -1137,7 +1137,7 @@ void wxSearchCtrl::RecalcBitmaps()
if ( !m_searchMenuBitmapUser )
{
if (
!m_searchMenuBitmap.Ok() ||
!m_searchMenuBitmap.IsOk() ||
m_searchMenuBitmap.GetHeight() != bitmapHeight ||
m_searchMenuBitmap.GetWidth() != bitmapWidth
)
@@ -1155,7 +1155,7 @@ void wxSearchCtrl::RecalcBitmaps()
if ( !m_cancelBitmapUser )
{
if (
!m_cancelBitmap.Ok() ||
!m_cancelBitmap.IsOk() ||
m_cancelBitmap.GetHeight() != bitmapHeight ||
m_cancelBitmap.GetWidth() != bitmapHeight
)