default button on older systems was not shown with OK, but empty, resulting in wxID_C...

[wxWidgets.git] / src / mac / carbon / spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index fe8e0b1edc871bae421c088c401f528de810d206..908ad7a0b56bd1623e9ae94098ad8ef57175c7b2 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -8,25 +8,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "spinctrl.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_SPINCTRL
 
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 #include "wx/textctrl.h"
-
+#include "wx/containr.h"
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
+// the focus rect around a text may have 4 pixels in each direction
+// we handle these problems right now in an extended vis region of a window
+static const wxCoord TEXTBORDER = 4 ;
 // the margin between the text control and the spin
-static const wxCoord MARGIN = 8;
+static const wxCoord MARGIN = 8 - TEXTBORDER;
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrlText: text control used by spin control
@@ -36,7 +35,7 @@ class wxSpinCtrlText : public wxTextCtrl
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
-        : wxTextCtrl(spin , -1, value, wxDefaultPosition, wxSize(40, 22))
+        : wxTextCtrl(spin , -1, value, wxDefaultPosition, wxSize(40, -1))
     {
         m_spin = spin;
         
@@ -44,6 +43,15 @@ public:
         SetSizeHints(-1,-1);
     }
 
+    bool ProcessEvent(wxEvent &event)
+    {
+        // Hand button down events to wxSpinCtrl. Doesn't work.
+        if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
+            return TRUE;
+
+        return wxTextCtrl::ProcessEvent( event );
+    }
+
 protected:
     void OnTextChange(wxCommandEvent& event)
     {
@@ -51,20 +59,28 @@ protected:
         if ( m_spin->GetTextValue(&val) )
         {
             m_spin->GetSpinButton()->SetValue(val);
+
+            // If we're already processing a text update from m_spin,
+            // don't send it again, since we could end up recursing
+            // infinitely.
+            if (event.GetId() == m_spin->GetId())
+            {
+                event.Skip();
+                return;
+            }
+
+            // Send event that the text was manually changed
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_spin->GetId());
+            event.SetEventObject(m_spin);
+            event.SetString(m_spin->GetText()->GetValue());
+            event.SetInt(val);
+
+            m_spin->GetEventHandler()->ProcessEvent(event);
         }
 
         event.Skip();
     }
 
-    bool ProcessEvent(wxEvent &event)
-    {
-        // Hand button down events to wxSpinCtrl. Doesn't work.
-        if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
-            return TRUE;
-
-        return wxTextCtrl::ProcessEvent( event );
-    }
-
 private:
     wxSpinCtrl *m_spin;
 
@@ -122,6 +138,13 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
     
+BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
+  WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl)
+END_EVENT_TABLE()
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSpinCtrl)
+
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -134,6 +157,7 @@ void wxSpinCtrl::Init()
 {
     m_text = NULL;
     m_btn = NULL;
+    m_container.SetContainerWindow(this);
 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,
@@ -177,12 +201,14 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
 
     if ( size.y == -1 ) {
-       csize.y = m_text->GetSize().y + 4; //allow for text border highlights
+           csize.y = m_text->GetSize().y + 2 * TEXTBORDER ; //allow for text border highlights
+           if ( m_btn->GetSize().y > csize.y )
+               csize.y = m_btn->GetSize().y ;
     }
     
     //SetSize(csize);
     
-    MacPostControlCreate(pos, csize);
+    //MacPostControlCreate(pos, csize);
     SetInitialBestSize(csize);
 
     return TRUE;
@@ -211,28 +237,30 @@ wxSize wxSpinCtrl::DoGetBestSize() const
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 
+    sizeText.y += 2 * TEXTBORDER ;
+    sizeText.x += 2 * TEXTBORDER ;
+
     int height;
     if (sizeText.y > sizeBtn.y)
         height = sizeText.y;
     else
         height = sizeBtn.y;
         
-    return wxSize(sizeBtn.x + sizeText.x + MARGIN, height + MARGIN);
+    return wxSize(sizeBtn.x + sizeText.x + MARGIN, height );
 }
 
 void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
+    wxSize sizeText = m_text->GetSize();
     
     wxControl::DoMoveWindow(x, y, width, height);
 
-    wxCoord wText = width - sizeBtn.x - MARGIN;
+    wxCoord wText = width - sizeBtn.x - MARGIN - 2 * TEXTBORDER;
     
-    //growing or shrinking a control like this doesn't really make sense
-    //so just leave the controls the same size and add whitespace
-    m_text->SetSize(2, 2, wText, 22);
-    m_btn->SetSize(0 + wText + MARGIN, 0, -1, height);
+    m_text->SetSize(TEXTBORDER, (height - sizeText.y) / 2, wText, -1);
+    m_btn->SetSize(0 + wText + MARGIN + 2 * TEXTBORDER , (height - sizeBtn.y) / 2 , -1, -1 );
 }
 
 // ----------------------------------------------------------------------------