4 files changed, 17 insertions, 6 deletions
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index e15c2186f..bea5a399e 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -73,7 +73,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_dockwindow)
 KVSO_BEGIN_DESTRUCTOR(KviKvsObject_dockwindow)
 KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow)
 
-#define _pDockWindow ((QT_DOCK_WINDOW *)widget())
+#define _pDockWindow ((QDockWidget *)widget())
 
 bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h
index 072a4c4dc..b81b992fa 100644
--- a/src/modules/objects/class_dockwindow.h
+++ b/src/modules/objects/class_dockwindow.h
@@ -37,11 +37,7 @@ protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 
 	bool addWidget(KviKvsObjectFunctionCall *c);
-	bool orientation(KviKvsObjectFunctionCall *c);
-	bool setOrientation(KviKvsObjectFunctionCall *c);
-	bool resizeEnabled(KviKvsObjectFunctionCall *c);
-	bool setResizeEnabled(KviKvsObjectFunctionCall * c);
-	bool setAllowedDockAreas(KviKvsObjectFunctionCall * c);
+        bool setAllowedDockAreas(KviKvsObjectFunctionCall * c);
 	bool dock(KviKvsObjectFunctionCall * c);
 };
 
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 3d454f654..2ef32f6c8 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -200,6 +200,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidget,"listview","widget")
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,hideListViewHeader)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,showListViewHeader)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,firstChild)
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,topLevelItem)
 
 
 
@@ -276,6 +277,19 @@ KVSO_CLASS_FUNCTION(treewidget,setColumnText)
 	return true;
 }
 
+KVSO_CLASS_FUNCTION(treewidget,topLevelItem)
+{
+        if (!widget()) return true;
+         kvs_int_t iIdx;
+        KVSO_PARAMETERS_BEGIN(c)
+                KVSO_PARAMETER("column",KVS_PT_INT,0,iIdx)
+        KVSO_PARAMETERS_END(c)
+        QTreeWidgetItem *pItem=((QTreeWidget *)widget())->topLevelItem(iIdx);
+        if (!pItem) c->returnValue()->setHObject((kvs_hobject_t)0);
+        else  c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle(pItem));
+        return true;
+}
+
 KVSO_CLASS_FUNCTION(treewidget,addColumn)
 {
 	if (!widget()) return true;
diff --git a/src/modules/objects/class_treewidget.h b/src/modules/objects/class_treewidget.h
index 28affa42e..d7b199edc 100644
--- a/src/modules/objects/class_treewidget.h
+++ b/src/modules/objects/class_treewidget.h
@@ -70,6 +70,7 @@ protected:
 	bool setAcceptDrops(KviKvsObjectFunctionCall *c);
 	bool setHeaderLabels(KviKvsObjectFunctionCall *c);
 	bool setColumnCount(KviKvsObjectFunctionCall *c);
+        bool topLevelItem(KviKvsObjectFunctionCall *c);
 protected slots:
 	void slotClicked(QTreeWidgetItem *,int);
 	void slotCustomContextMenuRequested(const QPoint &pnt);