Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / motif / bmpbuttn.cpp

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 0ba91fd8fd6c7b7489b44571b92b12bb6f607070..1246d1de9d67848f682dd43ce631545593095ec2 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -30,8 +30,6 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 // Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
 wxBitmapButton::wxBitmapButton()
 {
     m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
@@ -89,7 +87,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
     if( size.y != -1 ) best.y = size.y;
 
     PostCreation();
-    DoSetBitmap();
+    OnSetBitmap();
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
@@ -222,7 +220,7 @@ void wxBitmapButton::ChangeBackgroundColour()
     wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, true);
 
     // Must reset the bitmaps since the colours have changed.
-    DoSetBitmap();
+    OnSetBitmap();
 }
 
 wxSize wxBitmapButton::DoGetBestSize() const