X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d15694e8cad1d44087323bd568ca33ff5b354f2c..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/osx/button_osx.cpp?ds=sidebyside

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 7867f9f5ae..6984a9af08 100644
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -42,11 +42,6 @@ bool IsHelpButtonWithStandardLabel(wxWindowID id, const wxString& label)
 
 } // anonymous namespace
 
-BEGIN_EVENT_TABLE(wxButton, wxControl)
-    EVT_ENTER_WINDOW(wxButton::OnEnterWindow)
-    EVT_LEAVE_WINDOW(wxButton::OnLeaveWindow)
-END_EVENT_TABLE()
-
 bool wxButton::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& labelOrig,
@@ -105,58 +100,9 @@ void wxButton::SetLabel(const wxString& label)
         return;
     }
 
-    if ( HasFlag(wxBU_NOTEXT) )
-    {
-        // just store the label internally but don't really use it for the
-        // button
-        m_labelOrig =
-        m_label = label;
-        return;
-    }
-
-    wxButtonBase::SetLabel(label);
-}
-
-wxBitmap wxButton::DoGetBitmap(State which) const
-{
-    return m_bitmaps[which];
-}
-
-void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
-{
-    m_bitmaps[which] = bitmap;
-
-    if ( which == State_Normal )
-        GetPeer()->SetBitmap(bitmap);
-    else if ( which == State_Pressed )
-    {
-        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (GetPeer());
-        if ( bi )
-            bi->SetPressedBitmap(bitmap);
-    }
-    InvalidateBestSize();
-}
-
-void wxButton::DoSetBitmapPosition(wxDirection dir)
-{
-    GetPeer()->SetBitmapPosition(dir);
-    InvalidateBestSize();
+    wxAnyButton::SetLabel(label);
 }
 
-#if wxUSE_MARKUP && wxOSX_USE_COCOA
-
-bool wxButton::DoSetLabelMarkup(const wxString& markup)
-{
-    if ( !wxButtonBase::DoSetLabelMarkup(markup) )
-        return false;
-
-    GetPeer()->SetLabelMarkup(markup);
-
-    return true;
-}
-
-#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
-
 wxWindow *wxButton::SetDefault()
 {
     wxWindow *btnOldDefault = wxButtonBase::SetDefault();
@@ -177,18 +123,6 @@ void wxButton::Command (wxCommandEvent & WXUNUSED(event))
     // ProcessCommand(event);
 }
 
-void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
-{
-    if ( DoGetBitmap( State_Current ).IsOk() )
-        GetPeer()->SetBitmap( DoGetBitmap( State_Current ) );
-}
-
-void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
-{
-    if ( DoGetBitmap( State_Current ).IsOk() )
-        GetPeer()->SetBitmap( DoGetBitmap( State_Normal ) );
-}
-
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
@@ -197,6 +131,12 @@ bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
     return true;
 }
 
+/* static */
+wxSize wxButtonBase::GetDefaultSize()
+{
+    return wxAnyButton::GetDefaultSize();
+}
+
 //-------------------------------------------------------
 // wxDisclosureTriangle
 //-------------------------------------------------------
@@ -211,7 +151,7 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
     SetPeer(wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
-    // passing the text in the param doesn't seem to work, so lets do it again
+    // passing the text in the param doesn't seem to work, so let's do it again
     SetLabel( label );
 
     return true;