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

Set the event object and ID in events generated by wxQt

Browse Source 
Add missing SetEventObject() calls and ID parameters in the ctor calls
for several events generated by wxQt.

Closes https://github.com/wxWidgets/wxWidgets/pull/1230
This commit is contained in:
Graham Dawes
2019-02-18 14:47:23 +00:00
committed by Vadim Zeitlin
parent 38d7ba21e2
commit 1e875c8ddc
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/qt/window.cpp
View File

@@ -1214,6 +1214,7 @@ bool wxWindowQt::QtHandlePaintEvent ( QWidget *handler, QPaintEvent *event )
bool wxWindowQt::QtHandleResizeEvent ( QWidget *WXUNUSED( handler ), QResizeEvent *event ) bool wxWindowQt::QtHandleResizeEvent ( QWidget *WXUNUSED( handler ), QResizeEvent *event )
{ {
wxSizeEvent e( wxQtConvertSize( event->size() ) ); wxSizeEvent e( wxQtConvertSize( event->size() ) );
e.SetEventObject(this);
return ProcessWindowEvent( e ); return ProcessWindowEvent( e );
} }
@@ -1222,6 +1223,7 @@ bool wxWindowQt::QtHandleWheelEvent ( QWidget *WXUNUSED( handler ), QWheelEvent
{ {
wxMouseEvent e( wxEVT_MOUSEWHEEL ); wxMouseEvent e( wxEVT_MOUSEWHEEL );
e.SetPosition( wxQtConvertPoint( event->pos() ) ); e.SetPosition( wxQtConvertPoint( event->pos() ) );
e.SetEventObject(this);
e.m_wheelAxis = ( event->orientation() == Qt::Vertical ) ? wxMOUSE_WHEEL_VERTICAL : wxMOUSE_WHEEL_HORIZONTAL; e.m_wheelAxis = ( event->orientation() == Qt::Vertical ) ? wxMOUSE_WHEEL_VERTICAL : wxMOUSE_WHEEL_HORIZONTAL;
e.m_wheelRotation = event->delta(); e.m_wheelRotation = event->delta();
@@ -1401,6 +1403,7 @@ bool wxWindowQt::QtHandleMouseEvent ( QWidget *handler, QMouseEvent *event )
// Fill the event // Fill the event
QPoint mousePos = event->pos(); QPoint mousePos = event->pos();
wxMouseEvent e( wxType ); wxMouseEvent e( wxType );
e.SetEventObject(this);
e.m_clickCount = -1; e.m_clickCount = -1;
e.SetPosition( wxQtConvertPoint( mousePos ) ); e.SetPosition( wxQtConvertPoint( mousePos ) );
@@ -1447,6 +1450,7 @@ bool wxWindowQt::QtHandleEnterEvent ( QWidget *handler, QEvent *event )
wxMouseEvent e( event->type() == QEvent::Enter ? wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW ); wxMouseEvent e( event->type() == QEvent::Enter ? wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW );
e.m_clickCount = 0; e.m_clickCount = 0;
e.SetPosition( wxQtConvertPoint( handler->mapFromGlobal( QCursor::pos() ) ) ); e.SetPosition( wxQtConvertPoint( handler->mapFromGlobal( QCursor::pos() ) ) );
e.SetEventObject(this);
// Mouse buttons // Mouse buttons
wxQtFillMouseButtons( QApplication::mouseButtons(), &e ); wxQtFillMouseButtons( QApplication::mouseButtons(), &e );
@@ -1462,7 +1466,8 @@ bool wxWindowQt::QtHandleMoveEvent ( QWidget *handler, QMoveEvent *event )
if ( GetHandle() != handler ) if ( GetHandle() != handler )
return false; return false;
wxMoveEvent e( wxQtConvertPoint( event->pos() ) ); wxMoveEvent e( wxQtConvertPoint( event->pos() ), GetId() );
e.SetEventObject(this);
return ProcessWindowEvent( e ); return ProcessWindowEvent( e );
} }
@@ -1472,8 +1477,8 @@ bool wxWindowQt::QtHandleShowEvent ( QWidget *handler, QEvent *event )
if ( GetHandle() != handler ) if ( GetHandle() != handler )
return false; return false;
wxShowEvent e; wxShowEvent e(GetId(), event->type() == QEvent::Show);
e.SetShow( event->type() == QEvent::Show ); e.SetEventObject(this);
return ProcessWindowEvent( e ); return ProcessWindowEvent( e );
} }
@@ -1485,7 +1490,8 @@ bool wxWindowQt::QtHandleChangeEvent ( QWidget *handler, QEvent *event )
if ( event->type() == QEvent::ActivationChange ) if ( event->type() == QEvent::ActivationChange )
{ {
wxActivateEvent e( wxEVT_ACTIVATE, handler->isActiveWindow() ); wxActivateEvent e( wxEVT_ACTIVATE, handler->isActiveWindow(), GetId() );
e.SetEventObject(this);
return ProcessWindowEvent( e ); return ProcessWindowEvent( e );
} }
@@ -1503,8 +1509,9 @@ bool wxWindowQt::QtHandleCloseEvent ( QWidget *handler, QCloseEvent *WXUNUSED( e
bool wxWindowQt::QtHandleContextMenuEvent ( QWidget *WXUNUSED( handler ), QContextMenuEvent *event ) bool wxWindowQt::QtHandleContextMenuEvent ( QWidget *WXUNUSED( handler ), QContextMenuEvent *event )
{ {
wxContextMenuEvent e( wxEVT_CONTEXT_MENU ); wxContextMenuEvent e( wxEVT_CONTEXT_MENU, GetId() );
e.SetPosition( wxQtConvertPoint( event->globalPos() ) ); e.SetPosition( wxQtConvertPoint( event->globalPos() ) );
e.SetEventObject(this);
return ProcessWindowEvent( e ); return ProcessWindowEvent( e );
} }
@@ -1541,6 +1548,7 @@ void wxWindowQt::QtHandleShortcut ( int command )
// it as button click (for compatibility with other // it as button click (for compatibility with other
// platforms): // platforms):
wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command ); wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command );
button_event.SetEventObject(this);
ProcessWindowEvent( button_event ); ProcessWindowEvent( button_event );
} }
} }