r1830 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui

[rob at sita.openmoko.org]

Author: rob
Date: 2007-04-25 12:11:29 +0200 (Wed, 25 Apr 2007)
New Revision: 1830

Modified:
   trunk/src/target/OM-2007/openmoko-libs/ChangeLog
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h
Log:
2007-04-25  Rob Bradford  <rob at openedhand.com>

	* libmokoui/moko-scrolled-pane.c: (moko_scrolled_pane_pack),
	(moko_scrolled_pane_unpack), (moko_scrolled_pane_get_child):
	* libmokoui/moko-scrolled-pane.h:
	Improve the API for the MokoScrolledPane widget (see Bugzilla #512.)



Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-04-25 10:07:22 UTC (rev 1829)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-04-25 10:11:29 UTC (rev 1830)
@@ -1,3 +1,10 @@
+2007-04-25  Rob Bradford  <rob at openedhand.com>
+
+	* libmokoui/moko-scrolled-pane.c: (moko_scrolled_pane_pack),
+	(moko_scrolled_pane_unpack), (moko_scrolled_pane_get_child):
+	* libmokoui/moko-scrolled-pane.h:
+	Improve the API for the MokoScrolledPane widget (see Bugzilla #512.)
+
 2007-04-16  Rob Bradford  <rob at openedhand.com>
 
 	* libmokoui/moko-message-dialog.c: (moko_message_dialog_map),

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c	2007-04-25 10:07:22 UTC (rev 1829)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c	2007-04-25 10:11:29 UTC (rev 1830)
@@ -144,9 +144,39 @@
     on = !on;
 }
 
-GtkScrolledWindow* moko_scrolled_pane_get_scrolled_window(MokoScrolledPane* self)
+void moko_scrolled_pane_pack (MokoScrolledPane *pane, GtkWidget *child)
 {
-    MokoScrolledPanePrivate* priv = SCROLLED_PANE_GET_PRIVATE(self);
-    g_assert( priv->scrolledwindow );
-    return priv->scrolledwindow;
+  MokoScrolledPanePrivate *priv;
+
+  g_return_if_fail (MOKO_IS_SCROLLED_PANE (pane));
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  gtk_container_add (GTK_CONTAINER (priv->scrolledwindow), child);
 }
+
+void moko_scrolled_pane_unpack (MokoScrolledPane *pane, GtkWidget *child)
+{
+  MokoScrolledPanePrivate *priv;
+
+  g_return_if_fail (MOKO_IS_SCROLLED_PANE (pane));
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  gtk_container_remove (GTK_CONTAINER (priv->scrolledwindow), child);
+}
+
+GtkWidget *moko_scrolled_pane_get_child (MokoScrolledPane *pane)
+{
+  MokoScrolledPanePrivate *priv;
+  GtkWidget *child;
+
+  g_return_val_if_fail (MOKO_IS_SCROLLED_PANE (pane), NULL);
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  child = gtk_bin_get_child (GTK_BIN(priv->scrolledwindow));
+
+  return child;
+}
+

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h	2007-04-25 10:07:22 UTC (rev 1829)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h	2007-04-25 10:11:29 UTC (rev 1830)
@@ -43,6 +43,10 @@
 GType moko_scrolled_pane_get_type();
 GtkWidget* moko_scrolled_pane_new();
 
+void moko_scrolled_pane_pack (MokoScrolledPane *pane, GtkWidget *child);
+void moko_scrolled_pane_unpack (MokoScrolledPane *pane, GtkWidget *child);
+GtkWidget *moko_scrolled_pane_get_child (MokoScrolledPane *pane);
+
 G_END_DECLS
 
 #endif // _MOKO_SCROLLED_PANE_H_