Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

[wxWidgets.git] / src / univ / button.cpp

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 995a3becaafc756434046b75cfed3584b6a4846f..61203eab642292bab69d26cb129fbad6160f98bd 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/button.cpp
+// Name:        src/univ/button.cpp

 // Purpose:     wxButton
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.08.00
 // Purpose:     wxButton
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.08.00

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -39,6 +38,34 @@
 #include "wx/univ/colschem.h"
 #include "wx/stockitem.h"
 
 #include "wx/univ/colschem.h"
 #include "wx/stockitem.h"
 

+// ----------------------------------------------------------------------------
+// wxStdButtonInputHandler: translates SPACE and ENTER keys and the left mouse
+// click into button press/release actions
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStdButtonInputHandler : public wxStdInputHandler
+{
+public:
+    wxStdButtonInputHandler(wxInputHandler *inphand);
+
+    virtual bool HandleKey(wxInputConsumer *consumer,
+                           const wxKeyEvent& event,
+                           bool pressed);
+    virtual bool HandleMouse(wxInputConsumer *consumer,
+                             const wxMouseEvent& event);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,
+                                 const wxMouseEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer,
+                             const wxFocusEvent& event);
+    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
+
+private:
+    // the window (button) which has capture or NULL and the flag telling if
+    // the mouse is inside the button which captured it or not
+    wxWindow *m_winCapture;
+    bool      m_winHasMouse;
+};
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -51,8 +78,6 @@ static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-

 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------


@@ -98,8 +123,11 @@ bool wxButton::Create(wxWindow *parent,
         return false;
 
     SetLabel(label);
         return false;
 
     SetLabel(label);

-    SetImageLabel(bitmap);
-    // SetBestSize(size); -- called by SetImageLabel()
+
+    if (bitmap.IsOk())
+        SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
+    else
+        SetInitialSize(size);

 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 


@@ -141,7 +169,7 @@ wxSize wxButton::DoGetBestClientSize() const
     wxCoord width, height;
     dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
 
     wxCoord width, height;
     dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
 

-    if ( m_bitmap.Ok() )
+    if ( m_bitmap.IsOk() )

     {
         // allocate extra space for the bitmap
         wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY;
     {
         // allocate extra space for the bitmap
         wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY;


@@ -182,7 +210,7 @@ void wxButton::DoDraw(wxControlRenderer *renderer)
         renderer->DrawButtonBorder();
     }
 
         renderer->DrawButtonBorder();
     }
 

-    renderer->DrawLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
+    renderer->DrawButtonLabel(m_bitmap, m_marginBmpX, m_marginBmpY);

 }
 
 bool wxButton::DoDrawBackground(wxDC& dc)
 }
 
 bool wxButton::DoDrawBackground(wxDC& dc)


@@ -192,7 +220,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
     rect.width = size.x;
     rect.height = size.y;
 
     rect.width = size.x;
     rect.height = size.y;
 

-    if ( GetBackgroundBitmap().Ok() )
+    if ( GetBackgroundBitmap().IsOk() )

     {
         // get the bitmap and the flags
         int alignment;
     {
         // get the bitmap and the flags
         int alignment;


@@ -249,7 +277,7 @@ void wxButton::Toggle()
 
 void wxButton::Click()
 {
 
 void wxButton::Click()
 {

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    wxCommandEvent event(wxEVT_BUTTON, GetId());

     InitCommandEvent(event);
     Command(event);
 }
     InitCommandEvent(event);
     Command(event);
 }


@@ -272,28 +300,41 @@ bool wxButton::PerformAction(const wxControlAction& action,
     return true;
 }
 
     return true;
 }
 

+/* static */
+wxInputHandler *wxButton::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdButtonInputHandler s_handlerBtn(handlerDef);
+
+    return &s_handlerBtn;
+}
+

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 

-void wxButton::SetImageLabel(const wxBitmap& bitmap)
+void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)

 {
 {

-    m_bitmap = bitmap;
+    // we support only one bitmap right now, although this wouldn't be
+    // difficult to change
+    if ( which == State_Normal )
+        m_bitmap = bitmap;

 
 

-    SetImageMargins(DEFAULT_BTN_MARGIN_X, DEFAULT_BTN_MARGIN_Y);
+    SetBitmapMargins(DEFAULT_BTN_MARGIN_X, DEFAULT_BTN_MARGIN_Y);

 }
 
 }
 

-void wxButton::SetImageMargins(wxCoord x, wxCoord y)
+void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y)

 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 
 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 

-    SetBestSize(wxDefaultSize);
+    SetInitialSize(wxDefaultSize);

 }
 
 }
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
     m_isDefault = true;
 {
     m_isDefault = true;

+
+    return wxButtonBase::SetDefault();

 }
 
 // ============================================================================
 }
 
 // ============================================================================