fix compilation after r50329

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

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 13a285e73d38127dbcd99edc793eb0bdbeed7b76..47c2332911f2e5ff54c44ab86d7ad786e5191980 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        src/mac/carbon/spinbutt.cpp

 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by: Mark Newsam (Based on GTK file)
 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by: Mark Newsam (Based on GTK file)


@@ -12,10 +12,14 @@
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

-#include "wx/spinbutt.h"

 #include "wx/spinctrl.h"
 #include "wx/spinctrl.h"

-#include "wx/textctrl.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+    #include "wx/containr.h"
+#endif
+
+#include "wx/spinbutt.h"

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


@@ -35,15 +39,61 @@ class wxSpinCtrlText : public wxTextCtrl
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)

-        : wxTextCtrl(spin , -1, value, wxDefaultPosition, wxSize(40, -1))
+        : wxTextCtrl(spin , wxID_ANY, value, wxDefaultPosition, wxSize(40, wxDefaultCoord))

     {
         m_spin = spin;
     {
         m_spin = spin;

-        
+

         // remove the default minsize, the spinctrl will have one instead
         // remove the default minsize, the spinctrl will have one instead

-        SetSizeHints(-1,-1);
+        SetMinSize(wxDefaultSize);
+    }
+
+    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:
     }
 
 protected:

+     void OnKillFocus(wxFocusEvent& WXUNUSED(event))
+     {
+         long l;
+         if ( !GetValue().ToLong(&l) )
+         {
+             // not a number at all
+             return;
+         }
+
+         // is within range
+         if (l < m_spin->GetMin())
+             l = m_spin->GetMin();
+         if (l > m_spin->GetMax())
+             l = m_spin->GetMax();
+
+         // Update text control
+         wxString str;
+         str.Printf( wxT("%d"), (int)l );
+         if (str != GetValue())
+             SetValue( str );
+
+         if (l != m_spin->m_oldValue)
+         {
+             // set value in spin button
+             // does that trigger an event?
+             m_spin->m_btn->SetValue( l );
+
+             // if not
+             wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+             event.SetEventObject(m_spin);
+             event.SetInt(l);
+             m_spin->HandleWindowEvent(event);
+
+             m_spin->m_oldValue = l;
+         }
+    }
+

     void OnTextChange(wxCommandEvent& event)
     {
         int val;
     void OnTextChange(wxCommandEvent& event)
     {
         int val;


@@ -51,26 +101,27 @@ 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);
 
             event.SetInt(val);
 

-            m_spin->GetEventHandler()->ProcessEvent(event);
+            m_spin->HandleWindowEvent(event);

         }
 
         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;
 


@@ -78,7 +129,8 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)

-    EVT_TEXT(-1, wxSpinCtrlText::OnTextChange)
+    EVT_TEXT(wxID_ANY, wxSpinCtrlText::OnTextChange)
+    EVT_KILL_FOCUS( wxSpinCtrlText::OnKillFocus)

 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------


@@ -101,19 +153,22 @@ public:
         //SetWindowVariant(wxWINDOW_VARIANT_SMALL);
 
         // remove the default minsize, the spinctrl will have one instead
         //SetWindowVariant(wxWINDOW_VARIANT_SMALL);
 
         // remove the default minsize, the spinctrl will have one instead

-        SetSizeHints(-1,-1);
+        SetMinSize(wxDefaultSize);

     }
 
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {
     }
 
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {

-      m_spin->SetTextValue(eventSpin.GetPosition());
+        int pos = eventSpin.GetPosition();
+        m_spin->SetTextValue(pos);
+
+        wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+        event.SetEventObject(m_spin);
+        event.SetInt(pos);

 
 

-      wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
-      event.SetEventObject(m_spin);
-      event.SetInt(eventSpin.GetPosition());
+        m_spin->HandleWindowEvent(event);

 
 

-      m_spin->GetEventHandler()->ProcessEvent(event);
+        m_spin->m_oldValue = pos;

     }
 
 private:
     }
 
 private:


@@ -123,11 +178,18 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)

-    EVT_SPIN(-1, wxSpinCtrlButton::OnSpinButton)
+    EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 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, wxControl)
+
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


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

+    WX_INIT_CONTROL_CONTAINER();

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


@@ -157,7 +220,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
     {
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
     {

-        return FALSE;
+        return false;

     }
 
     // the string value overrides the numeric one (for backwards compatibility
     }
 
     // the string value overrides the numeric one (for backwards compatibility


