r1847 - trunk/src/target/OM-2007/applications/openmoko-messages/src

[rob at sita.openmoko.org]

Author: rob
Date: 2007-04-26 16:45:17 +0200 (Thu, 26 Apr 2007)
New Revision: 1847

Modified:
   trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h
   trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
Log:
Port over to MokoScrolledPane from MokoDetailsWindow.


Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c	2007-04-26 14:18:59 UTC (rev 1846)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c	2007-04-26 14:45:17 UTC (rev 1847)
@@ -21,7 +21,7 @@
 
 GtkWidget* detail_area_mode_read (DetailArea* self);
 
-G_DEFINE_TYPE (DetailArea, detail_area, MOKO_TYPE_DETAILS_WINDOW)
+G_DEFINE_TYPE (DetailArea, detail_area, MOKO_TYPE_SCROLLED_PANE)
 
 #define DETAIL_AREA_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DETAIL_AREA, DetailAreaPrivate))
 
@@ -64,12 +64,12 @@
 static void
 detail_area_init (DetailArea *self)
 {
-  gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(self), GTK_POLICY_NEVER, GTK_POLICY_NEVER );
-
   self->notebook = GTK_NOTEBOOK( gtk_notebook_new() );
   gtk_notebook_append_page (self->notebook,detail_area_mode_read(self),NULL);
   gtk_notebook_set_show_tabs (self->notebook,FALSE);
   gtk_notebook_set_show_border (self->notebook,FALSE);
+
+  moko_scrolled_pane_pack (MOKO_SCROLLED_PANE (self), self->notebook);
 }
 
 GtkWidget* detail_area_new (void)

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h	2007-04-26 14:18:59 UTC (rev 1846)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h	2007-04-26 14:45:17 UTC (rev 1847)
@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include <libmokoui/moko-details-window.h>
+#include <libmokoui/moko-scrolled-pane.h>
 #include <libmokoui/moko-pixmap-button.h>
 #include <libmokoui/moko-tool-box.h>
 #include <libmokoui/moko-fixed.h>
@@ -57,7 +57,7 @@
 
 typedef struct _DetailArea
   {
-    MokoDetailsWindow parent;
+    MokoScrolledPane parent;
     GtkNotebook* notebook;
     GtkVBox* detailbox;
     GtkHBox* toolbox;
@@ -69,7 +69,7 @@
 
 typedef struct _DetailAreaClass
   {
-    MokoDetailsWindowClass parent_class;
+    MokoScrolledPaneClass parent_class;
   }
 DetailAreaClass;
 

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-04-26 14:18:59 UTC (rev 1846)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-04-26 14:45:17 UTC (rev 1847)
@@ -403,10 +403,10 @@
 void populate_detail_area( MessengerData* d )
 {
   d->details = detail_area_new();
+
   gtk_widget_show (d->details);
-  gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(d->details), detail_area_get_notebook(DETAIL_AREA(d->details)));
   moko_paned_window_set_details_pane( MOKO_PANED_WINDOW(d->window), 
-          GTK_WIDGET(moko_details_window_put_in_box(MOKO_DETAILS_WINDOW(d->details))));
+          GTK_WIDGET(d->details));
 }
 
 void main_quit(GtkMenuItem* item, MessengerData* d)