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

Merge branch 'spinbutton-up-down-events' of https://github.com/catalinr/wxWidgets

Browse Source 
Fix wxSpinButton events in wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1232
This commit is contained in:
Vadim Zeitlin
2019-02-22 00:03:04 +01:00
parent 85666cd22f 1af2b7f05a
commit e9813688ad
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/qt/spinbutt.cpp
View File

@@ -20,6 +20,7 @@ public:
private: private:
void valueChanged(int value); void valueChanged(int value);
virtual void stepBy(int steps) wxOVERRIDE; // see QAbstractSpinBox::stepBy()
}; };
wxQtSpinButton::wxQtSpinButton( wxWindow *parent, wxSpinButton *handler ) wxQtSpinButton::wxQtSpinButton( wxWindow *parent, wxSpinButton *handler )
@@ -34,12 +35,30 @@ void wxQtSpinButton::valueChanged(int value)
wxSpinButton *handler = GetHandler(); wxSpinButton *handler = GetHandler();
if ( handler ) if ( handler )
{ {
wxCommandEvent event( wxEVT_SPIN, handler->GetId() ); wxSpinEvent event( wxEVT_SPIN, handler->GetId() );
event.SetInt( value ); event.SetInt( value );
EmitEvent( event ); EmitEvent( event );
} }
} }
void wxQtSpinButton::stepBy(int steps)
{
wxSpinButton* const handler = GetHandler();
if ( !handler )
return;
int eventType = steps < 0 ? wxEVT_SPIN_DOWN : wxEVT_SPIN_UP;
wxSpinEvent directionEvent(eventType, handler->GetId());
directionEvent.SetPosition(value());
directionEvent.SetInt(value() + steps * singleStep());
directionEvent.SetEventObject(handler);
if ( !handler->HandleWindowEvent(directionEvent) || directionEvent.IsAllowed() )
{
QSpinBox::stepBy(steps);
}
}
wxSpinButton::wxSpinButton() : wxSpinButton::wxSpinButton() :
m_qtSpinBox(NULL) m_qtSpinBox(NULL)