Redirect wxComboBox::SetFocus to its text field Part I.

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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 283d6bc262c0decc60045f8f4a652c6d544922ab..fd9d5d4e4772b4b9e7f5cde911b1be538d609136 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -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()


@@ -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 , false , 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() ;
 


@@ -90,59 +90,51 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;
 {
        m_min = minVal;
        m_max = maxVal;

-    SetControlMaximum( m_macControl , maxVal ) ;
-    SetControlMinimum(  m_macControl , minVal ) ;
+    SetControlMaximum( (ControlHandle) m_macControl , maxVal ) ;
+    SetControlMinimum((ControlHandle) m_macControl , minVal ) ;

 }
 
 }
 

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

 {
 {

-       if ( m_macControl == NULL )
-               return ;
-       
+     
+    wxEventType scrollEvent = wxEVT_NULL;

        int oldValue = m_value ;
        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;
+    m_value = oldValue + inc;

 
 

-  if (m_value < m_min)
-  {
-       if ( m_windowStyle & wxSP_WRAP )
+    if (m_value < m_min)
+    {
+    if ( m_windowStyle & wxSP_WRAP )

       m_value = m_max;
       m_value = m_max;

-       else
+    else

       m_value = m_min;
       m_value = m_min;

-  }
-  
-  if (m_value > m_max)
-  {
-       if ( m_windowStyle & wxSP_WRAP )
+    }
+
+    if (m_value > m_max)
+    {
+    if ( m_windowStyle & wxSP_WRAP )

       m_value = m_min;
     else
       m_value = m_max;
       m_value = m_min;
     else
       m_value = m_max;

-  }
-       
-  wxSpinEvent event(scrollEvent, m_windowId);
+    }
+
+    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.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 ;
+    }
+    SetControlValue( (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 +147,32 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
     }
 }
 
     }
 }
 

+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+{
+       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_HORIZONTAL) == 0 )
-    {
-        // vertical control
-        return wxSize(16,
-                      2*16);
-    }
-    else
-    {
-        // horizontal control
-        return wxSize(2*16,
-                      16);
-    }
+  return wxSize(16,24);

 }
 
 }