r303 - trunk/src/target/OM-2007/openmoko-libs/libmokoui

[ken_zhao at gta01.hmw-consulting.de]

Author: ken_zhao
Date: 2006-12-05 07:23:08 +0000 (Tue, 05 Dec 2006)
New Revision: 303

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h
Log:
mokoui:moko-navigation-list init update.


Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c	2006-12-05 06:47:59 UTC (rev 302)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c	2006-12-05 07:23:08 UTC (rev 303)
@@ -18,7 +18,7 @@
 
 #include "moko-navigation-list.h"
 
-G_DEFINE_TYPE (MokoNavigationList, moko_navigation_list, GTK_TYPE_VIEWPORT);
+G_DEFINE_TYPE (MokoNavigationList, moko_navigation_list, GTK_TYPE_VIEWPORT)
 
 #define NAVIGATION_LIST_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_NAVIGATION_LIST, MokoNavigationListPrivate))
 
@@ -336,11 +336,12 @@
     priv->treeview = (MokoTreeView *) moko_tree_view_new ();
     priv->navigationsw = moko_tree_view_put_into_scrolled_window (priv->treeview);
     
-    gtk_widget_set_size_request ( GTK_VIEWPORT (self), 458, 160 );
-    gtk_fixed_put ( GTK_CONTAINER (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
     
+    gtk_widget_set_size_request ( GTK_WIDGET (self), 458, 160 );
+    gtk_fixed_put ( GTK_FIXED (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
     
-    return GTK_WIDGET(self);
+    
+    return self;
 }
 
 MokoNavigationList*
@@ -359,17 +360,23 @@
     priv->treeview = (MokoTreeView *) moko_tree_view_new_with_model (model);
     priv->navigationsw = moko_tree_view_put_into_scrolled_window (priv->treeview);
     
-    gtk_widget_set_size_request ( GTK_VIEWPORT (self), 458, 160 );
-    gtk_fixed_put ( GTK_CONTAINER (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
+    gtk_widget_set_size_request ( GTK_WIDGET (self), 458, 160 );
+    gtk_fixed_put ( GTK_FIXED (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
     
     
-    return GTK_WIDGET(self);
+    return self;
 }
 
 
-MokoTreeView* moko_navigation_list_get_tree_view(MokoNavigationList* self)
+void moko_navigation_list_append_column (MokoNavigationList* self, GtkTreeViewColumn* column)
 {
-    MokoNavigationListPrivate* priv = NAVIGATION_LIST_PRIVATE(self);
+    MokoNavigationListPrivate* priv = NAVIGATION_LIST_PRIVATE (self);
+    moko_tree_view_append_column( MOKO_TREE_VIEW (priv->treeview), column );
+}
+
+MokoTreeView* moko_navigation_list_get_tree_view (MokoNavigationList* self)
+{
+    MokoNavigationListPrivate* priv = NAVIGATION_LIST_PRIVATE (self);
     return priv->treeview;
 }
 

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h	2006-12-05 06:47:59 UTC (rev 302)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h	2006-12-05 07:23:08 UTC (rev 303)
@@ -26,6 +26,7 @@
 #include <gtk/gtkfixed.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkalignment.h>
+#include <gtk/gtkliststore.h>
 
 #include <glib-object.h>
 
@@ -50,7 +51,7 @@
 MokoNavigationList* moko_navigation_list_new (void);
 MokoNavigationList* moko_navigation_list_new_with_model (GtkTreeModel *model);
 
-
+void moko_navigation_list_append_column (MokoNavigationList* self, GtkTreeViewColumn* column);
 MokoTreeView* moko_navigation_list_get_tree_view(MokoNavigationList* self);
 
 G_END_DECLS