make sure we catch invalid control refs better

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

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 2a57f1e0b97e4486d600fd37252c1ecec15a7be6..8702e0bd874d31dc05a6872a64f0736b68cb8f91 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -1,32 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by: Mark Newsam (Based on GTK file)
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by: Mark Newsam (Based on GTK file)
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWidgets licence
+// 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
 
 
 #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
 // ----------------------------------------------------------------------------
 

+// 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
 // the margin between the text control and the spin

-static const wxCoord MARGIN = 2;
+static const wxCoord MARGIN = 8 - TEXTBORDER;

 
 // ----------------------------------------------------------------------------
 // wxSpinCtrlText: text control used by spin control
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrlText: text control used by spin control


@@ -36,14 +39,23 @@ class wxSpinCtrlText : public wxTextCtrl
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)

-        : wxTextCtrl(spin , -1, value)
+        : 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
         SetSizeHints(-1,-1);
     }
 
         // 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)
     {
 protected:
     void OnTextChange(wxCommandEvent& event)
     {


@@ -51,20 +63,28 @@ protected:
         if ( m_spin->GetTextValue(&val) )
         {
             m_spin->GetSpinButton()->SetValue(val);
         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();
     }
 
         }
 
         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;
 


@@ -72,7 +92,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)

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

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


@@ -92,7 +112,7 @@ public:
         // differences so change it's default size a bit.  SMALL still gets a
         // bit truncated, but MINI seems to be too small...  Readdress this
         // when the textctrl issues are all sorted out.
         // differences so change it's default size a bit.  SMALL still gets a
         // bit truncated, but MINI seems to be too small...  Readdress this
         // when the textctrl issues are all sorted out.

-        SetWindowVariant(wxWINDOW_VARIANT_SMALL);
+        //SetWindowVariant(wxWINDOW_VARIANT_SMALL);

 
         // remove the default minsize, the spinctrl will have one instead
         SetSizeHints(-1,-1);
 
         // remove the default minsize, the spinctrl will have one instead
         SetSizeHints(-1,-1);


@@ -117,11 +137,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
 // ============================================================================


@@ -134,6 +161,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,


@@ -147,10 +175,11 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         int initial,
                         const wxString& name)
 {
                         int initial,
                         const wxString& name)
 {

-    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,
+    m_macIsUserPane = true;
+    if ( !wxControl::Create(parent, id, pos, size, style,

                             wxDefaultValidator, name) )
     {
                             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


@@ -171,12 +200,22 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
 
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
 

-    if ( size.y == -1 ) {
-      csize.y = m_text->GetSize().y ;
+    if ( size.x == wxDefaultCoord ){
+        csize.x = m_text->GetSize().x + MARGIN + m_btn->GetSize().x ;

     }
     }

-    SetBestSize(csize);

 
 

-    return TRUE;
+    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;

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


@@ -196,22 +235,36 @@ wxSpinCtrl::~wxSpinCtrl()
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {

+    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();
 

-    return wxSize(sizeBtn.x + sizeText.x + MARGIN, sizeText.y);
+    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 );

 }
 
 void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
 }
 
 void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {

-    wxControl::DoMoveWindow(x, y, width, height);
-

     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->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;
-    m_text->SetSize(0, 0, wText, height);
-    m_btn->SetSize(0 + wText + MARGIN, 0, -1, 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 );

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


@@ -221,15 +274,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;
+        return false;
+    return true;

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


@@ -242,18 +295,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


@@ -326,9 +379,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