unused variable warnings fixed

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index cbea725592c8f95dac6f02e666f996866107b16e..20c43cef8f1e805b099006f196ca4b1195e88f49 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -1,46 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__
 #pragma implementation "spinbutt.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "spinbutt.h"

+#pragma implementation "spinbuttbase.h"

 #endif
 
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINBTN
+

 #include "wx/spinbutt.h"
 #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
 
 #endif
 

+extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
+

 wxSpinButton::wxSpinButton()
 wxSpinButton::wxSpinButton()

+   : wxSpinButtonBase()

 {
 {

-       m_min = 0;
-       m_max = 100;

 }
 
 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)

 {
 {

-    SetName(name);
-
-    m_windowStyle = style;
+    m_macIsUserPane = false ;

 
 

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

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

-    m_windowId = (id == -1) ? NewControlId() : id;
+    if (!parent)
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

 
 

-    // TODO create spin button
-    return FALSE;
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
+     m_peer->GetControlRefAddr() ) );
+
+    m_peer->SetActionProc( wxMacLiveScrollbarActionUPP ) ;
+    MacPostControlCreate(pos,size) ;
+
+    return true;

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


@@ -50,29 +75,131 @@ 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)
 {
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

-       m_min = minVal;
-       m_max = maxVal;
-       // TODO
+    m_min = minVal;
+    m_max = maxVal;
+    m_peer->SetMaximum( maxVal ) ;
+    m_peer->SetMinimum( minVal ) ;
+}
+
+void wxSpinButton::MacHandleValueChanged( int inc )
+{
+
+    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
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
+
+    wxSpinEvent event(scrollEvent, m_windowId);
+
+    event.SetPosition(m_value);
+    event.SetEventObject( this );
+    if ((GetEventHandler()->ProcessEvent( event )) &&
+        !event.IsAllowed() )
+    {
+        m_value = oldValue ;
+    }
+    m_peer->SetValue( 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 );
+    }
+}
+
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown )
+{
+    int nScrollInc = 0;
+
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = 1;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+}
+
+wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
+{
+    /*
+    // these have been handled by the live action proc already
+    int nScrollInc = 0;
+    wxMacCarbonEvent cEvent( (EventRef) event ) ;
+
+    switch( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = 1;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+    */
+    return noErr ;

 }
 
 }
 

-// 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);

 }
 
 }
 

+#endif // wxUSE_SPINBTN