A little clarification

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index fc4e5e588852d3e193f2af9dfcc2378b0f01df7d..f8dcca8bd9ad8ab8c3e5a42cb6df012b01bbdd30 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        spinbutt.cpp
 // Purpose:     wxSpinButton
 /////////////////////////////////////////////////////////////////////////////
 // Name:        spinbutt.cpp
 // Purpose:     wxSpinButton

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -27,7 +27,7 @@
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

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

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


@@ -36,29 +36,33 @@ wxSpinButton::wxSpinButton()
 }
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
 }
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,

-            long style, const wxString& name)
+        long style, const wxString& name)

 {
 {

+    if ( !wxSpinButtonBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;
+

     m_min = 0;
     m_max = 100;
     m_min = 0;
     m_max = 100;

-
-  if (!parent)
-      return FALSE;

     
     

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 
-               kControlLittleArrowsProc , (long) this ) ;
-       
-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-
-       MacPostControlCreate() ;
-
-  return TRUE;
+    if (!parent)
+        return FALSE;
+    
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
+    
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, 
+        kControlLittleArrowsProc , (long) this ) ;
+    
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    
+    MacPostControlCreate() ;
+    
+    return TRUE;

 }
 }

-
+    

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


@@ -68,12 +72,12 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
 
 int wxSpinButton::GetMin() const
 {

-   return m_min;
+    return m_min;

 }
 
 int wxSpinButton::GetMax() const
 {
 }
 
 int wxSpinButton::GetMax() const
 {

-   return m_max;
+    return m_max;

 }
 
 int wxSpinButton::GetValue() const
 }
 
 int wxSpinButton::GetValue() const


@@ -83,67 +87,59 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int val)
 {
 
 void wxSpinButton::SetValue(int val)
 {

-       m_value = val ;
+    m_value = val ;

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

-       m_min = minVal;
-       m_max = maxVal;
-    SetControlMaximum( m_macControl , maxVal ) ;
-    SetControlMinimum(  m_macControl , minVal ) ;
+    m_min = minVal;
+    m_max = maxVal;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , maxVal ) ;
+    SetControl32BitMinimum((ControlHandle) m_macControl , minVal ) ;

 }
 
 }
 

-void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxSpinButton::MacHandleValueChanged( int inc )

 {
 {

-       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;
+    
+    wxEventType scrollEvent = wxEVT_NULL;
+    int oldValue = m_value ;
+    
+    m_value = oldValue + inc;
+    
+    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;
+    }
+    
+    if ( m_value - oldValue == -1 )
+        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+    else if ( m_value - oldValue == 1 )
+        scrollEvent = wxEVT_SCROLL_LINEUP ;

     else
     else

-      m_value = m_max;
-  }
-       
-  wxSpinEvent event(scrollEvent, m_windowId);
-
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  if ((GetEventHandler()->ProcessEvent( event )) &&
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
+    
+    wxSpinEvent event(scrollEvent, m_windowId);
+    
+    event.SetPosition(m_value);
+    event.SetEventObject( this );
+    if ((GetEventHandler()->ProcessEvent( event )) &&

         !event.IsAllowed() )
         !event.IsAllowed() )

-  {
-       m_value = oldValue ;
-  }
-  SetControlValue(  m_macControl , m_value ) ;
-
+    {
+        m_value = oldValue ;
+    }
+    SetControl32BitValue( (ControlHandle) m_macControl , m_value ) ;
+    

     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
     {
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
     {


@@ -155,23 +151,32 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
     }
 }
 
     }
 }
 

+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 
+{
+    if ( (ControlHandle) m_macControl == NULL )
+        return ;
+    
+    int nScrollInc = 0;
+    
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = 1;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+    
+}
+

 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------
 
 wxSize wxSpinButton::DoGetBestSize() const
 {

-    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
-    {
-        // vertical control
-        return wxSize(16,
-                      2*16);
-    }
-    else
-    {
-        // horizontal control
-        return wxSize(2*16,
-                      16);
-    }
+    return wxSize(16,24);

 }
 
 }