projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cc05d0
)
QWellArray: Removed QT_NO_MENU functionality
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 18 Jan 2014 10:12:03 +0000
(10:12 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 18 Jan 2014 10:14:40 +0000
(10:14 +0000)
This fixes bug #265
pv/widgets/wellarray.cpp
patch
|
blob
|
history
diff --git
a/pv/widgets/wellarray.cpp
b/pv/widgets/wellarray.cpp
index a5979db7183d79696a659483157beb1a84076705..dcc3b417e146474a3b26cfea0f07d60ade86ccb6 100644
(file)
--- a/
pv/widgets/wellarray.cpp
+++ b/
pv/widgets/wellarray.cpp
@@
-39,8
+39,6
@@
**
****************************************************************************/
-#define QT_NO_MENU
-
#include <QPainter>
#include <QPaintEvent>
#include <QStyle>
@@
-220,11
+218,6
@@
void QWellArray::setSelected(int row, int col)
updateCell(selRow, selCol);
if (row >= 0)
emit selected(row, col);
-
-#ifndef QT_NO_MENU
- if (isVisible() && qobject_cast<QMenu*>(parentWidget()))
- parentWidget()->close();
-#endif
}
void QWellArray::focusInEvent(QFocusEvent*)