made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 944f72dc1011d0c644f103637b94056f4afeeef1..283d6bc262c0decc60045f8f4a652c6d544922ab 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(wxSpinEvent, wxScrollEvent);
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
     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,7 +49,7 @@ 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 = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 

                kControlLittleArrowsProc , (long) this ) ;
        
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
                kControlLittleArrowsProc , (long) this ) ;
        
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;


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


@@ -66,17 +84,14 @@ 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( m_macControl , maxVal ) ;
+    SetControlMinimum(  m_macControl , minVal ) ;

 }
 
 void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 }
 
 void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 


@@ -84,8 +99,9 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
        if ( m_macControl == NULL )
                return ;
        
        if ( m_macControl == NULL )
                return ;
        

+       int oldValue = m_value ;

   wxEventType scrollEvent = wxEVT_NULL;
   wxEventType scrollEvent = wxEVT_NULL;

-  int nScrollInc;
+  int nScrollInc = 0;

 
        switch( controlpart )
        {
 
        switch( controlpart )
        {


@@ -117,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(  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 );
+    }

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


@@ -130,7 +161,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 
 wxSize wxSpinButton::DoGetBestSize() const
 {

-    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
+    if ( (GetWindowStyle() & wxSP_HORIZONTAL) == 0 )

     {
         // vertical control
         return wxSize(16,
     {
         // vertical control
         return wxSize(16,