Fix out of bounds string access in wxMSW wxDirDialog.

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index f41f45b6e6d7648149bbcce0e479927cbe7cd56f..788196ca61d13bbb3fb6b720e445d644e943907e 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -39,6 +39,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 +79,6 @@ static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-

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


@@ -78,9 +104,7 @@ bool wxButton::Create(wxWindow *parent,
         label = wxGetStockLabel(id);
 
     long ctrl_style = style & ~wxBU_ALIGN_MASK;
         label = wxGetStockLabel(id);
 
     long ctrl_style = style & ~wxBU_ALIGN_MASK;

-
-    wxASSERT_MSG( (ctrl_style & wxALIGN_MASK) == 0,
-                  _T("Some style conflicts with align flags") );
+    ctrl_style = ctrl_style & ~wxALIGN_MASK;

 
     if((style & wxBU_RIGHT) == wxBU_RIGHT)
         ctrl_style |= wxALIGN_RIGHT;
 
     if((style & wxBU_RIGHT) == wxBU_RIGHT)
         ctrl_style |= wxALIGN_RIGHT;


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

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

 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 


@@ -184,7 +211,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)


@@ -274,28 +301,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();

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