--- a/src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -34,12 +34,17 @@
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinputregioncollector_p.h>
-
-#include "hbdialog_p.h"
+#include "hbinputpopupbase_p.h"
+/*!
+@stable
+@hbinput
+\class HbInputMethodSelectionList
+\brief Selection list popup for picking input methods.
+*/
 
 /// @cond
 
-class HbInputMethodSelectionListPrivate : public HbDialogPrivate
+class HbInputMethodSelectionListPrivate : public HbInputPopupBasePrivate
 {
     Q_DECLARE_PUBLIC(HbInputMethodSelectionList)
 
@@ -135,7 +140,7 @@
 Constructs input method selection list
 */
 HbInputMethodSelectionList::HbInputMethodSelectionList(QGraphicsWidget* parent)
- : HbDialog(*new HbInputMethodSelectionListPrivate(), parent)
+ : HbInputPopupBase(*new HbInputMethodSelectionListPrivate(), parent)
 {
     Q_D(HbInputMethodSelectionList);
     HbInputRegionCollector::instance()->attach(this);
@@ -155,11 +160,6 @@
     setPreferredWidth(listWidth);
     setModal(true);
 
-    // Make sure input method selection list never steals focus.
-    setFlag(QGraphicsItem::ItemIsPanel, true);
-    d->mActivePopup = false;
-    setActive(false);
-
     d->createSelectionList();
 
     layout->addItem(d->mList);