const wxValidator& validator,
const wxString& name)
{
+ // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create
+ // essentially creates an additional button
+ if ( !wxControl::Create(parent, id, pos, size,
+ style, validator, name) )
+ return false;
+
m_bmpNormal = bitmap;
- m_marginX = 0;
- m_marginY = 0;
+ if (style & wxBU_AUTODRAW)
+ {
+ m_marginX = wxDEFAULT_BUTTON_MARGIN;
+ m_marginY = wxDEFAULT_BUTTON_MARGIN;
+ }
+ else
+ {
+ m_marginX = 0;
+ m_marginY = 0;
+ }
- // int x = pos.x;
- // int y = pos.y;
int width = size.x;
int height = size.y;
- if (id == -1)
- m_windowId = NewControlId();
- else
- m_windowId = id;
-
if ( width == -1 && bitmap.Ok())
- width = bitmap.GetWidth() + 2*m_marginX;
+ width = bitmap.GetWidth() + 2*m_marginX;
if ( height == -1 && bitmap.Ok())
- height = bitmap.GetHeight() + 2*m_marginY;
+ height = bitmap.GetHeight() + 2*m_marginY;
Rect bounds ;
Str255 title ;