projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Example channel names: Consistently use all-caps.
[pulseview.git]
/
pv
/
widgets
/
wellarray.cpp
diff --git
a/pv/widgets/wellarray.cpp
b/pv/widgets/wellarray.cpp
index a5979db7183d79696a659483157beb1a84076705..26c257acd691c20f09b3f2d665855c64c6990d66 100644
(file)
--- a/
pv/widgets/wellarray.cpp
+++ b/
pv/widgets/wellarray.cpp
@@
-39,14
+39,12
@@
**
****************************************************************************/
**
****************************************************************************/
-#define QT_NO_MENU
-
#include <QPainter>
#include <QPaintEvent>
#include <QStyle>
#include <QStyleOptionFrame>
#include <QPainter>
#include <QPaintEvent>
#include <QStyle>
#include <QStyleOptionFrame>
-#include "wellarray.h"
+#include "wellarray.h
pp
"
void QWellArray::paintEvent(QPaintEvent *e)
{
void QWellArray::paintEvent(QPaintEvent *e)
{
@@
-219,12
+217,7
@@
void QWellArray::setSelected(int row, int col)
updateCell(oldRow, oldCol);
updateCell(selRow, selCol);
if (row >= 0)
updateCell(oldRow, oldCol);
updateCell(selRow, selCol);
if (row >= 0)
- emit selected(row, col);
-
-#ifndef QT_NO_MENU
- if (isVisible() && qobject_cast<QMenu*>(parentWidget()))
- parentWidget()->close();
-#endif
+ Q_EMIT selected(row, col);
}
void QWellArray::focusInEvent(QFocusEvent*)
}
void QWellArray::focusInEvent(QFocusEvent*)