--- a/src/hbinput/inputwidgets/hbinputcandidatelist.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -41,7 +41,7 @@
 #include <hbinputvkbhost.h>
 #include <hbinputregioncollector_p.h>
 
-#include "hbdialog_p.h"
+#include "hbinputpopupbase_p.h"
 
 const QString HbCandidateListBackground("qtg_fr_popup_secondary");
 const int HbCandListDefaultNumRows = 5;
@@ -52,7 +52,7 @@
 
 /// @cond
 
-class HbCandidateListPrivate : public HbDialogPrivate
+class HbCandidateListPrivate : public HbInputPopupBasePrivate
 {
     Q_DECLARE_PUBLIC(HbCandidateList)
 
@@ -141,7 +141,7 @@
 /// @endcond
 
 /*!
-@proto
+@stable
 @hbinput
 \class HbCandidateList
 \brief Hb based candidate list popup.
@@ -159,22 +159,16 @@
 @param parent parent of the widget.
 */
 HbCandidateList::HbCandidateList(HbInputMethod *input, QGraphicsItem *parent)
-    : HbDialog(*new HbCandidateListPrivate(input), parent)
+    : HbInputPopupBase(*new HbCandidateListPrivate(input), parent)
 {
     Q_D(HbCandidateList);
 
     HbInputRegionCollector::instance()->attach(this);
 
-    d->setPriority(HbPopupPrivate::VirtualKeyboard + 1);  // Should be shown on top of virtual keyboard.
     d->setBackground();
   
     d->mList->setParent(this);
 
-    // Make sure the preview pane never steals focus.
-    setFlag(QGraphicsItem::ItemIsPanel, true);
-    d->mActivePopup = false;
-    setActive(false);
-
     setTimeout(NoTimeout);
     setAttribute(Qt::WA_InputMethodEnabled, false);
     connect(d->mList, SIGNAL(activated(HbListWidgetItem *)), this, SLOT(itemActivated(HbListWidgetItem *)));
@@ -204,7 +198,6 @@
     QApplication::sendEvent(this, &event);
     setContentWidget(d->mList);
 
-    d->setPriority(HbPopupPrivate::VirtualKeyboard + 1);  // Should be shown on top of virtual keyboard.
     d->mList->clear();
 
     int longestwidth = 0;