Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index f8be59aabb53ebd1812aa5d04f22afd527e4a4e4..cbbfd0f14e961ec777bc89ed0ab65b910b9317fd 100644 (file)
--- 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
 ///////////////////////////////////////////////////////////////////////////////
@@ -75,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"))
@@ -107,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) +