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

corrected event handling according to current msw/gtk implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-05-01 06:46:38 +00:00
parent 49348d874d
commit 72d750d462
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
m_min = minVal; m_min = minVal;
m_max = maxVal; m_max = maxVal;
SetControlMaximum( m_macControl , maxVal ) ;
SetControlMinimum( m_macControl , minVal ) ;
} }
void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
@@ -102,6 +104,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
if ( m_macControl == NULL ) if ( m_macControl == NULL )
return ; return ;
int oldValue = m_value ;
wxEventType scrollEvent = wxEVT_NULL; wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc = 0; int nScrollInc = 0;
@@ -135,11 +138,26 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
m_value = m_max; m_value = m_max;
} }
wxScrollEvent event(scrollEvent, m_windowId); wxSpinEvent event(scrollEvent, m_windowId);
event.SetPosition(m_value); event.SetPosition(m_value);
event.SetEventObject( this ); event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event); if ((GetEventHandler()->ProcessEvent( event )) &&
!event.IsAllowed() )
{
m_value = oldValue ;
}
SetControlValue( m_macControl , m_value ) ;
/* always send a thumbtrack event */
if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
{
scrollEvent = wxEVT_SCROLL_THUMBTRACK;
wxSpinEvent event2( scrollEvent, GetId());
event2.SetPosition( m_value );
event2.SetEventObject( this );
GetEventHandler()->ProcessEvent( event2 );
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

22
src/mac/spinbutt.cpp
View File

@@ -95,6 +95,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
m_min = minVal; m_min = minVal;
m_max = maxVal; m_max = maxVal;
SetControlMaximum( m_macControl , maxVal ) ;
SetControlMinimum( m_macControl , minVal ) ;
} }
void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
@@ -102,6 +104,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
if ( m_macControl == NULL ) if ( m_macControl == NULL )
return ; return ;
int oldValue = m_value ;
wxEventType scrollEvent = wxEVT_NULL; wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc = 0; int nScrollInc = 0;
@@ -135,11 +138,26 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
m_value = m_max; m_value = m_max;
} }
wxScrollEvent event(scrollEvent, m_windowId); wxSpinEvent event(scrollEvent, m_windowId);
event.SetPosition(m_value); event.SetPosition(m_value);
event.SetEventObject( this ); event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event); if ((GetEventHandler()->ProcessEvent( event )) &&
!event.IsAllowed() )
{
m_value = oldValue ;
}
SetControlValue( m_macControl , m_value ) ;
/* always send a thumbtrack event */
if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
{
scrollEvent = wxEVT_SCROLL_THUMBTRACK;
wxSpinEvent event2( scrollEvent, GetId());
event2.SetPosition( m_value );
event2.SetEventObject( this );
GetEventHandler()->ProcessEvent( event2 );
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------