fixed (rare but fatal) bug in wxWindowDisabler

[wxWidgets.git] / src / mac / spinbutt.cpp

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index cbea725592c8f95dac6f02e666f996866107b16e..944f72dc1011d0c644f103637b94056f4afeeef1 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -14,33 +14,41 @@
 #endif
 
 #include "wx/spinbutt.h"
+#include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
 
-wxSpinButton::wxSpinButton()
-{
-       m_min = 0;
-       m_max = 100;
-}
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {
-    SetName(name);
-
-    m_windowStyle = style;
-
-    SetParent(parent);
-
     m_min = 0;
     m_max = 100;
 
-    m_windowId = (id == -1) ? NewControlId() : id;
+  if (!parent)
+      return FALSE;
+    
+       Rect bounds ;
+       Str255 title ;
+       
+       MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
 
-    // TODO create spin button
-    return FALSE;
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
+               kControlLittleArrowsProc , (long) this ) ;
+       
+       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+
+       MacPostControlCreate() ;
+
+  return TRUE;
 }
 
 wxSpinButton::~wxSpinButton()
@@ -52,27 +60,87 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetValue() const
 {
-       // TODO
-    return 0;
+    return m_value;
 }
 
 void wxSpinButton::SetValue(int val)
 {
-       // TODO
+       m_value = val ;
+  wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
+
+  event.SetPosition(m_value);
+  event.SetEventObject( this );
+  GetEventHandler()->ProcessEvent(event);
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;
-       // TODO
 }
 
-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+       if ( m_macControl == NULL )
+               return ;
+       
+  wxEventType scrollEvent = wxEVT_NULL;
+  int nScrollInc;
+
+       switch( controlpart )
+       {
+               case kControlUpButtonPart :
+        nScrollInc = 1;
+        scrollEvent = wxEVT_SCROLL_LINEUP;
+                       break ;
+               case kControlDownButtonPart :
+        nScrollInc = -1;
+        scrollEvent = wxEVT_SCROLL_LINEDOWN;
+                       break ;
+       }
+
+  m_value = m_value + nScrollInc;
+
+  if (m_value < m_min)
+  {
+       if ( m_windowStyle & wxSP_WRAP )
+      m_value = m_max;
+       else
+      m_value = m_min;
+  }
+  
+  if (m_value > m_max)
+  {
+       if ( m_windowStyle & wxSP_WRAP )
+      m_value = m_min;
+    else
+      m_value = m_max;
+  }
+       
+  wxScrollEvent event(scrollEvent, m_windowId);
+
+  event.SetPosition(m_value);
+  event.SetEventObject( this );
+  GetEventHandler()->ProcessEvent(event);
+}
+
+// ----------------------------------------------------------------------------
+// size calculation
+// ----------------------------------------------------------------------------
 
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
+wxSize wxSpinButton::DoGetBestSize() const
 {
+    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
+    {
+        // vertical control
+        return wxSize(16,
+                      2*16);
+    }
+    else
+    {
+        // horizontal control
+        return wxSize(2*16,
+                      16);
+    }
 }