luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some use of deprecated functions.

Browse source 
[GB.QT5]
* BUG: Fix some use of deprecated functions.
This commit is contained in:
Benoît Minisini 2022-09-03 14:24:35 +02:00
parent d996843f55
commit c378523342
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gb.qt4/src/CWidget.cpp
View file

@ -3118,18 +3118,20 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
{ {
MOUSE_info.orientation = Qt::Horizontal; MOUSE_info.orientation = Qt::Horizontal;
MOUSE_info.delta = delta.x(); MOUSE_info.delta = delta.x();
cancel = GB.Raise(control, EVENT_MouseWheel, 0);
} }
else if (delta.y())
{ {
MOUSE_info.orientation = Qt::Vertical; MOUSE_info.orientation = Qt::Vertical;
MOUSE_info.delta = delta.y(); MOUSE_info.delta = delta.y();
cancel = GB.Raise(control, EVENT_MouseWheel, 0);
} }
#else #else
MOUSE_info.orientation = ev->orientation(); MOUSE_info.orientation = ev->orientation();
MOUSE_info.delta = ev->delta(); MOUSE_info.delta = ev->delta();
cancel = GB.Raise(control, EVENT_MouseWheel, 0);
#endif #endif
cancel = GB.Raise(control, EVENT_MouseWheel, 0);
CMOUSE_clear(false); CMOUSE_clear(false);

9
gb.qt4/src/ctrayicon.cpp
View file

@ -389,10 +389,17 @@ bool TrayIconManager::eventFilter(QObject *o, QEvent *e)
CTRAYICON *_object = find_trayicon(o); CTRAYICON *_object = find_trayicon(o);
if (THIS) if (THIS)
{ {
bool cancel; bool cancel = true;
QWheelEvent *ev = (QWheelEvent *)e; QWheelEvent *ev = (QWheelEvent *)e;
#ifdef QT5
if (ev->angleDelta().x())
cancel = GB.Raise(THIS, EVENT_Scroll, 2, GB_T_FLOAT, ev->angleDelta().x() / 120.0, GB_T_INTEGER, false);
if (ev->angleDelta().y())
cancel = GB.Raise(THIS, EVENT_Scroll, 2, GB_T_FLOAT, ev->angleDelta().y() / 120.0, GB_T_INTEGER, true);
#else
cancel = GB.Raise(THIS, EVENT_Scroll, 2, GB_T_FLOAT, ev->delta() / 120.0, GB_T_INTEGER, ev->orientation() == Qt::Vertical); cancel = GB.Raise(THIS, EVENT_Scroll, 2, GB_T_FLOAT, ev->delta() / 120.0, GB_T_INTEGER, ev->orientation() == Qt::Vertical);
#endif
if (cancel) if (cancel)
return true; return true;