X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a99d87f2c19020173dffe91d62a11d37b8f860f..8c981ec64d9a86e9bad5f4ef16f496513bce31f6:/src/mac/carbon/spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 70b6845265..8702e0bd87 100644
--- 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)
@@ -12,10 +12,14 @@
 
 #if wxUSE_SPINCTRL
 
-#include "wx/spinbutt.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
@@ -35,14 +39,23 @@ class wxSpinCtrlText : public wxTextCtrl
 {
 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;
-        
+
         // remove the default minsize, the spinctrl will have one instead
         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)
     {
@@ -72,15 +85,6 @@ protected:
         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;
 
@@ -88,7 +92,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)
-    EVT_TEXT(-1, wxSpinCtrlText::OnTextChange)
+    EVT_TEXT(wxID_ANY, wxSpinCtrlText::OnTextChange)
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
@@ -133,11 +137,18 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
-    EVT_SPIN(-1, wxSpinCtrlButton::OnSpinButton)
+    EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton)
 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
 // ============================================================================
@@ -150,6 +161,7 @@ void wxSpinCtrl::Init()
 {
     m_text = NULL;
     m_btn = NULL;
+    m_container.SetContainerWindow(this);
 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,
@@ -167,7 +179,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
     {
-        return FALSE;
+        return false;
     }
 
     // the string value overrides the numeric one (for backwards compatibility
@@ -184,26 +196,26 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     wxSize csize = size ;
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
-    
+
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
 
-    if ( size.x == -1 ){
+    if ( size.x == wxDefaultCoord ){
         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);
-    
+
     //MacPostControlCreate(pos, csize);
     SetInitialBestSize(csize);
 
-    return TRUE;
+    return true;
 }
 
 wxSpinCtrl::~wxSpinCtrl()
@@ -225,7 +237,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
 {
     if (!m_btn || !m_text)
         return GetSize();
-    
+
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 
@@ -237,7 +249,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
         height = sizeText.y;
     else
         height = sizeBtn.y;
-        
+
     return wxSize(sizeBtn.x + sizeText.x + MARGIN, height );
 }
 
@@ -246,11 +258,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();
-    
+
     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 );
 }
@@ -262,22 +274,15 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 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) )
-        return FALSE;
-    return TRUE;
-}
-
-void wxSpinCtrl::SetFocus()
-{
-    if ( m_text != NULL) {
-        m_text->SetFocus();
-    }
+        return false;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -290,18 +295,18 @@ bool wxSpinCtrl::GetTextValue(int *val) const
     if ( !m_text->GetValue().ToLong(&l) )
     {
         // not a number at all
-        return FALSE;
+        return false;
     }
 
     if ( l < GetMin() || l > GetMax() )
     {
         // out of range
-        return FALSE;
+        return false;
     }
 
     *val = l;
 
-    return TRUE;
+    return true;
 }
 
 int wxSpinCtrl::GetValue() const
@@ -374,9 +379,9 @@ void wxSpinCtrl::SetSelection(long from, long to)
     // be selected
     if ( (from == -1) && (to == -1) )
     {
-        from = 0;     
+        from = 0;
     }
     m_text->SetSelection(from, to);
-}     
+}
 
 #endif // wxUSE_SPINCTRL