copy item text for app menu items from wx menus

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

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index fd4d1fa5bf61391f2be94d4e9bd9e3da4b264562..4e872a906e15e4056a9da3acdadaab50aa49559d 100644 (file)
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: bmpbuttn.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -20,8 +20,6 @@
     #include "wx/dcmemory.h"
 #endif
 
     #include "wx/dcmemory.h"
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-

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


@@ -37,8 +35,8 @@ bool wxBitmapButton::Create( wxWindow *parent,
 {
     m_macIsUserPane = false;
 
 {
     m_macIsUserPane = false;
 

-    if ( !wxControl::Create( parent, id, pos, size, style | wxBU_NOTEXT,
-                             validator, name ) )
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
+                                     validator, name) )

         return false;
 
     if ( style & wxBU_AUTODRAW )
         return false;
 
     if ( style & wxBU_AUTODRAW )


@@ -61,13 +59,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
-{
-    InvalidateBestSize();
-
-    m_peer->SetBitmap( bitmap );
-}
-

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