Fixed bug [ 754596 ] wxUSE_CONSTRAINTS 0 breaks AutoLayout() with sizers

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

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index ad843c3fd955bfced9f470e5d6199a018235305e..680bc2f33d19f1c21fa5789e20b3953b240a4c38 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -40,24 +40,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-  if (!parent)
-      return FALSE;
-    
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return FALSE;
+
     Rect bounds ;
     Str255 title ;
-    
+
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
 
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100, 
-        kControlScrollBarLiveProc , (long) this ) ;
-    
+    m_macControl = ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) ,
+                                &bounds , title , false , 0 , 0 , 100, 
+                                kControlScrollBarLiveProc , (long) this) ;
+
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
 
     ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
 
     MacPostControlCreate() ;
 
-  return TRUE;
+    return TRUE;
 }
 
 wxScrollBar::~wxScrollBar()
@@ -105,7 +106,7 @@ void wxScrollBar::Command(wxCommandEvent& event)
     ProcessCommand(event);
 }
 
-void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
 {
     if ( (ControlHandle) m_macControl == NULL )
         return ;
@@ -117,6 +118,10 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc;
     
+    // all events have already been reported during mouse down, except for THUMBRELEASE
+    if ( !mouseStillDown && controlpart !=kControlIndicatorPart )
+        return ;
+    
     switch( controlpart )
     {
     case kControlUpButtonPart :
@@ -137,7 +142,10 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         break ;
     case kControlIndicatorPart :
         nScrollInc = 0 ;
-        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        if ( mouseStillDown )
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        else
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         break ;
     default :
         wxFAIL_MSG(wxT("illegal scrollbar selector"));