fixed typo in prior checkin

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 1b253bad4f477a8c1ad05e9bb3aa3fd6a42da21a..2be39020bdd1038d0d3d7d9aa2780b4b48be2f01 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -23,38 +19,34 @@
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 

-#endif
-
-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;

 
 

-// 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 ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 

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

 
 

-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate( pos, size ) ;

 
 

-    return TRUE;
+    return true;

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


@@ -71,8 +63,7 @@ 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_pageSize = pageSize;
     m_viewSize = thumbSize;


@@ -86,44 +77,47 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
     m_peer->SetViewSize( m_viewSize ) ;
 }
 
     m_peer->SetViewSize( m_viewSize ) ;
 }
 

-

 void wxScrollBar::Command(wxCommandEvent& event)
 {
     SetThumbPosition(event.GetInt());
     ProcessCommand(event);
 }
 
 void wxScrollBar::Command(wxCommandEvent& 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 )
+    if ( !mouseStillDown && controlpart != kControlIndicatorPart )

         return ;
         return ;

-    
-    switch( controlpart )
+
+    switch ( controlpart )

     {
     case kControlUpButtonPart :
         nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;
         break ;
     {
     case kControlUpButtonPart :
         nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;
         break ;

+

     case kControlDownButtonPart :
         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
         break ;
     case kControlDownButtonPart :
         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
         break ;

+

     case kControlPageUpPart :
         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
         break ;
     case kControlPageUpPart :
         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
         break ;

+

     case kControlPageDownPart :
         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
         break ;
     case kControlPageDownPart :
         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
         break ;

+

     case kControlIndicatorPart :
         nScrollInc = 0 ;
         if ( mouseStillDown )
     case kControlIndicatorPart :
         nScrollInc = 0 ;
         if ( mouseStillDown )


@@ -131,97 +125,91 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         else
             scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         break ;
         else
             scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         break ;

+

     default :
         wxFAIL_MSG(wxT("illegal scrollbar selector"));
         break ;
     }
     default :
         wxFAIL_MSG(wxT("illegal 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 )
         SetThumbPosition(new_pos);
     if ( nScrollInc )
         SetThumbPosition(new_pos);

-    
+

     wxScrollEvent event(scrollEvent, m_windowId);
     if ( m_windowStyle & wxHORIZONTAL )
     wxScrollEvent event(scrollEvent, m_windowId);
     if ( m_windowStyle & wxHORIZONTAL )

-    {

         event.SetOrientation( wxHORIZONTAL ) ;
         event.SetOrientation( wxHORIZONTAL ) ;

-    }

     else
     else

-    {

         event.SetOrientation( wxVERTICAL ) ;
         event.SetOrientation( wxVERTICAL ) ;

-    }
+

     event.SetPosition(new_pos);
     event.SetEventObject( this );
     event.SetPosition(new_pos);
     event.SetEventObject( this );

+

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

-    {

         // this is hardcoded
         window->MacOnScroll(event);
         // this is hardcoded
         window->MacOnScroll(event);

-    }

     else
         GetEventHandler()->ProcessEvent(event);
 }
 
     else
         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 ) ;
     wxMacCarbonEvent cEvent( (EventRef) mevent ) ;

-    ControlPartCode controlpart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) ;
-    
+    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 )
+    if ( controlpart != kControlIndicatorPart )

         return eventNotHandledErr ;
         return eventNotHandledErr ;

-    
-    switch( controlpart )
+
+    switch ( controlpart )

     {
     case kControlIndicatorPart :
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         break ;
     {
     case kControlIndicatorPart :
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
         break ;

+

     default :
         wxFAIL_MSG(wxT("illegal scrollbar selector"));
         break ;
     }
     default :
         wxFAIL_MSG(wxT("illegal 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 )
         SetThumbPosition(new_pos);
     if ( nScrollInc )
         SetThumbPosition(new_pos);

-    
+

     wxScrollEvent event(scrollEvent, m_windowId);
     if ( m_windowStyle & wxHORIZONTAL )
     wxScrollEvent event(scrollEvent, m_windowId);
     if ( m_windowStyle & wxHORIZONTAL )

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

     else
     else

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

     event.SetPosition(new_pos);
     event.SetEventObject( this );
     wxWindow* window = GetParent() ;
     if (window && window->MacIsWindowScrollbar(this) )
     event.SetPosition(new_pos);
     event.SetEventObject( this );
     wxWindow* window = GetParent() ;
     if (window && window->MacIsWindowScrollbar(this) )

-    {

         // this is hardcoded
         window->MacOnScroll(event);
         // this is hardcoded
         window->MacOnScroll(event);

-    }

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

+

     return noErr ;
 }
     return noErr ;
 }

-
-