--- a/src/hbcore/gui/hbwidget.h	Mon Oct 04 17:49:30 2010 +0300
+++ b/src/hbcore/gui/hbwidget.h	Mon Oct 18 18:23:13 2010 +0300
@@ -75,6 +75,7 @@
         FocusHighlightResidual
     };
 
+
     explicit HbWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
     virtual ~HbWidget();
     virtual bool event(QEvent *e);
@@ -85,8 +86,6 @@
     enum { Type = Hb::ItemType_Widget };
     int type() const { return Type; }
 
-    int pluginBaseId() const;
-
     HbMainWindow *mainWindow() const;
 
     virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
@@ -113,12 +112,12 @@
     void setFocusMode(HbWidget::FocusMode);
     HbWidget::FocusMode focusMode() const;
 
-    void setFocusHighlight(HbStyle::Primitive type, HbWidget::FocusHighlight focusHighlight);
-    HbStyle::Primitive focusHighlight(HbWidget::FocusHighlight focusHighlight);
-
     void setBackgroundItem(QGraphicsItem *item, int zValue = -1);
     QGraphicsItem *backgroundItem() const;
 
+    void setFocusHighlightItem(QGraphicsItem *item, HbWidget::FocusHighlight focusHighlight, int zValue = -1);
+    QGraphicsItem *focusHighlightItem(HbWidget::FocusHighlight focusHighlight) const;
+
 public slots:
     virtual void recreatePrimitives();
     virtual void updatePrimitives();
@@ -135,9 +134,6 @@
     virtual void polishEvent();
     virtual void polish(HbStyleParameters &params);
     void repolish();
-
-    void setPluginBaseId(int baseId);
-
     bool sceneEventFilter (QGraphicsItem *watched, QEvent *event);
 
 protected: