Don't use result for both NS and wx button ID values.

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index a812e9e25e3fd186cffbe9959a1698ce9a329294..7bda74e449451a0aafc15ed36fbe2d4765171f00 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univbutton.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -43,6 +39,34 @@
 #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
 // ----------------------------------------------------------------------------
@@ -82,9 +106,7 @@ bool wxButton::Create(wxWindow *parent,
         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;
@@ -104,8 +126,11 @@ bool wxButton::Create(wxWindow *parent,
         return false;
 
     SetLabel(label);
-    SetImageLabel(bitmap);
-    // SetBestSize(size); -- called by SetImageLabel()
+
+    if (bitmap.Ok())
+        SetImageLabel(bitmap); // SetInitialSize called by SetImageLabel()
+    else
+        SetInitialSize(size);
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
@@ -278,6 +303,14 @@ bool wxButton::PerformAction(const wxControlAction& action,
     return true;
 }
 
+/* static */
+wxInputHandler *wxButton::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdButtonInputHandler s_handlerBtn(handlerDef);
+
+    return &s_handlerBtn;
+}
+
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
@@ -294,12 +327,14 @@ void wxButton::SetImageMargins(wxCoord x, wxCoord y)
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 
-    SetBestSize(wxDefaultSize);
+    SetInitialSize(wxDefaultSize);
 }
 
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
 {
     m_isDefault = true;
+
+    return wxButtonBase::SetDefault();
 }
 
 // ============================================================================