@@ -174,26 +237,28 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     wxSize csize = size ;
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
     wxSize csize = size ;
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);

-    
+

     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);

+    // make it different
+    m_oldValue = GetMin()-1;

 
 

-    if ( size.x == -1 ){
+    if ( size.x == wxDefaultCoord ){

         csize.x = m_text->GetSize().x + MARGIN + m_btn->GetSize().x ;
     }
 
         csize.x = m_text->GetSize().x + MARGIN + m_btn->GetSize().x ;
     }
 

-    if ( size.y == -1 ) {
-           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 ;
+    if ( size.y == wxDefaultCoord ) {
+        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);
     //SetSize(csize);

-    
+

     //MacPostControlCreate(pos, csize);
     //MacPostControlCreate(pos, csize);

-    SetInitialBestSize(csize);
+    SetInitialSize(csize);

 
 

-    return TRUE;
+    return true;

 }
 
 wxSpinCtrl::~wxSpinCtrl()
 }
 
 wxSpinCtrl::~wxSpinCtrl()


@@ -215,7 +280,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
 {
     if (!m_btn || !m_text)
         return GetSize();
 {
     if (!m_btn || !m_text)
         return GetSize();

-    
+

     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 


@@ -227,7 +292,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
         height = sizeText.y;
     else
         height = sizeBtn.y;
         height = sizeText.y;
     else
         height = sizeBtn.y;

-        
+

     return wxSize(sizeBtn.x + sizeText.x + MARGIN, height );
 }
 
     return wxSize(sizeBtn.x + sizeText.x + MARGIN, height );
 }
 


@@ -236,11 +301,11 @@ 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();
     // 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 - 2 * TEXTBORDER;
     wxControl::DoMoveWindow(x, y, width, height);
 
     wxCoord wText = width - sizeBtn.x - MARGIN - 2 * TEXTBORDER;

-    
+

     m_text->SetSize(TEXTBORDER, (height - sizeText.y) / 2, wText, -1);
     m_btn->SetSize(0 + wText + MARGIN + 2 * TEXTBORDER , (height - sizeBtn.y) / 2 , -1, -1 );
 }
     m_text->SetSize(TEXTBORDER, (height - sizeText.y) / 2, wText, -1);
     m_btn->SetSize(0 + wText + MARGIN + 2 * TEXTBORDER , (height - sizeBtn.y) / 2 , -1, -1 );
 }


@@ -252,22 +317,15 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 bool wxSpinCtrl::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxSpinCtrl::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
-    return TRUE;
+        return false;
+    return true;

 }
 
 bool wxSpinCtrl::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxSpinCtrl::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
-    return TRUE;
-}
-
-void wxSpinCtrl::SetFocus()
-{
-    if ( m_text != NULL) {
-        m_text->SetFocus();
-    }
+        return false;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -280,18 +338,18 @@ bool wxSpinCtrl::GetTextValue(int *val) const
     if ( !m_text->GetValue().ToLong(&l) )
     {
         // not a number at all
     if ( !m_text->GetValue().ToLong(&l) )
     {
         // not a number at all

-        return FALSE;
+        return false;

     }
 
     if ( l < GetMin() || l > GetMax() )
     {
         // out of range
     }
 
     if ( l < GetMin() || l > GetMax() )
     {
         // out of range

-        return FALSE;
+        return false;

     }
 
     *val = l;
 
     }
 
     *val = l;
 

-    return TRUE;
+    return true;

 }
 
 int wxSpinCtrl::GetValue() const
 }
 
 int wxSpinCtrl::GetValue() const


@@ -333,6 +391,7 @@ void wxSpinCtrl::SetValue(int val)
     SetTextValue(val);
 
     m_btn->SetValue(val);
     SetTextValue(val);
 
     m_btn->SetValue(val);

+    m_oldValue = val;

 }
 
 void wxSpinCtrl::SetValue(const wxString& text)
 }
 
 void wxSpinCtrl::SetValue(const wxString& text)


@@ -364,9 +423,9 @@ void wxSpinCtrl::SetSelection(long from, long to)
     // be selected
     if ( (from == -1) && (to == -1) )
     {
     // be selected
     if ( (from == -1) && (to == -1) )
     {

-        from = 0;     
+        from = 0;

     }
     m_text->SetSelection(from, to);
     }
     m_text->SetSelection(from, to);

-}     
+}

 
 #endif // wxUSE_SPINCTRL
 
 #endif // wxUSE_SPINCTRL