diff options
Diffstat (limited to 'client/widgets/combobox.cc')
-rw-r--r-- | client/widgets/combobox.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/widgets/combobox.cc b/client/widgets/combobox.cc index 935f620..53a80e2 100644 --- a/client/widgets/combobox.cc +++ b/client/widgets/combobox.cc @@ -36,6 +36,7 @@ #include <QCoreApplication> #include <QEvent> +#include <QKeyEvent> #include <QWheelEvent> #include "common.h" @@ -63,7 +64,7 @@ ComboBox::ComboBox(QDomNode &node, MacroWindow *macrowindow) : Widget(node, macrowindow) { combobox = new MyQComboBox(); - widget = combobox; + setWidget(combobox); ignoreChangeEvents = false; @@ -215,10 +216,9 @@ void ComboBox::changed() emit eventOnChange(); } -#include <QKeyEvent> bool ComboBox::eventFilter(QObject *obj, QEvent *event) { - if(ignoreChangeEvents == true) return false; + if(ignoreChangeEvents == true) return Widget::eventFilter(obj, event); if(combotype == SELECT) { if(event->type() == QEvent::MouseButtonRelease) { @@ -235,7 +235,7 @@ bool ComboBox::eventFilter(QObject *obj, QEvent *event) } } - return QObject::eventFilter(obj, event); + return Widget::eventFilter(obj, event); } void ComboBox::changeEvent(QEvent *event) |