Use wxCOMPtr throughout wxWebViewIE to simplify the code and reduce the chance of...

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

diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index fc96b645093d49a5579eb5cd8ccb5a3af23a2766..4ddc6a5bad407fd1d769a0ad11bff21826bf9d63 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


@@ -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) +