浏览代码

Merge branch 'ctkcombobox-no-scroll'

* ctkcombobox-no-scroll:
  Extend ctkComboBox::ScrollWithNoVScrollBar to QAbstractScrollArea
Julien Finet 12 年之前
父节点
当前提交
8ae7ae3ce9
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      Libs/Widgets/ctkComboBox.cpp

+ 4 - 3
Libs/Widgets/ctkComboBox.cpp

@@ -19,11 +19,11 @@
 =========================================================================*/
 
 // Qt includes
-#include <QStylePainter>
+#include <QAbstractScrollArea>
 #include <QApplication>
 #include <QDebug>
-#include <QScrollArea>
 #include <QScrollBar>
+#include <QStylePainter>
 #include <QWheelEvent>
 
 // CTK includes
@@ -342,7 +342,8 @@ void ctkComboBox::wheelEvent(QWheelEvent* event)
       for (QWidget* ancestor = this->parentWidget();
            ancestor; ancestor = ancestor->parentWidget())
         {
-        if (QScrollArea* scrollArea = qobject_cast<QScrollArea*>(ancestor))
+        if (QAbstractScrollArea* scrollArea =
+            qobject_cast<QAbstractScrollArea*>(ancestor))
           {
           scroll = !scrollArea->verticalScrollBar()->isVisible();
           if (!scroll)