/////////////////////////////////////////////////////////////////////////////
-// Name: univ/button.cpp
+// Name: src/univ/button.cpp
// Purpose: wxButton
// Author: Vadim Zeitlin
// Modified by:
// implementation
// ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
// ----------------------------------------------------------------------------
// creation
// ----------------------------------------------------------------------------
SetLabel(label);
- if (bitmap.Ok())
+ if (bitmap.IsOk())
SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
else
SetInitialSize(size);
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;
renderer->DrawButtonBorder();
}
- renderer->DrawLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
+ renderer->DrawButtonLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
}
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;