X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/univ/button.cpp?ds=sidebyside diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 788196ca61..7f4c253d14 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/button.cpp +// Name: src/univ/button.cpp // Purpose: wxButton // Author: Vadim Zeitlin // Modified by: @@ -125,7 +125,7 @@ bool wxButton::Create(wxWindow *parent, SetLabel(label); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); // SetInitialSize called by SetBitmap() else SetInitialSize(size); @@ -170,7 +170,7 @@ wxSize wxButton::DoGetBestClientSize() const wxCoord width, height; dc.GetMultiLineTextExtent(GetLabel(), &width, &height); - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) { // allocate extra space for the bitmap wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY; @@ -221,7 +221,7 @@ bool wxButton::DoDrawBackground(wxDC& dc) rect.width = size.x; rect.height = size.y; - if ( GetBackgroundBitmap().Ok() ) + if ( GetBackgroundBitmap().IsOk() ) { // get the bitmap and the flags int alignment;