Make the gui test still run on the buildbot when the non-gui tests fail.

[wxWidgets.git] / src / osx / bmpbuttn_osx.cpp

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index 6264a9baa8c0b95c9eabff8c0ff1cd979dff97c2..9a1cb174ca5baece3f52794d81c237058335a737 100644 (file)
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -22,10 +22,6 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 

-BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
-    EVT_ENTER_WINDOW(wxBitmapButton::OnEnterWindow)
-    EVT_LEAVE_WINDOW(wxBitmapButton::OnLeaveWindow)
-END_EVENT_TABLE()

 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 


@@ -66,23 +62,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)
-{
-    wxBitmapButtonBase::DoSetBitmap(bitmap, which);
-
-    // we don't support any other states currently
-    if ( which == State_Normal )
-    {
-        m_peer->SetBitmap( bitmap );
-    }
-    else if ( which == State_Pressed )
-    {
-        wxBitmapButtonImpl* bi = dynamic_cast<wxBitmapButtonImpl*> (m_peer);
-        if ( bi )
-            bi->SetPressedBitmap(bitmap);
-    }
-}
-

 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize best(m_marginX, m_marginY);
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize best(m_marginX, m_marginY);


@@ -97,16 +76,4 @@ wxSize wxBitmapButton::DoGetBestSize() const
     return best;
 }
 
     return best;
 }
 

-void wxBitmapButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
-{
-    if ( DoGetBitmap( State_Current ).IsOk() )
-        m_peer->SetBitmap( DoGetBitmap( State_Current ) );       
-}
-
-void wxBitmapButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
-{
-    if ( DoGetBitmap( State_Current ).IsOk() )
-        m_peer->SetBitmap( DoGetBitmap( State_Normal ) );       
-}
-

 #endif // wxUSE_BMPBUTTON
 #endif // wxUSE_BMPBUTTON