don't wake up on Windows messages when waiting for thread termination in a console...

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index d2422dd7dcb2804b90cb8fa598401e7d0fe8c4f1..5f268188b9e3e1e76f676d2aaa81f17098b718bf 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.cpp
+// Name:        src/mac/carbon/scrolbar.cpp

 // Purpose:     wxScrollBar
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxScrollBar
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,18 +9,16 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "scrolbar.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

+#include "wx/scrolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

-#endif // WX_PRECOMP
+    #include "wx/settings.h"
+#endif

 
 

-#include "wx/scrolbar.h"

 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)


@@ -28,195 +26,218 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 

-// Scrollbar
-bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+
+bool wxScrollBar::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )

 {
 {

-    m_macIsUserPane = FALSE ;
-    
-    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+    m_macIsUserPane = false;

 
 

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+        return false;

 
 

-    m_peer = new wxMacControl(this) ;
-    verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
-    0 , 0 , 100 , 1 , true /* liveTracking */ , GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );
-    
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );

 
 

-    MacPostControlCreate(pos,size) ;
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateScrollBarControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+        0, 0, 100, 1, true /* liveTracking */,
+        GetwxMacLiveScrollbarActionProc(),
+        m_peer->GetControlRefAddr() );
+    verify_noerr( err );

 
 

-    return TRUE;
+    MacPostControlCreate( pos, size );
+
+    return true;

 }
 
 wxScrollBar::~wxScrollBar()
 {
 }
 
 }
 
 wxScrollBar::~wxScrollBar()
 {
 }
 

-void wxScrollBar::SetThumbPosition(int viewStart)
+void wxScrollBar::SetThumbPosition( int viewStart )

 {
 {

-    m_peer->SetValue( viewStart ) ;
+    m_peer->SetValue( viewStart );

 }
 
 int wxScrollBar::GetThumbPosition() const
 {
 }
 
 int wxScrollBar::GetThumbPosition() const
 {

-    return m_peer->GetValue() ;
+    return m_peer->GetValue();

 }
 
 }
 

-void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
-    bool refresh)
+void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize, bool refresh )

 {
     m_pageSize = pageSize;
     m_viewSize = thumbSize;
     m_objectSize = range;
 
 {
     m_pageSize = pageSize;
     m_viewSize = thumbSize;
     m_objectSize = range;
 

-   int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
+   int range1 = wxMax( (m_objectSize - m_viewSize), 0 );

 
 

-    m_peer->SetMaximum( range1 ) ;
-    m_peer->SetMinimum( 0 ) ;
-    m_peer->SetValue( position ) ;
-    m_peer->SetViewSize( m_viewSize ) ;
+    m_peer->SetMinimum( 0 );
+    m_peer->SetMaximum( range1 );
+    m_peer->SetValue( position );
+    m_peer->SetViewSize( m_viewSize );

 }
 
 }
 

-
-void wxScrollBar::Command(wxCommandEvent& event)
+void wxScrollBar::Command( wxCommandEvent& event )

 {
 {

-    SetThumbPosition(event.GetInt());
-    ProcessCommand(event);
+    SetThumbPosition( event.GetInt() );
+    ProcessCommand( event );

 }
 
 }
 

-void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
+void wxScrollBar::MacHandleControlClick( WXWidget control, wxInt16 controlpart, bool mouseStillDown )

 {
 {

-    int position = m_peer->GetValue() ;
-    int minPos = m_peer->GetMinimum() ;
-    int maxPos = m_peer->GetMaximum() ;
-    
+    int position = m_peer->GetValue();
+    int minPos = m_peer->GetMinimum();
+    int maxPos = m_peer->GetMaximum();
+

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

-    
+

     // all events have already been reported during mouse down, except for THUMBRELEASE
     // all events have already been reported during mouse down, except for THUMBRELEASE

-    if ( !mouseStillDown && controlpart !=kControlIndicatorPart )
-        return ;
-    
-    switch( controlpart )
+    if ( !mouseStillDown && controlpart != kControlIndicatorPart )
+        return;
+
+    switch ( controlpart )

     {
     {

-    case kControlUpButtonPart :
+    case kControlUpButtonPart:

         nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;
         nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;

-        break ;
-    case kControlDownButtonPart :
+        break;
+
+    case kControlDownButtonPart:

         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;

-        break ;
-    case kControlPageUpPart :
+        break;
+
+    case kControlPageUpPart:

         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;

-        break ;
-    case kControlPageDownPart :
+        break;
+
+    case kControlPageDownPart:

         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;

-        break ;
-    case kControlIndicatorPart :
-        nScrollInc = 0 ;
+        break;
+
+    case kControlIndicatorPart:
+        nScrollInc = 0;

         if ( mouseStillDown )
             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
         else
             scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         if ( mouseStillDown )
             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
         else
             scrollEvent = wxEVT_SCROLL_THUMBRELEASE;

-        break ;
-    default :
-        wxFAIL_MSG(wxT("illegal scrollbar selector"));
-        break ;
+        break;
+
+    default:
+        wxFAIL_MSG(wxT("unknown scrollbar selector"));
+        break;

     }
     }

-    
+

     int new_pos = position + nScrollInc;
     int new_pos = position + nScrollInc;

-    
+

     if (new_pos < minPos)
         new_pos = minPos;
     if (new_pos < minPos)
         new_pos = minPos;

-    if (new_pos > maxPos)
+    else if (new_pos > maxPos)

         new_pos = maxPos;
         new_pos = maxPos;

+

     if ( nScrollInc )
     if ( nScrollInc )

-        SetThumbPosition(new_pos);
-    
-    wxScrollEvent event(scrollEvent, m_windowId);
+        SetThumbPosition( new_pos );
+
+    wxScrollEvent event( scrollEvent, m_windowId );

     if ( m_windowStyle & wxHORIZONTAL )
     if ( m_windowStyle & wxHORIZONTAL )

-    {
-        event.SetOrientation( wxHORIZONTAL ) ;
-    }
+        event.SetOrientation( wxHORIZONTAL );

     else
     else

-    {
-        event.SetOrientation( wxVERTICAL ) ;
-    }
-    event.SetPosition(new_pos);
+        event.SetOrientation( wxVERTICAL );
+
+    event.SetPosition( new_pos );

     event.SetEventObject( this );
     event.SetEventObject( this );

-    wxWindow* window = GetParent() ;
-    if (window && window->MacIsWindowScrollbar(this) )
-    {
+
+    wxWindow* window = GetParent();
+    if (window && window->MacIsWindowScrollbar( this ))

         // this is hardcoded
         // this is hardcoded

-        window->MacOnScroll(event);
-    }
+        window->MacOnScroll( event );

     else
     else

-        GetEventHandler()->ProcessEvent(event);
+        GetEventHandler()->ProcessEvent( event );

 }
 
 }
 

-wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
+wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF mevent )

 {
 {

-    int position = m_peer->GetValue() ;
-    int minPos = m_peer->GetMinimum() ;
-    int maxPos = m_peer->GetMaximum() ;
-    
+    int position = m_peer->GetValue();
+    int minPos = m_peer->GetMinimum();
+    int maxPos = m_peer->GetMaximum();
+

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

-    
-    wxMacCarbonEvent cEvent( (EventRef) mevent ) ;
-    ControlPartCode controlpart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) ;
-    
+
+    wxMacCarbonEvent cEvent( (EventRef)mevent );
+    ControlPartCode controlpart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart, typeControlPartCode);
+

     // all events have already been reported during mouse down, except for THUMBRELEASE
     // all events have already been reported during mouse down, except for THUMBRELEASE

-    if ( controlpart !=kControlIndicatorPart )
-        return eventNotHandledErr ;
-    
-    switch( controlpart )
+    // NB: this may need to be reviewed in light of the fact that scroll wheel events
+    // aren't being handled properly
+    if ( controlpart != kControlIndicatorPart )
+        return eventNotHandledErr;
+
+    switch ( controlpart )

     {
     {

-    case kControlIndicatorPart :
-        nScrollInc = 0 ;
+    case kControlIndicatorPart:
+        nScrollInc = 0;

         scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         scrollEvent = wxEVT_SCROLL_THUMBRELEASE;

-        break ;
-    default :
-        wxFAIL_MSG(wxT("illegal scrollbar selector"));
-        break ;
+        break;
+
+    default:
+        wxFAIL_MSG(wxT("unknown scrollbar selector"));
+        break;

     }
     }

-    
+

     int new_pos = position + nScrollInc;
     int new_pos = position + nScrollInc;

-    
+

     if (new_pos < minPos)
         new_pos = minPos;
     if (new_pos < minPos)
         new_pos = minPos;

-    if (new_pos > maxPos)
+    else if (new_pos > maxPos)

         new_pos = maxPos;
         new_pos = maxPos;

+

     if ( nScrollInc )
     if ( nScrollInc )

-        SetThumbPosition(new_pos);
-    
-    wxScrollEvent event(scrollEvent, m_windowId);
+        SetThumbPosition( new_pos );
+
+    wxScrollEvent event( scrollEvent, m_windowId );

     if ( m_windowStyle & wxHORIZONTAL )
     if ( m_windowStyle & wxHORIZONTAL )

-    {
-        event.SetOrientation( wxHORIZONTAL ) ;
-    }
+        event.SetOrientation( wxHORIZONTAL );

     else
     else

-    {
-        event.SetOrientation( wxVERTICAL ) ;
-    }
-    event.SetPosition(new_pos);
+        event.SetOrientation( wxVERTICAL );
+
+    event.SetPosition( new_pos );

     event.SetEventObject( this );
     event.SetEventObject( this );

-    wxWindow* window = GetParent() ;
-    if (window && window->MacIsWindowScrollbar(this) )
-    {
+    wxWindow* window = GetParent();
+    if (window && window->MacIsWindowScrollbar( this ))

         // this is hardcoded
         // this is hardcoded

-        window->MacOnScroll(event);
-    }
+        window->MacOnScroll( event );

     else
     else

-        GetEventHandler()->ProcessEvent(event);
-    return noErr ;
+        GetEventHandler()->ProcessEvent( event );
+
+    return noErr;

 }
 
 
 }
 
 

+wxSize wxScrollBar::DoGetBestSize() const
+{
+    int w = 100;
+    int h = 100;
+
+    if ( IsVertical() )
+    {
+        w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+    }
+    else
+    {
+        h = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    }
+
+    wxSize best(w, h);
+    CacheBestSize(best);
+    return best;
+}