X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..38e392a8d6bd7a13802276fce9fe723063e30556:/src/common/btncmn.cpp?ds=sidebyside

diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index fc96b64509..cbbfd0f14e 100644
--- a/src/common/btncmn.cpp
+++ b/src/common/btncmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxButtonBase
 // Author:      Vadim Zeitlin
 // Created:     2007-04-08
-// RCS-ID:      $Id$
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,7 @@
     #include "wx/toplevel.h"
 #endif //WX_PRECOMP
 
+extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button";
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -74,7 +74,7 @@ wxEND_FLAGS( wxButtonStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxButton)
-wxEVENT_PROPERTY( Click, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent )
+wxEVENT_PROPERTY( Click, wxEVT_BUTTON, wxCommandEvent )
 
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("The font associated with the button label"), wxT("group"))
@@ -106,7 +106,7 @@ wxWindow *wxButtonBase::SetDefault()
     return tlw->SetDefaultItem(this);
 }
 
-void wxButtonBase::SetBitmapPosition(wxDirection dir)
+void wxAnyButtonBase::SetBitmapPosition(wxDirection dir)
 {
     wxASSERT_MSG( !(dir & ~wxDIRECTION_MASK), "non-direction flag used" );
     wxASSERT_MSG( !!(dir & wxLEFT) +