added non mach version

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

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 13a285e73d38127dbcd99edc793eb0bdbeed7b76..908ad7a0b56bd1623e9ae94098ad8ef57175c7b2 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -15,7 +15,7 @@
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 #include "wx/textctrl.h"
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 #include "wx/textctrl.h"

-
+#include "wx/containr.h"

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


@@ -43,6 +43,15 @@ public:
         SetSizeHints(-1,-1);
     }
 
         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)
     {
 protected:
     void OnTextChange(wxCommandEvent& event)
     {


@@ -51,9 +60,19 @@ protected:
         {
             m_spin->GetSpinButton()->SetValue(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);
             // 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.SetInt(val);
 
             m_spin->GetEventHandler()->ProcessEvent(event);


@@ -62,15 +81,6 @@ protected:
         event.Skip();
     }
 
         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;
 
 private:
     wxSpinCtrl *m_spin;
 


@@ -128,6 +138,13 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
     
 
 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
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -140,6 +157,7 @@ void wxSpinCtrl::Init()
 {
     m_text = NULL;
     m_btn = NULL;
 {
     m_text = NULL;
     m_btn = NULL;

+    m_container.SetContainerWindow(this);

 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,
 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,


@@ -263,13 +281,6 @@ bool wxSpinCtrl::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxSpinCtrl::SetFocus()
-{
-    if ( m_text != NULL) {
-        m_text->SetFocus();
-    }
-}
-

 // ----------------------------------------------------------------------------
 // value and range access
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // value and range access
 // ----------------------------------------------------------------------------