override DoSetBitmap() instead of SetBitmapLabel()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 265d2757bd2d91c57337667d7eb42bd9d19a320c..df98620825d7b39504cd58e887fffbc5d6d49838 100644 (file)
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -9,19 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_BMPBUTTN_H_
-#define _WX_BMPBUTTN_H_
+#ifndef _WX_OSX_BMPBUTTN_H_
+#define _WX_OSX_BMPBUTTN_H_

 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
-

 #define wxDEFAULT_BUTTON_MARGIN 4
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-

 public:
     wxBitmapButton()
         {
 public:
     wxBitmapButton()
         {


@@ -43,11 +39,12 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 

-    virtual void SetBitmapLabel(const wxBitmap& bitmap);
-

 protected:
     virtual wxSize DoGetBestSize() const;    
 protected:
     virtual wxSize DoGetBestSize() const;    

+
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
+
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)

 };
 
 };
 

-#endif
-    // _WX_BMPBUTTN_H_
+#endif // _WX_OSX_BMPBUTTN_H_

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index fd4d1fa5bf61391f2be94d4e9bd9e3da4b264562..c79f4fd47c51582e1ffe61d869bb1c59f5539bc4 100644 (file)
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -61,11 +61,15 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
+void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)

 {
 {

-    InvalidateBestSize();
+    wxBitmapButtonBase::DoSetBitmap(bitmap, which);

 
 

-    m_peer->SetBitmap( bitmap );
+    // we don't support any other states currently
+    if ( which == State_Normal )
+    {
+        m_peer->SetBitmap( bitmap );
+    }

 }
 
 wxSize wxBitmapButton::DoGetBestSize() const
 }
 
 wxSize wxBitmapButton::DoGetBestSize() const