X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a811affe70feeb727bf7fbd2748a48ded6ec3b9b..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 22553d47f1..40e5211fbd 100644
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -8,30 +8,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "spinctlg.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "spinctrl.h"
 #endif
 
-#include "wx/defs.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif //WX_PRECOMP
+#include "wx/wxprec.h"
 
 #if wxUSE_SPINCTRL
 
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
+#include "wx/textctrl.h"
 
 
-#include "wx/spinctrl.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 = 2;
+static const wxCoord MARGIN = 8 - TEXTBORDER;
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrlText: text control used by spin control
@@ -41,9 +39,12 @@ class wxSpinCtrlText : public wxTextCtrl
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
-        : wxTextCtrl(spin , -1, value)
+        : wxTextCtrl(spin , -1, value, wxDefaultPosition, wxSize(40, -1))
     {
         m_spin = spin;
+        
+        // remove the default minsize, the spinctrl will have one instead
+        SetSizeHints(-1,-1);
     }
 
 protected:
@@ -53,6 +54,13 @@ protected:
         if ( m_spin->GetTextValue(&val) )
         {
             m_spin->GetSpinButton()->SetValue(val);
+
+            // Send event that the text was manually changed
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_spin->GetId());
+            event.SetEventObject(m_spin);
+            event.SetInt(val);
+
+            m_spin->GetEventHandler()->ProcessEvent(event);
         }
 
         event.Skip();
@@ -88,14 +96,21 @@ public:
         : wxSpinButton(spin )
     {
         m_spin = spin;
-
         SetWindowStyle(style | wxSP_VERTICAL);
+
+        // TODO: The spin button gets truncated a little bit due to size
+        // 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);
+
+        // remove the default minsize, the spinctrl will have one instead
+        SetSizeHints(-1,-1);
     }
 
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {
-#if defined(__WXMAC__) || defined(__WXMOTIF__)
       m_spin->SetTextValue(eventSpin.GetPosition());
 
       wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
@@ -103,10 +118,6 @@ protected:
       event.SetInt(eventSpin.GetPosition());
 
       m_spin->GetEventHandler()->ProcessEvent(event);
-#else
-        m_spin->SetTextValue(eventSpin.GetPosition());
-        eventSpin.Skip();
-#endif
     }
 
 private:
@@ -146,7 +157,8 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         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) )
     {
         return FALSE;
@@ -166,14 +178,24 @@ 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 ){
+        csize.x = m_text->GetSize().x + MARGIN + m_btn->GetSize().x ;
+    }
+
     if ( size.y == -1 ) {
-      csize.y = m_text->GetSize().y ;
+	    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 ;
     }
-    DoSetSize(pos.x , pos.y , csize.x, csize.y);
+    
+    //SetSize(csize);
+    
+    //MacPostControlCreate(pos, csize);
+    SetInitialBestSize(csize);
 
     return TRUE;
 }
@@ -195,22 +217,36 @@ wxSpinCtrl::~wxSpinCtrl()
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
+    if (!m_btn || !m_text)
+        return GetSize();
+    
     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)
 {
-    wxControl::DoMoveWindow(x, y, width, 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;
-    m_text->SetSize(0, 0, wText, height);
-    m_btn->SetSize(0 + wText + MARGIN, 0, -1, -1);
+    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 );
 }
 
 // ----------------------------------------------------------------------------
@@ -231,6 +267,13 @@ bool wxSpinCtrl::Show(bool show)
     return TRUE;
 }
 
+void wxSpinCtrl::SetFocus()
+{
+    if ( m_text != NULL) {
+        m_text->SetFocus();
+    }
+}
+
 // ----------------------------------------------------------------------------
 // value and range access
 // ----------------------------------------------------------------------------
@@ -321,7 +364,7 @@ void wxSpinCtrl::SetRange(int min, int max)
 
 void wxSpinCtrl::SetSelection(long from, long to)
 {
-    // if from and to are both -1, it means (in wxWindows) that all text should
+    // if from and to are both -1, it means (in wxWidgets) that all text should
     // be selected
     if ( (from == -1) && (to == -1) )
     {