X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e4c2912462461f9a2133ac39475457d668d1686..cdc48273b49b0b90d9587a1ecc5935d38a160620:/src/osx/button_osx.cpp

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 29afcd3882..2fef7837da 100644
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -25,6 +25,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
+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& lbl,
@@ -34,6 +39,9 @@ bool wxButton::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name)
 {
+    m_marginX =
+    m_marginY = 0;
+
     // FIXME: this hack is needed because we're called from
     //        wxBitmapButton::Create() with this style and we currently use a
     //        different wxWidgetImpl method (CreateBitmapButton() rather than
@@ -42,7 +50,7 @@ bool wxButton::Create(wxWindow *parent,
     //        this check
     if ( style & wxBU_NOTEXT )
     {
-        return wxControl::Create(parent, id, lbl, pos, size, style,
+        return wxControl::Create(parent, id, pos, size, style,
                                  validator, name);
     }
 
@@ -79,28 +87,32 @@ void wxButton::SetLabel(const wxString& label)
     wxButtonBase::SetLabel(label);
 }
 
-// there is no support for button bitmaps in wxOSX/Carbon so there is no need
-// for these methods there
-#if wxOSX_USE_COCOA
-
 wxBitmap wxButton::DoGetBitmap(State which) const
 {
-    return which == State_Normal ? m_peer->GetBitmap() : wxBitmap();
+    return m_bitmaps[which];
 }
 
 void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 {
+    m_bitmaps[which] = bitmap;
+    
     if ( which == State_Normal )
         m_peer->SetBitmap(bitmap);
+    else if ( which == State_Pressed )
+    {
+        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (m_peer);
+        if ( bi )
+            bi->SetPressedBitmap(bitmap);
+    }
+    InvalidateBestSize();
 }
 
 void wxButton::DoSetBitmapPosition(wxDirection dir)
 {
     m_peer->SetBitmapPosition(dir);
+    InvalidateBestSize();
 }
 
-#endif // wxOSX_USE_COCOA
-
 wxWindow *wxButton::SetDefault()
 {
     wxWindow *btnOldDefault = wxButtonBase::SetDefault();
@@ -121,6 +133,18 @@ void wxButton::Command (wxCommandEvent & WXUNUSED(event))
     // ProcessCommand(event);
 }
 
+void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
+{
+    if ( DoGetBitmap( State_Current ).IsOk() )
+        m_peer->SetBitmap( DoGetBitmap( State_Current ) );       
+}
+
+void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
+{
+    if ( DoGetBitmap( State_Current ).IsOk() )
+        m_peer->SetBitmap( DoGetBitmap( State_Normal ) );       
+}
+
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);