No changes, just get rid of some wxT()s in wxString unit test.

[wxWidgets.git] / src / common / btncmn.cpp

diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index fc96b645093d49a5579eb5cd8ccb5a3af23a2766..72d67726ef5ab1f4de5c3f4497487d986a93dbb1 100644 (file)
--- a/src/common/btncmn.cpp
+++ b/src/common/btncmn.cpp
@@ -30,6 +30,7 @@
     #include "wx/toplevel.h"
 #endif //WX_PRECOMP
 
     #include "wx/toplevel.h"
 #endif //WX_PRECOMP
 

+extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button";

 
 // ----------------------------------------------------------------------------
 // XTI
 
 // ----------------------------------------------------------------------------
 // XTI


@@ -74,7 +75,7 @@ wxEND_FLAGS( wxButtonStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxButton)
 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"))
 
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("The font associated with the button label"), wxT("group"))


@@ -106,7 +107,7 @@ wxWindow *wxButtonBase::SetDefault()
     return tlw->SetDefaultItem(this);
 }
 
     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) +
 {
     wxASSERT_MSG( !(dir & ~wxDIRECTION_MASK), "non-direction flag used" );
     wxASSERT_MSG( !!(dir & wxLEFT) +