Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - reformatting (again)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-08 17:46:09 +00:00
parent 59abfcf813
commit 0f85d5e799
1 changed files with 113 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mac/carbon/scrolbar.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: scrolbar.cpp // Name: src/mac/carbon/scrolbar.cpp
// Purpose: wxScrollBar // Purpose: wxScrollBar
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -14,7 +14,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#endif // WX_PRECOMP #endif
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
@@ -41,8 +41,12 @@ bool wxScrollBar::Create(wxWindow *parent,
Rect bounds = wxMacGetBoundsForControl( this, pos, size ); Rect bounds = wxMacGetBoundsForControl( this, pos, size );
m_peer = new wxMacControl( this ); m_peer = new wxMacControl( this );
verify_noerr( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , OSStatus err = CreateScrollBarControl(
0 , 0 , 100 , 1 , true /* liveTracking */ , GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) ); MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
0, 0, 100, 1, true /* liveTracking */,
GetwxMacLiveScrollbarActionProc(),
m_peer->GetControlRefAddr() );
verify_noerr( err );
MacPostControlCreate( pos, size ); MacPostControlCreate( pos, size );
@@ -71,8 +75,8 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
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->SetMinimum( 0 );
m_peer->SetMaximum( range1 );
m_peer->SetValue( position ); m_peer->SetValue( position );
m_peer->SetViewSize( m_viewSize ); m_peer->SetViewSize( m_viewSize );
} }
@@ -127,7 +131,7 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
break; break;
default: default:
wxFAIL_MSG(wxT("illegal scrollbar selector")); wxFAIL_MSG(wxT("unknown scrollbar selector"));
break; break;
} }
@@ -171,6 +175,8 @@ wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF meven
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
// NB: this may need to be reviewed in light of the fact that scroll wheel events
// aren't being handled properly
if ( controlpart != kControlIndicatorPart ) if ( controlpart != kControlIndicatorPart )
return eventNotHandledErr; return eventNotHandledErr;
@@ -182,7 +188,7 @@ wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF meven
break; break;
default: default:
wxFAIL_MSG(wxT("illegal scrollbar selector")); wxFAIL_MSG(wxT("unknown scrollbar selector"));
break; break;
} }