X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aae91497f6ac36a76d3313cf405cae0f098ea1d1..12fddefcbbc1731b7de244d484f946d47402740d:/src/motif/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index d252d26a56..721409d8a4 100644
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -101,8 +101,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
                    XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
                    (XtPointer) this);
 
-    SetCanAddEventHandler(TRUE);
-    
     wxSize best = m_bmpNormal.Ok() ? GetBestSize() : wxSize(30, 30);
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
@@ -177,7 +175,7 @@ void wxBitmapButton::DoSetBitmap()
             m_bmpNormal = newBitmap;
             m_bitmapCache.SetBitmap( m_bmpNormal );
 
-            pixmap = (Pixmap) m_bmpNormal.GetPixmap();
+            pixmap = (Pixmap) m_bmpNormal.GetDrawable();
         }
         else
         {
@@ -201,7 +199,7 @@ void wxBitmapButton::DoSetBitmap()
                     wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
                 m_bmpDisabled = newBitmap;
 
-                insensPixmap = (Pixmap) m_bmpDisabled.GetPixmap();
+                insensPixmap = (Pixmap) m_bmpDisabled.GetDrawable();
             }
             else
                 insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
@@ -226,7 +224,7 @@ void wxBitmapButton::DoSetBitmap()
                     wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
                 m_bmpSelected = newBitmap;
 
-                armPixmap = (Pixmap) m_bmpSelected.GetPixmap();
+                armPixmap = (Pixmap) m_bmpSelected.GetDrawable();
             }
             else
                 armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);
@@ -266,7 +264,7 @@ void wxBitmapButton::DoSetBitmap()
 
 void wxBitmapButton::ChangeBackgroundColour()
 {
-    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
+    wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
 
     // Must reset the bitmaps since the colours have changed.
     DoSetBitmap();