drawing methods cleanup

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index cbea725592c8f95dac6f02e666f996866107b16e..87db4b041a37b355dfbb7eabb936a7e7fe2cafed 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -11,36 +11,52 @@
 
 #ifdef __GNUG__
 #pragma implementation "spinbutt.h"
 
 #ifdef __GNUG__
 #pragma implementation "spinbutt.h"

+#pragma implementation "spinbuttbase.h"

 #endif
 
 #include "wx/spinbutt.h"
 #endif
 
 #include "wx/spinbutt.h"

+#include "wx/mac/uma.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);

 #endif
 
 wxSpinButton::wxSpinButton()
 #endif
 
 wxSpinButton::wxSpinButton()

+   : wxSpinButtonBase()

 {
 {

-       m_min = 0;
-       m_max = 100;

 }
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {
 }
 
 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_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 ) ;
+
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 100, 
+               kControlLittleArrowsProc , (long) this ) ;
+       
+       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;

 
 

-    // TODO create spin button
-    return FALSE;
+       MacPostControlCreate() ;
+
+  return TRUE;

 }
 
 wxSpinButton::~wxSpinButton()
 }
 
 wxSpinButton::~wxSpinButton()


@@ -50,29 +66,101 @@ wxSpinButton::~wxSpinButton()
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 

+int wxSpinButton::GetMin() const
+{
+   return m_min;
+}
+
+int wxSpinButton::GetMax() const
+{
+   return m_max;
+}
+

 int wxSpinButton::GetValue() const
 {
 int wxSpinButton::GetValue() const
 {

-       // TODO
-    return 0;
+    return m_value;

 }
 
 void wxSpinButton::SetValue(int val)
 {
 }
 
 void wxSpinButton::SetValue(int val)
 {

-       // TODO
+       m_value = val ;

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;

-       // TODO
+    SetControlMaximum( m_macControl , maxVal ) ;
+    SetControlMinimum(  m_macControl , minVal ) ;
+}
+
+void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+       if ( m_macControl == NULL )
+               return ;
+       
+       int oldValue = m_value ;
+  wxEventType scrollEvent = wxEVT_NULL;
+  int nScrollInc = 0;
+
+       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;
+  }
+       
+  wxSpinEvent event(scrollEvent, m_windowId);
+
+  event.SetPosition(m_value);
+  event.SetEventObject( this );
+  if ((GetEventHandler()->ProcessEvent( event )) &&
+        !event.IsAllowed() )
+  {
+       m_value = oldValue ;
+  }
+  SetControlValue(  m_macControl , m_value ) ;
+
+    /* always send a thumbtrack event */
+    if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
+    {
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( scrollEvent, GetId());
+        event2.SetPosition( m_value );
+        event2.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event2 );
+    }

 }
 
 }
 

-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+// ----------------------------------------------------------------------------
+// size calculation
+// ----------------------------------------------------------------------------

 
 

-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
+wxSize wxSpinButton::DoGetBestSize() const

 {
 {

+  return wxSize(16,24);

 }
 
 }