don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index d341b03c4a801b81121c32b35b4ca2cc8a1943cc..3b08c25ecccd30e61c82e8e4cacf4cf92d2b7982 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -40,24 +40,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-  if (!parent)
-      return FALSE;
-    
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    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 ) ;
-       
-       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+    m_macControl = ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) ,
+                                &bounds , title , false , 0 , 0 , 100, 
+                                kControlScrollBarLiveProc , (long) this) ;
 
-       ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
 
-       MacPostControlCreate() ;
+    ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
 
-  return TRUE;
+    MacPostControlCreate() ;
+
+    return TRUE;
 }
 
 wxScrollBar::~wxScrollBar()
@@ -81,7 +82,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
     m_viewSize = thumbSize;
     m_objectSize = range;
 
-       int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
+      int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
 
     SetControl32BitMaximum( (ControlHandle) m_macControl , range1 ) ;
     SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
@@ -91,7 +92,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
     {
         if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
         {
-                           SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
+                SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
         }
     }
     if ( refresh )
@@ -105,72 +106,79 @@ 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 ;
-       
-  int position = GetControl32BitValue( (ControlHandle) m_macControl) ;
-  int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ;
-  int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
-
-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
-
-       switch( controlpart )
-       {
-               case kControlUpButtonPart :
+    if ( (ControlHandle) m_macControl == NULL )
+        return ;
+    
+    int position = GetControl32BitValue( (ControlHandle) m_macControl) ;
+    int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ;
+    int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
+    
+    wxEventType scrollEvent = wxEVT_NULL;
+    int nScrollInc = 0;
+    
+    // all events have already been reported during mouse down, except for THUMBRELEASE
+    if ( !mouseStillDown && controlpart !=kControlIndicatorPart )
+        return ;
+    
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
         nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;
-                       break ;
-               case kControlDownButtonPart :
+        break ;
+    case kControlDownButtonPart :
         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
-                       break ;
-               case kControlPageUpPart :
+        break ;
+    case kControlPageUpPart :
         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
-                       break ;
-               case kControlPageDownPart :
+        break ;
+    case kControlPageDownPart :
         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
-                       break ;
-               case kControlIndicatorPart :
+        break ;
+    case kControlIndicatorPart :
         nScrollInc = 0 ;
-        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-                       break ;
-                default :
-                        wxFAIL_MSG(wxT("illegal scrollbar selector"));
-                        break ;
-       }
-
-  int new_pos = position + nScrollInc;
-
-  if (new_pos < minPos)
-      new_pos = minPos;
-  if (new_pos > maxPos)
-      new_pos = maxPos;
-       if ( nScrollInc )
-       SetThumbPosition(new_pos);
-       
-  wxScrollEvent event(scrollEvent, m_windowId);
-       if ( m_windowStyle & wxHORIZONTAL )
-       {
-               event.SetOrientation( wxHORIZONTAL ) ;
-       }
-       else
-       {
-               event.SetOrientation( wxVERTICAL ) ;
-       }
-  event.SetPosition(new_pos);
-  event.SetEventObject( this );
-  wxWindow* window = GetParent() ;
-  if (window && window->MacIsWindowScrollbar(this) )
-  {
-       // this is hardcoded
-       window->MacOnScroll(event);
-  }
-  else
-       GetEventHandler()->ProcessEvent(event);
+        if ( mouseStillDown )
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        else
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+        break ;
+    default :
+        wxFAIL_MSG(wxT("illegal scrollbar selector"));
+        break ;
+    }
+    
+    int new_pos = position + nScrollInc;
+    
+    if (new_pos < minPos)
+        new_pos = minPos;
+    if (new_pos > maxPos)
+        new_pos = maxPos;
+    if ( nScrollInc )
+        SetThumbPosition(new_pos);
+    
+    wxScrollEvent event(scrollEvent, m_windowId);
+    if ( m_windowStyle & wxHORIZONTAL )
+    {
+        event.SetOrientation( wxHORIZONTAL ) ;
+    }
+    else
+    {
+        event.SetOrientation( wxVERTICAL ) ;
+    }
+    event.SetPosition(new_pos);
+    event.SetEventObject( this );
+    wxWindow* window = GetParent() ;
+    if (window && window->MacIsWindowScrollbar(this) )
+    {
+        // this is hardcoded
+        window->MacOnScroll(event);
+    }
+    else
+        GetEventHandler()->ProcessEvent(event);
 }