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

scrolling UPP moved

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-27 14:44:36 +00:00
parent 61f3feadce
commit cd7800274b
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,6 @@ END_EVENT_TABLE()
#endif #endif
extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
// Scrollbar // Scrollbar
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
@@ -49,7 +47,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl(this) ; m_peer = new wxMacControl(this) ;
verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) ); 0 , 0 , 100 , 1 , true /* liveTracking */ , GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;

4
src/mac/carbon/slider.cpp
View File

@@ -52,8 +52,6 @@ END_EVENT_TABLE()
m_tickFreq = 0; m_tickFreq = 0;
} }
extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
bool wxSlider::Create(wxWindow *parent, wxWindowID id, bool wxSlider::Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos, const wxPoint& pos,
@@ -94,7 +92,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl(this) ; m_peer = new wxMacControl(this) ;
verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ , value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) ); GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );
if(style & wxSL_VERTICAL) { if(style & wxSL_VERTICAL) {

4
src/mac/carbon/spinbutt.cpp
View File

@@ -34,8 +34,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
#endif #endif
extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
wxSpinButton::wxSpinButton() wxSpinButton::wxSpinButton()
: wxSpinButtonBase() : wxSpinButtonBase()
{ {
@@ -62,7 +60,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 , verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
m_peer->GetControlRefAddr() ) ); m_peer->GetControlRefAddr() ) );
m_peer->SetActionProc( wxMacLiveScrollbarActionUPP ) ; m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ;
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
return true; return true;