Fix wxListCtrl background colour bug Part I

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index fc9954f9e5eb71304132012057d9321150ebddbb..e3beab732260c050d4c289571239892518cf6319 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -49,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() ;
 


@@ -84,24 +84,22 @@ int wxSpinButton::GetValue() const
 void wxSpinButton::SetValue(int val)
 {
        m_value = 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);

 }
 
 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::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
 {

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

                return ;
        
                return ;
        

+       int oldValue = m_value ;

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


@@ -135,11 +133,26 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
       m_value = m_max;
   }
        
       m_value = m_max;
   }
        

-  wxScrollEvent event(scrollEvent, m_windowId);
+  wxSpinEvent event(scrollEvent, m_windowId);

 
   event.SetPosition(m_value);
   event.SetEventObject( this );
 
   event.SetPosition(m_value);
   event.SetEventObject( this );

-  GetEventHandler()->ProcessEvent(event);
+  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 );
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -148,17 +161,6 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 
 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);

 }
 
 }