applied copy constructor fix to assignment operator as well

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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 5ec5e1b8a2ac19cce1e5f426c08a8259bf042395..f744cb2b0a2e6f4b70bb2a5b66fd637a3059d061 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -11,6 +11,7 @@
 
 #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"


@@ -24,8 +25,15 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

+#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+#endif
+
+wxSpinButton::wxSpinButton()
+   : wxSpinButtonBase()
+{
+}

 
 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)


@@ -41,10 +49,10 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, 

                kControlLittleArrowsProc , (long) this ) ;
        
                kControlLittleArrowsProc , (long) this ) ;
        

-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;

 
        MacPostControlCreate() ;
 
 
        MacPostControlCreate() ;
 


@@ -58,6 +66,16 @@ wxSpinButton::~wxSpinButton()
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 

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

 int wxSpinButton::GetValue() const
 {
     return m_value;
 int wxSpinButton::GetValue() const
 {
     return m_value;


@@ -65,82 +83,96 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int val)
 {
 
 void wxSpinButton::SetValue(int val)
 {

-       m_value = val ;
-  wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
-
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+       MacHandleValueChanged( val - m_value ) ;

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

+    SetControlMaximum( (ControlHandle) m_macControl , maxVal ) ;
+    SetControlMinimum((ControlHandle) m_macControl , 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 ( oldValue - m_value == -1 )
+        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+    else if ( oldValue - m_value == 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 ;
+    }
+    SetControlValue( (ControlHandle) 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 );
+    }

 }
 
 }
 

-void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
 {

-       if ( m_macControl == NULL )
+       if ( (ControlHandle) m_macControl == NULL )

                return ;
        
                return ;
        

-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
+  int nScrollInc = 0;

 
        switch( controlpart )
        {
                case kControlUpButtonPart :
 
        switch( controlpart )
        {
                case kControlUpButtonPart :

-        nScrollInc = 1;
-        scrollEvent = wxEVT_SCROLL_LINEUP;
+            nScrollInc = 1;

                        break ;
                case kControlDownButtonPart :
                        break ;
                case kControlDownButtonPart :

-        nScrollInc = -1;
-        scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            nScrollInc = -1;

                        break ;
        }
                        break ;
        }

+       MacHandleValueChanged( nScrollInc ) ;

 
 

-  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
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------
 

-wxSize wxSpinButton::DoGetBestSize()
+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);

 }
 
 }