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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Wed Feb 14 13:48:17 CET 2007


Author: thomas
Date: 2007-02-14 13:48:13 +0100 (Wed, 14 Feb 2007)
New Revision: 987

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h
Log:
* Fix compiler warnings
* Use Gtk+ conventions for widget variables (i.e. always use GtkWidget)


Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -446,7 +446,7 @@
     gchar* name;
     va_start(valist, self);
 
-    while ( name = va_arg(valist, gchar*) )
+    while ( (name = va_arg(valist, gchar*)) )
     {
         gchar* filename = g_strconcat( name, ".png", NULL );
         moko_debug( "-- adding stock icon '%s' from pixmap %s", name, g_build_filename( DATADIR "icons", filename, NULL ) );
@@ -468,9 +468,9 @@
  **/
 GtkWidget* moko_application_execute_dialog(MokoApplication* self, const gchar* title, GtkWidget* contents)
 {
-    MokoDialogWindow* dialog = moko_dialog_window_new();
-    moko_dialog_window_set_title( dialog, title );
-    moko_dialog_window_set_contents( dialog, contents );
-    moko_dialog_window_run( dialog );
+    GtkWidget* dialog = moko_dialog_window_new();
+    moko_dialog_window_set_title( MOKO_DIALOG_WINDOW (dialog), title );
+    moko_dialog_window_set_contents( MOKO_DIALOG_WINDOW (dialog), contents );
+    moko_dialog_window_run( MOKO_DIALOG_WINDOW (dialog) );
     return GTK_WIDGET (dialog);
 }

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h	2007-02-14 12:48:13 UTC (rev 987)
@@ -51,6 +51,7 @@
 gboolean moko_application_get_is_topmost(MokoApplication* self);
 void moko_application_set_main_window(MokoApplication* self, MokoWindow* window);
 GtkWidget* moko_application_get_main_window(MokoApplication* self);
+void moko_application_add_window (MokoApplication *self, MokoWindow *window);
 
 gchar* moko_application_get_style_pixmap_dir();
 void moko_application_add_stock_icons(MokoApplication* self, ...);

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -85,7 +85,7 @@
 moko_details_window_init (MokoDetailsWindow *self)
 {
     moko_debug( "moko_details_window_init" );
-    gtk_scrolled_window_set_policy( self, GTK_POLICY_NEVER, GTK_POLICY_NEVER );
+    gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW (self), GTK_POLICY_NEVER, GTK_POLICY_NEVER );
 }
 
 GtkWidget*
@@ -94,21 +94,21 @@
     return GTK_WIDGET (g_object_new(MOKO_TYPE_DETAILS_WINDOW, NULL ));
 }
 
-GtkBox* moko_details_window_put_in_box(MokoDetailsWindow* self)
+GtkWidget* moko_details_window_put_in_box(MokoDetailsWindow* self)
 {
     moko_debug( "moko_details_window_put_in_box" );
     //FIXME perfect place to add portrait/landscape switch
-    GtkHBox* hbox = gtk_hbox_new( FALSE, 0 );
-    GtkVBox* vbox = gtk_vbox_new( FALSE, 0 );
+    GtkWidget* hbox = gtk_hbox_new( FALSE, 0 );
+    GtkWidget* vbox = gtk_vbox_new( FALSE, 0 );
     gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(self), TRUE, TRUE, 0 );
-    MokoPixmapButton* fullscreen = moko_pixmap_button_new();
+    GtkWidget* fullscreen = moko_pixmap_button_new();
     gtk_widget_set_name( GTK_WIDGET(fullscreen), "mokodetailswindow-fullscreen-button-on" );
     gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(fullscreen), FALSE, FALSE, 0 );
-    GtkVScrollbar* bar = gtk_vscrollbar_new( gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(self) ) );
+    GtkWidget* bar = gtk_vscrollbar_new( gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(self) ) );
     gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(bar), TRUE, TRUE, 0 );
     gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(vbox), FALSE, FALSE, 0 );
     g_signal_connect( G_OBJECT(fullscreen), "clicked", G_CALLBACK(_cb_fullscreen_clicked), self );
-    return hbox;
+    return GTK_WIDGET (hbox);
 }
 
 static void _cb_fullscreen_clicked(GtkButton* button, MokoDetailsWindow* self)
@@ -125,8 +125,8 @@
         gtk_widget_set_name( GTK_WIDGET(button), "mokodetailswindow-fullscreen-button-on" );
         gtk_widget_queue_draw( GTK_WIDGET(button) ); //FIXME necessary?
     }
-    MokoPanedWindow* mainwindow = moko_application_get_main_window( moko_application_get_instance() );
+    GtkWidget* mainwindow = moko_application_get_main_window( moko_application_get_instance() );
     g_return_if_fail( MOKO_IS_PANED_WINDOW(mainwindow) );
-    moko_paned_window_set_fullscreen( mainwindow, on );
+    moko_paned_window_set_fullscreen( MOKO_PANED_WINDOW (mainwindow), on );
     on = !on;
 }

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h	2007-02-14 12:48:13 UTC (rev 987)
@@ -44,7 +44,7 @@
 GType moko_details_window_get_type();
 GtkWidget* moko_details_window_new();
 
-GtkBox* moko_details_window_put_in_box(MokoDetailsWindow* self);
+GtkWidget* moko_details_window_put_in_box(MokoDetailsWindow* self);
 
 G_END_DECLS
 

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -18,6 +18,7 @@
 
 #include "moko-dialog-window.h"
 #include "moko-pixmap-button.h"
+#include "moko-application.h"
 
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkdialog.h>
@@ -43,16 +44,16 @@
 
 struct _MokoDialogWindowPrivate
 {
-    GtkVBox* vbox;
-    GtkHBox* hbox;
-    GtkEventBox* eventbox;
-    GtkLabel* label;
-    MokoPixmapButton* closebutton;
+    GtkWidget* vbox;        /* GtkVBox */
+    GtkWidget* hbox;        /* GtkHBox */
+    GtkWidget* eventbox;    /* GtkEventBox */
+    GtkWidget* label;       /* GtkLabel */
+    GtkWidget* closebutton; /* MokoPixmapButton */
 };
 
 typedef struct _MokoDialogRunInfo
 {
-    MokoDialogWindow *dialog;
+    GtkWidget *dialog; /* MokoDialogWindow */
     gint response_id;
     GMainLoop *loop;
     gboolean destroyed;
@@ -125,6 +126,7 @@
     G_OBJECT_CLASS (moko_dialog_window_parent_class)->finalize (object);
 }
 
+static void
 moko_dialog_window_class_init(MokoDialogWindowClass* klass)
 {
     GObjectClass* object_class = G_OBJECT_CLASS(klass);
@@ -145,10 +147,10 @@
 moko_dialog_window_init(MokoDialogWindow* self)
 {
     moko_debug( "moko_dialog_window_init" );
-    MokoWindow* parent = moko_application_get_main_window( moko_application_get_instance() );
+    GtkWidget* parent = moko_application_get_main_window( moko_application_get_instance() );
     if ( parent )
     {
-        gtk_window_set_transient_for( GTK_WINDOW(self), parent );
+        gtk_window_set_transient_for( GTK_WINDOW(self), GTK_WINDOW (parent) );
 #ifndef DEBUG_THIS_FILE
         gtk_window_set_modal( GTK_WINDOW(self), TRUE );
 #endif
@@ -164,34 +166,34 @@
     {
         priv->label = gtk_label_new( title );
         gtk_window_set_title( GTK_WINDOW(self), title );
-        gtk_widget_set_name( GTK_WIDGET(priv->label), "mokodialogwindow-title-label" );
+        gtk_widget_set_name( priv->label, "mokodialogwindow-title-label" );
         priv->hbox = gtk_hbox_new( FALSE, 0 );
         priv->eventbox = gtk_event_box_new();
-        gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->eventbox), TRUE, TRUE, 0 );
+        gtk_box_pack_start( GTK_BOX(priv->hbox), priv->eventbox, TRUE, TRUE, 0 );
         priv->closebutton = moko_pixmap_button_new();
-        gtk_widget_set_name( GTK_WIDGET(priv->closebutton), "mokodialogwindow-closebutton" );
+        gtk_widget_set_name( priv->closebutton, "mokodialogwindow-closebutton" );
         g_signal_connect_swapped( G_OBJECT(priv->closebutton), "clicked", G_CALLBACK(moko_dialog_window_close), self );
-        gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->closebutton), FALSE, FALSE, 0 );
-        gtk_container_add( GTK_CONTAINER(priv->eventbox), GTK_WIDGET(priv->label) );
-        gtk_widget_set_name( GTK_WIDGET(priv->eventbox), "mokodialogwindow-title-labelbox" );
+        gtk_box_pack_start( GTK_BOX(priv->hbox), priv->closebutton, FALSE, FALSE, 0 );
+        gtk_container_add( GTK_CONTAINER(priv->eventbox), priv->label );
+        gtk_widget_set_name( priv->eventbox, "mokodialogwindow-title-labelbox" );
         //FIXME get from theme
         gtk_misc_set_padding( GTK_MISC(priv->label), 0, 6 );
-        gtk_widget_show( GTK_WIDGET(priv->hbox) );
-        gtk_widget_show( GTK_WIDGET(priv->label) );
-        gtk_widget_show( GTK_WIDGET(priv->closebutton) );
-        gtk_widget_show( GTK_WIDGET(priv->eventbox) );
+        gtk_widget_show( priv->hbox );
+        gtk_widget_show( priv->label );
+        gtk_widget_show( priv->closebutton );
+        gtk_widget_show( priv->eventbox );
     }
     else
     {
-        gtk_label_set_text( priv->label, title );
+        gtk_label_set_text( GTK_LABEL (priv->label), title );
         gtk_window_set_title( GTK_WINDOW(self), title );
     }
     if ( !priv->vbox )
     {
         priv->vbox = gtk_vbox_new( FALSE, 0 );
-        gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->hbox), FALSE, FALSE, 0 );
-        gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->vbox) );
-        gtk_widget_show( GTK_WIDGET(priv->vbox) );
+        gtk_box_pack_start( GTK_BOX(priv->vbox), priv->hbox, FALSE, FALSE, 0 );
+        gtk_container_add( GTK_CONTAINER(self), priv->vbox );
+        gtk_widget_show( priv->vbox );
     }
 }
 

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -16,12 +16,14 @@
  *  Current Version: $Rev$ ($Date) [$Author: mickey $]
  */
 
+#include "moko-application.h"
 #include "moko-finger-tool-box.h"
 #include "moko-finger-window.h"
 #include "moko-pixmap-button.h"
 #include "moko-window.h"
 
 #include <gtk/gtkhbox.h>
+#include <string.h>
 
 //#define DEBUG_THIS_FILE
 #ifdef DEBUG_THIS_FILE
@@ -44,8 +46,8 @@
 typedef struct _MokoFingerToolBoxPrivate
 {
     GdkBitmap* mask;
-    GtkHBox* hbox;
-    MokoPixmapButton* rightarrow;
+    GtkWidget* hbox;       /* GtkHBox          */
+    GtkWidget* rightarrow; /* MokoPixmapButton */
     gboolean rightArrowVisible;
 
     guint maxButtonsPerPage;
@@ -53,7 +55,7 @@
     guint leftButton;
     guint buttonWidth;
 
-    GtkWindow* popup;
+    GtkWidget* popup; /* GtkWindow */
     GtkWidget* parent;
 
     GdkPixbuf* background_pixbuf;
@@ -103,14 +105,12 @@
 
     MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
 
-    GtkAllocation* a = &GTK_WIDGET(priv->hbox)->allocation;
+    GtkAllocation* a = &(priv->hbox->allocation);
 
     //FIXME get from style
     priv->maxButtonsPerPage = a->width / ( priv->buttonWidth + (INNER_PADDING/2) );
     moko_debug( "-- width % buttonWidth = %d", a->width % priv->buttonWidth );
 
-    GtkRequisition* r = &GTK_WIDGET(priv->hbox)->requisition;
-
     guint numChild = 0;
 
     void checkstatus( GtkWidget* child, MokoFingerToolBox* self )
@@ -138,16 +138,14 @@
         numChild++;
     }
 
-    gboolean oldRightArrowVisible = priv->rightArrowVisible;
-
     priv->rightArrowVisible = priv->numberOfButtons > priv->maxButtonsPerPage;
 
-    gtk_container_foreach( GTK_CONTAINER(priv->hbox), &checkstatus, self );
+    gtk_container_foreach( GTK_CONTAINER(priv->hbox), (GtkCallback) checkstatus, self );
 
     if ( priv->rightArrowVisible )
-        gtk_widget_show( GTK_WIDGET(priv->rightarrow) );
+        gtk_widget_show( priv->rightarrow );
     else
-        gtk_widget_hide( GTK_WIDGET(priv->rightarrow) );
+        gtk_widget_hide( priv->rightarrow );
 
     moko_debug( "right button = %d", priv->rightArrowVisible );
 }
@@ -253,8 +251,8 @@
     if ( !priv->popup )
     {
         priv->popup = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_type_hint( priv->popup, GDK_WINDOW_TYPE_HINT_DIALOG );
-        gtk_window_set_decorated( priv->popup, FALSE );
+        gtk_window_set_type_hint( GTK_WINDOW (priv->popup), GDK_WINDOW_TYPE_HINT_DIALOG );
+        gtk_window_set_decorated( GTK_WINDOW (priv->popup), FALSE );
         gtk_container_add( GTK_CONTAINER(priv->popup), widget );
     }
 
@@ -262,18 +260,18 @@
     
     g_return_if_fail( MOKO_IS_FINGER_WINDOW(window) );
     //FIXME set also transient for all other windows belonging to this app?
-    gtk_window_set_transient_for( priv->popup, window );
+    gtk_window_set_transient_for( GTK_WINDOW (priv->popup), GTK_WINDOW (window) );
     GtkAllocation geometry;
-    gboolean valid = moko_finger_window_get_geometry_hint( MOKO_FINGER_WINDOW(window), widget, &geometry );
+    moko_finger_window_get_geometry_hint( MOKO_FINGER_WINDOW(window), widget, &geometry );
     g_signal_connect_after( G_OBJECT(widget), "size_allocate", G_CALLBACK(cb_size_allocate), widget );
-    gtk_window_move( priv->popup, geometry.x, geometry.y );
+    gtk_window_move( GTK_WINDOW (priv->popup), geometry.x, geometry.y );
     gtk_widget_set_size_request( GTK_WIDGET(widget), geometry.width, geometry.height );
-    gtk_window_resize( priv->popup, geometry.width, geometry.height );
+    gtk_window_resize( GTK_WINDOW (priv->popup), geometry.width, geometry.height );
 
     gtk_widget_show( priv->popup );
-    MokoFingerWheel* wheel = moko_finger_window_get_wheel( MOKO_FINGER_WINDOW(window) );
+    GtkWidget* wheel = moko_finger_window_get_wheel( MOKO_FINGER_WINDOW(window) );
     if ( wheel && GTK_WIDGET_VISIBLE(wheel) )
-        moko_finger_wheel_set_transient_for( wheel, priv->popup ); //moko_finger_wheel_raise( wheel );
+        moko_finger_wheel_set_transient_for( MOKO_FINGER_WHEEL (wheel), GTK_WINDOW (priv->popup) ); //moko_finger_wheel_raise( wheel );
 }
 
 static void moko_finger_tool_box_hide(GtkWidget* widget)
@@ -290,15 +288,15 @@
     MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
     gtk_widget_set_name( GTK_WIDGET(self), "mokofingertoolbox" );
 
-    priv->rightarrow = MOKO_PIXMAP_BUTTON( moko_pixmap_button_new() );
-    gtk_widget_set_name( GTK_WIDGET(priv->rightarrow), "mokofingertoolbox-rightarrow" );
+    priv->rightarrow = moko_pixmap_button_new();
+    gtk_widget_set_name( priv->rightarrow, "mokofingertoolbox-rightarrow" );
 
     priv->hbox = gtk_hbox_new( FALSE, INNER_PADDING );
-    gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->hbox) );
+    gtk_container_add( GTK_CONTAINER(self), priv->hbox );
 
     gtk_box_pack_end( GTK_BOX(priv->hbox), priv->rightarrow, FALSE, FALSE, 0 );
 
-    gtk_widget_show( GTK_WIDGET(priv->hbox) );
+    gtk_widget_show( priv->hbox );
 
     g_signal_connect( G_OBJECT(priv->rightarrow), "clicked", G_CALLBACK(cb_right_button_pressed), self );
     g_signal_connect_after( G_OBJECT(self), "size-allocate", G_CALLBACK(cb_configure), self );
@@ -319,12 +317,9 @@
 GtkWidget*
 moko_finger_tool_box_add_button(MokoFingerToolBox* self)
 {
-    static gchar text[] = "0\0";
     MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
 
     GtkWidget* b = moko_pixmap_button_new();
-    gtk_button_set_label( GTK_BUTTON(b), &text );
-    text[0]++;
     gtk_widget_set_name( b, "mokofingertoolbox-toolbutton" );
 
     priv->numberOfButtons++;

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -53,7 +53,7 @@
 
 typedef struct _MokoFingerWheelPrivate
 {
-    GtkWindow* popup;
+    GtkWidget* popup; /* GtkWindow */
     GtkWidget* parent;
 } MokoFingerWheelPrivate;
 
@@ -220,18 +220,18 @@
     if ( !priv->popup )
     {
         priv->popup = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_type_hint( priv->popup, GDK_WINDOW_TYPE_HINT_DIALOG );
-        gtk_window_set_decorated( priv->popup, FALSE );
+        gtk_window_set_type_hint( GTK_WINDOW (priv->popup), GDK_WINDOW_TYPE_HINT_DIALOG );
+        gtk_window_set_decorated( GTK_WINDOW (priv->popup), FALSE );
         gtk_container_add( GTK_CONTAINER(priv->popup), widget );
-        MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
+        GtkWidget* window = moko_application_get_main_window( moko_application_get_instance() );
         //FIXME check if it's a finger window
         //FIXME set it not only transient for the main window, but also for other windows belonging to this application
 //        gtk_window_set_transient_for(priv->popup, window );
-        gtk_window_set_transient_for(priv->popup, priv->parent );
+        gtk_window_set_transient_for( GTK_WINDOW (priv->popup), GTK_WINDOW (priv->parent) );
 
         GtkAllocation geometry;
-        gboolean valid = moko_finger_window_get_geometry_hint( window, widget, &geometry );
-        gtk_window_move( GTK_WIDGET(priv->popup), geometry.x, geometry.y );
+        moko_finger_window_get_geometry_hint( MOKO_FINGER_WINDOW (window), widget, &geometry );
+        gtk_window_move( GTK_WINDOW(priv->popup), geometry.x, geometry.y );
 
         //FIXME Isn't there a way to get this as a mask directly from the style without having to reload it?
         GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(GTK_WIDGET(widget)->style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL], NULL);
@@ -249,12 +249,12 @@
 //    MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
     if ( MOKO_IS_FINGER_WINDOW(priv->parent ) )
     {
-        MokoFingerToolBox* toolbox = moko_finger_window_get_toolbox( priv->parent );
+        GtkWidget* toolbox = moko_finger_window_get_toolbox( MOKO_FINGER_WINDOW (priv->parent) );
         if ( GTK_WIDGET_VISIBLE(toolbox) )
         {
             moko_debug( "moko_finger_wheel: toolbox is visible, sending resize" );
-            gtk_widget_hide( GTK_WIDGET(toolbox) );
-            gtk_widget_show( GTK_WIDGET(toolbox) );
+            gtk_widget_hide( toolbox );
+            gtk_widget_show( toolbox );
         }
         else
         {
@@ -279,12 +279,12 @@
 
     if ( MOKO_IS_FINGER_WINDOW(window) )
     {
-        MokoFingerToolBox* toolbox = moko_finger_window_get_toolbox( MOKO_FINGER_WINDOW(window) );
+        GtkWidget* toolbox = moko_finger_window_get_toolbox( MOKO_FINGER_WINDOW(window) );
         if ( GTK_WIDGET_VISIBLE(toolbox) )
         {
             moko_debug( "moko_finger_wheel: toolbox is visible, sending resize" );
-            gtk_widget_hide( GTK_WIDGET(toolbox) );
-            gtk_widget_show( GTK_WIDGET(toolbox) );
+            gtk_widget_hide( toolbox );
+            gtk_widget_show( toolbox );
         }
         else
         {
@@ -302,7 +302,7 @@
     moko_debug( "moko_finger_wheel_raise" );
     MokoFingerWheelPrivate* priv = MOKO_FINGER_WHEEL_GET_PRIVATE(self);
     g_return_if_fail(priv->popup);
-    gdk_window_raise( GTK_WIDGET(priv->popup)->window );
+    gdk_window_raise( priv->popup->window );
 }
 
 void moko_finger_wheel_set_transient_for(MokoFingerWheel* self, GtkWindow* window)
@@ -310,8 +310,8 @@
     moko_debug( "moko_finger_wheel_set_transient_for" );
     MokoFingerWheelPrivate* priv = MOKO_FINGER_WHEEL_GET_PRIVATE(self);
     g_return_if_fail(priv->popup);
-    gtk_window_set_transient_for( priv->popup, window );
-    gdk_window_raise( GTK_WIDGET(priv->popup)->window );
+    gtk_window_set_transient_for( GTK_WINDOW (priv->popup), window );
+    gdk_window_raise( priv->popup->window );
 }
 
 /**
@@ -371,8 +371,6 @@
 {
     moko_debug( "moko_finger_wheel_button_press" );
 
-    MokoFingerWheelPrivate* priv = MOKO_FINGER_WHEEL_GET_PRIVATE(widget);
-
     gtk_grab_add( widget );
     gtk_widget_set_state( widget, GTK_STATE_ACTIVE );
     gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h	2007-02-14 12:48:13 UTC (rev 987)
@@ -22,6 +22,7 @@
 #include "moko-fixed.h"
 
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -50,6 +51,7 @@
 GType moko_finger_wheel_get_type();
 GtkWidget* moko_finger_wheel_new(GtkWidget * parent);
 void moko_finger_wheel_raise(MokoFingerWheel* self);
+void moko_finger_wheel_set_transient_for(MokoFingerWheel* self, GtkWindow* window);
 
 G_END_DECLS
 

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -43,12 +43,12 @@
 
 typedef struct _MokoFingerWindowPriv
 {
-    GtkVBox* vbox;
-    GtkHBox* hbox;
-    GtkLabel* label;
-    MokoMenuBox* menubox;
-    MokoFingerWheel* wheel;
-    MokoFingerToolBox* tools;
+    GtkWidget* vbox;    /* GtkVBox           */
+    GtkWidget* hbox;    /* GtkHBox           */
+    GtkWidget* label;   /* GtkLabel          */
+    GtkWidget* menubox; /* MokoMenuBox       */
+    GtkWidget* wheel;   /* MokoFingerWheel   */
+    GtkWidget* tools;   /* MokoFingerToolBox */
 } MokoFingerWindowPriv;
 
 static void moko_finger_window_dispose(GObject *object)
@@ -78,7 +78,7 @@
     moko_debug( "moko_finger_window_init" );
     MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
     priv->vbox = gtk_vbox_new( FALSE, 0 );
-    gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->vbox) );
+    gtk_container_add( GTK_CONTAINER(self),priv->vbox );
 }
 
 GtkWidget* moko_finger_window_new() /* Construction */
@@ -93,9 +93,9 @@
     if (!priv->menubox )
     {
         priv->menubox = moko_menu_box_new();
-        gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->menubox), FALSE, FALSE, 0 );
+        gtk_box_pack_start( GTK_BOX(priv->vbox), priv->menubox, FALSE, FALSE, 0 );
     }
-    moko_menu_box_set_application_menu( priv->menubox, menu );
+    moko_menu_box_set_application_menu( MOKO_MENU_BOX (priv->menubox), menu );
 }
 
 void moko_finger_window_set_contents(MokoFingerWindow* self, GtkWidget* child)
@@ -109,7 +109,7 @@
 {
     moko_debug( "moko_finger_window_get_wheel" );
     MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
-    if (!priv->wheel) priv->wheel = moko_finger_wheel_new(self);
+    if (!priv->wheel) priv->wheel = moko_finger_wheel_new (GTK_WIDGET (self));
     return GTK_WIDGET (priv->wheel);
 }
 
@@ -117,7 +117,7 @@
 {
     moko_debug( "moko_finger_window_get_toolbox" );
     MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
-    if (!priv->tools) priv->tools = moko_finger_tool_box_new(self);
+    if (!priv->tools) priv->tools = moko_finger_tool_box_new(GTK_WIDGET (self));
     return GTK_WIDGET (priv->tools);
 }
 
@@ -151,7 +151,7 @@
         if ( priv->wheel && GTK_WIDGET_VISIBLE(priv->wheel) )
         {
             moko_debug( "-- wheel is visible" );
-            GtkAllocation* wheelalloc = &(GTK_WIDGET(priv->wheel)->allocation);
+            GtkAllocation* wheelalloc = &(priv->wheel->allocation);
             moko_debug( "-- wheel alloc is %d, %d, %d, %d", wheelalloc->x, wheelalloc->y, wheelalloc->width, wheelalloc->height );
             //FIXME get from theme: 22 is the overlap factor for wheel + toolbox
 #define WHEEL_TOOL_BOX_OVERLAP 22

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -74,6 +74,9 @@
     widget_class->size_request = moko_fixed_size_request;
     widget_class->size_allocate = moko_fixed_size_allocate;
 
+    object_class->dispose = moko_fixed_dispose;
+    object_class->finalize = moko_fixed_finalize;
+
     /* install properties */
     gtk_widget_class_install_style_property( widget_class, g_param_spec_boxed(
         "size-request",

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -19,11 +19,8 @@
 
 #include "moko-menu-box.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
+#include <string.h>
 
 #undef DEBUG_THIS_FILE
 #ifdef DEBUG_THIS_FILE
@@ -37,12 +34,12 @@
 
 typedef struct _MokoMenuBoxPriv
 {
-    GtkMenuBar* menubar_l;
-    GtkImageMenuItem* appitem;
-    GtkMenu* appmenu;
-    GtkMenuBar* menubar_r;
-    GtkImageMenuItem* filteritem;
-    GtkMenu* filtermenu;
+    GtkWidget* menubar_l;  /* GtkMenuBar       */
+    GtkWidget* appitem;    /* GtkImageMenuItem */
+    GtkWidget* appmenu;    /* GtkMenu          */
+    GtkWidget* menubar_r;  /* GtkMenuBar       */
+    GtkWidget* filteritem; /* GtkImageMenuItem */
+    GtkWidget* filtermenu; /* GtkMenu          */
 } MokoMenuBoxPriv;
 
 /* add your signals here */
@@ -95,8 +92,6 @@
 
 static gboolean cb_button_release(GtkWidget *widget, GdkEventButton *event, GtkMenu* menu)
 {
-    MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE( MOKO_MENU_BOX(widget->parent) );
-
     moko_debug( "menu open forwarder: clicked on %f, %f", event->x, event->y );
     moko_debug( "menu open forwarder: clicked on window %p, whereas our window is %p", event->window, widget->window );
 
@@ -107,7 +102,8 @@
         moko_debug( "menu open forwarder: not yet open -- popping up" );
         /* this is kind of funny, if you don't add the grab manually,
            then Gtk+ won't recognize the next click (selection) */
-        gtk_grab_add(GTK_WIDGET(widget) );
+        /* FIXME: check this is still needed ... */
+        gtk_grab_add( widget );
         gtk_menu_shell_select_first( GTK_MENU_SHELL(widget), TRUE );
         return TRUE;
     }
@@ -126,7 +122,7 @@
     MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE(self);
 
     gchar* text;
-    GtkMenuItem* item = gtk_menu_get_active( menu );
+    GtkWidget* item = gtk_menu_get_active( menu );
     if (GTK_BIN(item)->child)
     {
         GtkWidget *child = GTK_BIN(item)->child;
@@ -153,49 +149,49 @@
     if (!priv->menubar_l )
     {
         priv->menubar_l = gtk_menu_bar_new();
-        gtk_widget_set_name( GTK_WIDGET(priv->menubar_l), "mokomenubox-application-menubar" );
-        gtk_box_pack_start( GTK_BOX(self), GTK_WIDGET(priv->menubar_l), TRUE, TRUE, 0 );
+        gtk_widget_set_name( priv->menubar_l, "mokomenubox-application-menubar" );
+        gtk_box_pack_start( GTK_BOX(self), priv->menubar_l, TRUE, TRUE, 0 );
 
     }
-    GtkImageMenuItem* appitem = gtk_image_menu_item_new_with_label( g_get_application_name() );
-    GtkImage* appicon = gtk_image_new_from_stock( "openmoko-application-menu-icon", GTK_ICON_SIZE_MENU );
-    gtk_image_menu_item_set_image( appitem, appicon );
+    GtkWidget* appitem = gtk_image_menu_item_new_with_label( g_get_application_name() );
+    GtkWidget* appicon = gtk_image_new_from_stock( "openmoko-application-menu-icon", GTK_ICON_SIZE_MENU );
+    gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM (appitem), appicon );
     gtk_widget_set_name( GTK_WIDGET(appitem), "transparent" );
     priv->appitem = appitem;
-    priv->appmenu = menu;
-    gtk_menu_item_set_submenu( appitem, menu );
-    gtk_menu_shell_append( GTK_MENU_BAR(priv->menubar_l), appitem );
+    priv->appmenu = GTK_WIDGET (menu);
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM (appitem), GTK_WIDGET (menu) );
+    gtk_menu_shell_append( GTK_MENU_SHELL (priv->menubar_l), appitem );
 
     //FIXME hack to popup the first menu if user clicks on menubar
-    g_signal_connect( GTK_WIDGET(priv->menubar_l), "button-press-event", G_CALLBACK(cb_button_release), menu );
+    g_signal_connect( priv->menubar_l, "button-press-event", G_CALLBACK(cb_button_release), menu );
 }
 
 void moko_menu_box_set_filter_menu(MokoMenuBox* self, GtkMenu* menu)
 {
     moko_debug( "moko_menu_box_set_filter_menu" );
-    GtkImageMenuItem* filtitem;
+    GtkWidget* filtitem;
 
     MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE(self);
     if (!priv->menubar_r )
     {
         priv->menubar_r = gtk_menu_bar_new();
-        gtk_widget_set_name( GTK_WIDGET(priv->menubar_r), "mokomenubox-filter-menubar" );
-        gtk_box_pack_end( GTK_BOX(self), GTK_WIDGET(priv->menubar_r), TRUE, TRUE, 0 );
+        gtk_widget_set_name( priv->menubar_r, "mokomenubox-filter-menubar" );
+        gtk_box_pack_end( GTK_BOX(self), priv->menubar_r, TRUE, TRUE, 0 );
     
         filtitem = gtk_image_menu_item_new_with_label( "Filter Menu" );
-        GtkImage* filticon = gtk_image_new_from_stock( "openmoko-filter-menu-icon", GTK_ICON_SIZE_MENU );
-        gtk_image_menu_item_set_image( filtitem, filticon );
-        gtk_widget_set_name( GTK_WIDGET(filtitem), "transparent" );
-				priv->filteritem = filtitem;
-				priv->filtermenu = menu;
-				gtk_menu_shell_append( GTK_MENU_BAR(priv->menubar_r), priv->filteritem );
-        gtk_menu_item_set_submenu( priv->filteritem, priv->filtermenu );
+        GtkWidget* filticon = gtk_image_new_from_stock( "openmoko-filter-menu-icon", GTK_ICON_SIZE_MENU );
+        gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM (filtitem), filticon );
+        gtk_widget_set_name( filtitem, "transparent" );
+        priv->filteritem = filtitem;
+        priv->filtermenu = GTK_WIDGET (menu);
+        gtk_menu_shell_append( GTK_MENU_SHELL (priv->menubar_r), priv->filteritem );
+        gtk_menu_item_set_submenu( GTK_MENU_ITEM (priv->filteritem), priv->filtermenu );
     }
-    priv->filtermenu = menu;
-    gtk_menu_item_set_submenu( priv->filteritem, priv->filtermenu );
-		g_signal_connect (G_OBJECT(menu), "selection_done", G_CALLBACK(cb_filter_menu_update), self );
+    priv->filtermenu = GTK_WIDGET (menu);
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM (priv->filteritem), priv->filtermenu );
+    g_signal_connect (G_OBJECT(menu), "selection_done", G_CALLBACK(cb_filter_menu_update), self );
     //FIXME hack to popup the first menu if user clicks on menubar
-    g_signal_connect( GTK_WIDGET(priv->menubar_r), "button-press-event", G_CALLBACK(cb_button_release), menu );
+    g_signal_connect( priv->menubar_r, "button-press-event", G_CALLBACK(cb_button_release), menu );
 }
 
 void moko_menu_box_set_active_filter(MokoMenuBox* self, gchar* text)
@@ -228,7 +224,7 @@
             moko_debug( "moko_menu_box_set_active_filter: match found" );
             //FIXME this is a bit hackish or is it?
             gtk_menu_set_active( GTK_MENU(priv->filtermenu), index );
-            cb_filter_menu_update( priv->filtermenu, self ); //need to sync. manually, since we it didn't go through popupmenu
+            cb_filter_menu_update( GTK_MENU (priv->filtermenu), self ); //need to sync. manually, since we it didn't go through popupmenu
             break;
         }
         ++index;
@@ -238,7 +234,7 @@
         g_warning( "moko_menu_box_set_active_filter: filter menu entry '%s' not found", text );
 }
 
-GtkMenuItem* moko_menu_box_get_filter_item (MokoMenuBox* self)
+GtkWidget* moko_menu_box_get_filter_item (MokoMenuBox* self)
 {
     MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE(self);
 

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	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -24,9 +24,9 @@
 
 typedef struct _MokoNavigationListPrivate
 {
-    GtkFixed* navigationcontainer;
-    GtkScrolledWindow* navigationsw;
-    MokoTreeView* treeview;
+    GtkWidget* navigationcontainer; /* GtkFixed */
+    GtkWidget* navigationsw;        /* GtkScrolledWindow */
+    GtkWidget* treeview;            /* MokoTreeView */
 } MokoNavigationListPrivate;
 
 /* forward declarations */
@@ -196,7 +196,7 @@
 
     MokoNavigationListPrivate* priv = NAVIGATION_LIST_PRIVATE (widget);
 
-    gtk_widget_set_size_request (GTK_WIDGET(priv->navigationsw), navigationsw_width, navigationsw_height);
+    gtk_widget_set_size_request (priv->navigationsw, navigationsw_width, navigationsw_height);
 
     requisition->width = (GTK_CONTAINER (widget)->border_width +
                           GTK_WIDGET (widget)->style->xthickness) * 2;
@@ -319,13 +319,13 @@
 
     gtk_viewport_set_shadow_type ( GTK_VIEWPORT (self), GTK_SHADOW_NONE );
 
-    priv->navigationcontainer = (GtkFixed *) gtk_fixed_new();
+    priv->navigationcontainer = gtk_fixed_new();
     gtk_container_add ( GTK_CONTAINER (self), GTK_WIDGET (priv->navigationcontainer) );
 
-    priv->treeview = (MokoTreeView *) moko_tree_view_new ();
+    priv->treeview = moko_tree_view_new ();
     gtk_tree_view_set_rules_hint ( GTK_TREE_VIEW (priv->treeview), TRUE );
     gtk_tree_view_set_headers_visible ( GTK_TREE_VIEW (priv->treeview), TRUE );
-    priv->navigationsw = moko_tree_view_put_into_scrolled_window (priv->treeview);
+    priv->navigationsw = moko_tree_view_put_into_scrolled_window (MOKO_TREE_VIEW (priv->treeview));
 
     gtk_widget_set_size_request ( GTK_WIDGET (self), 458, 160 );
     gtk_fixed_put ( GTK_FIXED (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
@@ -348,12 +348,12 @@
 
     gtk_viewport_set_shadow_type ( GTK_VIEWPORT (self), GTK_SHADOW_NONE );
 
-    priv->navigationcontainer = (GtkFixed *) gtk_fixed_new();
+    priv->navigationcontainer = gtk_fixed_new();
 
     gtk_container_add ( GTK_CONTAINER (self), GTK_WIDGET (priv->navigationcontainer) );
 
-    priv->treeview = (MokoTreeView *) moko_tree_view_new_with_model (model);
-    priv->navigationsw = moko_tree_view_put_into_scrolled_window (priv->treeview);
+    priv->treeview = moko_tree_view_new_with_model (model);
+    priv->navigationsw = moko_tree_view_put_into_scrolled_window ( MOKO_TREE_VIEW (priv->treeview));
 
     gtk_widget_set_size_request ( GTK_WIDGET (self), 458, 160 );
     gtk_fixed_put ( GTK_FIXED (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -37,13 +37,13 @@
 
 typedef struct _MokoPanedWindowPriv
 {
-    GtkVPaned* outerframe;
-    GtkVBox* upper;
-    MokoAlignment* upperenclosing;
-    MokoAlignment* lowerenclosing;
-    GtkVBox* lower;
-    MokoMenuBox* menubox;
-    MokoToolBox* toolbox;
+    GtkWidget* outerframe;     /* GtkVPaned     */
+    GtkWidget* upper;          /* GtkVBox       */
+    GtkWidget* upperenclosing; /* MokoAlignment */
+    GtkWidget* lowerenclosing; /* MokoAlignment */
+    GtkWidget* lower;          /* GtkVBox       */
+    GtkWidget* menubox;        /* MokoMenuBox   */
+    GtkWidget* toolbox;        /* MokoToolBox   */
 
 } MokoPanedWindowPriv;
 
@@ -77,11 +77,11 @@
     moko_debug( "moko_paned_window_init" );
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
     priv->outerframe = gtk_vpaned_new();
-    gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->outerframe) );
+    gtk_container_add( GTK_CONTAINER(self), priv->outerframe );
     priv->upper = gtk_vbox_new( FALSE, 0 );
-    gtk_paned_add1( GTK_PANED(priv->outerframe), GTK_WIDGET(priv->upper) );
+    gtk_paned_add1( GTK_PANED(priv->outerframe), priv->upper );
     priv->lower = gtk_vbox_new( FALSE, 0 );
-    gtk_paned_add2( GTK_PANED(priv->outerframe), GTK_WIDGET(priv->lower) );
+    gtk_paned_add2( GTK_PANED(priv->outerframe), priv->lower );
     priv->menubox = NULL;
     priv->toolbox = NULL;
 }
@@ -102,7 +102,7 @@
 GtkWidget* moko_paned_window_get_menubox(MokoPanedWindow* self)
 {
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
-    return GTK_WIDGET (priv->menubox);
+    return priv->menubox;
 }
 
 void moko_paned_window_set_application_menu(MokoPanedWindow* self, GtkMenu* menu)
@@ -113,9 +113,9 @@
     if (!priv->menubox )
     {
         priv->menubox = moko_menu_box_new();
-        gtk_box_pack_start( GTK_BOX(priv->upper), GTK_WIDGET(priv->menubox), FALSE, FALSE, 0 );
+        gtk_box_pack_start( GTK_BOX(priv->upper), priv->menubox, FALSE, FALSE, 0 );
     }
-    moko_menu_box_set_application_menu( priv->menubox, menu );
+    moko_menu_box_set_application_menu( MOKO_MENU_BOX (priv->menubox), menu );
 }
 
 void moko_paned_window_set_filter_menu(MokoPanedWindow* self, GtkMenu* menu)
@@ -125,9 +125,9 @@
     if (!priv->menubox )
     {
         priv->menubox = moko_menu_box_new();
-        gtk_box_pack_start( GTK_BOX(priv->upper), GTK_WIDGET(priv->menubox), FALSE, FALSE, 0 );
+        gtk_box_pack_start( GTK_BOX(priv->upper), priv->menubox, FALSE, FALSE, 0 );
     }
-    moko_menu_box_set_filter_menu( priv->menubox, menu );
+    moko_menu_box_set_filter_menu( MOKO_MENU_BOX (priv->menubox), menu );
 }
 
 void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child)
@@ -136,10 +136,10 @@
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
 
     priv->upperenclosing = moko_alignment_new();
-    gtk_widget_set_name( GTK_WIDGET(priv->upperenclosing), "mokopanedwindow-upper-enclosing" );
+    gtk_widget_set_name( priv->upperenclosing, "mokopanedwindow-upper-enclosing" );
     //FIXME put into MokoAlignment class
     gtk_alignment_set_padding( GTK_ALIGNMENT(priv->upperenclosing), 7, 7, 11, 11 ); //FIXME get from style (MokoAlignment::padding)
-    gtk_box_pack_end( GTK_BOX(priv->upper), GTK_WIDGET(priv->upperenclosing), TRUE, TRUE, 0 );
+    gtk_box_pack_end( GTK_BOX(priv->upper), priv->upperenclosing, TRUE, TRUE, 0 );
     gtk_container_add( GTK_CONTAINER(priv->upperenclosing), child );
 }
 
@@ -152,10 +152,10 @@
     gtk_box_pack_start( GTK_BOX(priv->lower), child, TRUE, TRUE, 0 );
 #else
     priv->lowerenclosing = moko_alignment_new();
-    gtk_widget_set_name( GTK_WIDGET(priv->lowerenclosing), "mokopanedwindow-lower-enclosing" );
+    gtk_widget_set_name( priv->lowerenclosing, "mokopanedwindow-lower-enclosing" );
     //FIXME put into MokoAlignment class
     gtk_alignment_set_padding( GTK_ALIGNMENT(priv->lowerenclosing), 7, 7, 11, 11 ); //FIXME get from style (MokoAlignment::padding)
-    gtk_box_pack_end( GTK_BOX(priv->lower), GTK_WIDGET(priv->lowerenclosing), TRUE, TRUE, 0 );
+    gtk_box_pack_end( GTK_BOX(priv->lower), priv->lowerenclosing, TRUE, TRUE, 0 );
     gtk_container_add( GTK_CONTAINER(priv->lowerenclosing), child );
 #endif
 }
@@ -164,8 +164,8 @@
 {
     moko_debug( "moko_paned_window_add_toolbox" );
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
-    gtk_box_pack_end( GTK_BOX(priv->upper), toolbox, FALSE, FALSE, 0 );
-    gtk_box_reorder_child( GTK_BOX(priv->upper), toolbox, 0 );
+    gtk_box_pack_end( GTK_BOX(priv->upper), GTK_WIDGET (toolbox), FALSE, FALSE, 0 );
+    gtk_box_reorder_child( GTK_BOX(priv->upper), GTK_WIDGET (toolbox), 0 );
 }
 
 void moko_paned_window_set_fullscreen(MokoPanedWindow* self, gboolean b)
@@ -174,10 +174,10 @@
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
     if ( b )
     {
-        gtk_widget_hide( GTK_WIDGET(priv->upper) );
+        gtk_widget_hide( priv->upper );
     }
     else
     {
-        gtk_widget_show( GTK_WIDGET(priv->upper) );
+        gtk_widget_show( priv->upper );
     }
 }

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -121,31 +121,33 @@
 {
     moko_debug( "moko_panel_applet_init" );
 
-    MokoPanelAppletClass* klass = MOKO_PANEL_APPLET_GET_CLASS(self);
+    /* MokoPanelAppletClass* klass = MOKO_PANEL_APPLET_GET_CLASS(self); */
     MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
     priv->hold_timeout_triggered = FALSE;
 
     self->eventbox = gtk_event_box_new();
-    gtk_event_box_set_visible_window( self->eventbox, FALSE );
-    gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(self->eventbox) );
+    gtk_event_box_set_visible_window( GTK_EVENT_BOX (self->eventbox), FALSE );
+    gtk_container_add( GTK_CONTAINER(self), self->eventbox );
     gtk_widget_show( self->eventbox );
 
-    g_signal_connect( G_OBJECT(self->eventbox), "button-release-event", cb_moko_panel_applet_button_release_event, self );
+    g_signal_connect( G_OBJECT(self->eventbox), "button-release-event", (GCallback) cb_moko_panel_applet_button_release_event, self );
 }
 
 static gboolean _moko_panel_applet_window_clicked(GtkWidget* widget, GdkEventButton* event, MokoPanelApplet* self)
 {
     gdk_pointer_ungrab( event->time );
     gtk_widget_hide( self->toplevelwindow );
+
+    return FALSE;
 }
 
 void moko_panel_applet_get_positioning_hint(MokoPanelApplet* self, GtkWidget* popup, int* x, int* y)
 {
     int win_w;
     int win_h;
-    gdk_window_get_geometry( GTK_WIDGET(self->toplevelwindow)->window, NULL, NULL, &win_w, &win_h, NULL );
+    gdk_window_get_geometry( self->toplevelwindow->window, NULL, NULL, &win_w, &win_h, NULL );
     moko_debug( "-- popup geom = %d, %d", win_w, win_h );
-    GtkAllocation* allocation = &GTK_WIDGET(self->toplevelwindow)->allocation;
+    GtkAllocation* allocation = &self->toplevelwindow->allocation;
     moko_debug( "-- popup alloc = %d, %d", allocation->width, allocation->height );
 
     GtkAllocation* applet_alloc = &GTK_WIDGET(self)->allocation;
@@ -155,7 +157,7 @@
     int y_abs;
 
     //FIXME this doesn't work w/ matchbox-panel 2 yet
-    gdk_window_get_root_origin( GTK_WIDGET(self->eventbox)->window, &x_abs, &y_abs );
+    gdk_window_get_root_origin( self->eventbox->window, &x_abs, &y_abs );
 
     moko_debug( "-- abs position = %d, %d", x_abs, y_abs );
 
@@ -165,7 +167,7 @@
     if ( *x + win_w > gdk_screen_width() )
             *x = gdk_screen_width() - win_w - 2;
     if ( *y + win_h > gdk_screen_height() )
-            *y = gdk_screen_height - win_h - applet_alloc->height - 2;
+            *y = gdk_screen_height() - win_h - applet_alloc->height - 2;
 
     moko_debug( "-- final position = %d, %d", *x, *y );
 }
@@ -204,11 +206,11 @@
     {
         self->icon = gtk_image_new_from_file( filename );
         g_return_if_fail( self->icon );
-        gtk_container_add( GTK_CONTAINER(self->eventbox), GTK_WIDGET(self->icon) );
-        gtk_widget_show( GTK_WIDGET(self->icon) );
+        gtk_container_add( GTK_CONTAINER(self->eventbox), self->icon );
+        gtk_widget_show( self->icon );
     }
     else
-        gtk_image_set_from_file( self->icon, filename );
+        gtk_image_set_from_file( GTK_IMAGE (self->icon), filename );
 }
 
 void moko_panel_applet_set_pixbuf(MokoPanelApplet* self, GdkPixbuf* pixbuf)
@@ -217,11 +219,11 @@
     {
         self->icon = gtk_image_new_from_pixbuf( pixbuf );
         g_return_if_fail( self->icon );
-        gtk_container_add( GTK_CONTAINER(self->eventbox), GTK_WIDGET(self->icon) );
-        gtk_widget_show( GTK_WIDGET(self->icon) );
+        gtk_container_add( GTK_CONTAINER(self->eventbox), self->icon );
+        gtk_widget_show( self->icon );
     }
     else
-        gtk_image_set_from_pixbuf( self->icon, pixbuf );
+        gtk_image_set_from_pixbuf( GTK_IMAGE (self->icon), pixbuf );
 }
 
 void moko_panel_applet_set_widget(MokoPanelApplet* self, GtkWidget* widget)
@@ -271,9 +273,9 @@
         gtk_widget_show_all( self->toplevelwindow );
         int x = 0;
         int y = 0;
-        moko_panel_applet_get_positioning_hint( self, self->popup, &x, &y );
-        gtk_window_move( self->toplevelwindow, x, y );
-        gdk_pointer_grab( GTK_WIDGET(self->toplevelwindow)->window, TRUE, GDK_BUTTON_PRESS_MASK, NULL, NULL, CurrentTime );
+        moko_panel_applet_get_positioning_hint( self, self->popup[type], &x, &y );
+        gtk_window_move( GTK_WINDOW (self->toplevelwindow), x, y );
+        gdk_pointer_grab( self->toplevelwindow->window, TRUE, GDK_BUTTON_PRESS_MASK, NULL, NULL, CurrentTime );
     }
 }
 

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h	2007-02-14 12:48:13 UTC (rev 987)
@@ -55,11 +55,11 @@
 } MokoPanelAppletPopupType;
 
 typedef struct {
-    GtkAlignment parent;
-    GtkImage* icon;
+    GtkWidget parent;          /* GtkAlignment */
+    GtkWidget* icon;           /* GtkImage */
     GtkWidget* popup[LAST_POPUP_TYPE];
-    GtkWindow* toplevelwindow;
-    GtkEventBox* eventbox;
+    GtkWidget* toplevelwindow; /* GtkWindow */
+    GtkWidget* eventbox;       /* GtkEventBox */
 } MokoPanelApplet;
 
 typedef struct {

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -89,10 +89,6 @@
 cb_menu_position_func (GtkMenu *menu, int *x, int *y, gboolean *push_in, MokoPixmapButton  *button)
 {
     GtkAllocation* allocation = &GTK_WIDGET(button)->allocation;
-    GtkRequisition req;
-    GtkRequisition menu_req;
-    GtkOrientation orientation;
-    GtkTextDirection direction;
 
     gdk_window_get_origin(GTK_BUTTON(button)->event_window, x, y);
     moko_debug( "menu popup @ %d, %d", *x, *y );
@@ -143,7 +139,7 @@
 {
     moko_debug( "moko_pixmap_button_size_request" );
     GtkButton *button = GTK_BUTTON (widget);
-    GtkBorder default_border;
+    /* GtkBorder default_border; */
     GtkBorder* size_request; // modified
     gint focus_width;
     gint focus_pad;
@@ -174,12 +170,13 @@
                 GTK_WIDGET (widget)->style->xthickness) * 2;
         requisition->height = (GTK_CONTAINER (widget)->border_width + CHILD_SPACING +
                 GTK_WIDGET (widget)->style->ythickness) * 2;
-
+        /* FIXME: ( as above wrt. default borders )
         if (GTK_WIDGET_CAN_DEFAULT (widget))
         {
             requisition->width += default_border.left + default_border.right;
             requisition->height += default_border.top + default_border.bottom;
         }
+        */
 
         if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
         {

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -29,8 +29,8 @@
 
 struct _MokoSearchBarPrivate
 {
-    GtkAlignment* alignment;
-    GtkEntry* entry;
+    GtkWidget* alignment; /* GtkAlignment */
+    GtkWindow* entry;     /* GtkEntry     */
 };
 
 static void
@@ -41,7 +41,7 @@
 static void
 moko_search_bar_class_init (MokoSearchBarClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  /* GObjectClass *object_class = G_OBJECT_CLASS (klass); */
 
   g_type_class_add_private (klass, sizeof (MokoSearchBarPrivate));
 }
@@ -49,7 +49,6 @@
 static void
 moko_search_bar_init (MokoSearchBar *self)
 {
-    MokoSearchBarPrivate* priv = MOKO_SEARCH_BAR_GET_PRIVATE(self);
     GtkToolItem* item = gtk_tool_item_new();
     gtk_widget_set_size_request( GTK_WIDGET(item), 320, 10 ); //FIXME get from style
     GtkEntry* entry = gtk_entry_new();
@@ -57,7 +56,7 @@
     gtk_entry_set_has_frame( entry, FALSE );
     gtk_entry_set_text( GTK_ENTRY(entry), "foo" );
     gtk_container_add( GTK_CONTAINER(item), GTK_WIDGET(entry) );
-    gtk_toolbar_insert( self, GTK_TOOL_ITEM(item), 0 );
+    gtk_toolbar_insert( GTK_TOOLBAR (self), GTK_TOOL_ITEM(item), 0 );
 }
 
 GtkWidget*

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -36,10 +36,10 @@
 
 typedef struct _MokoToolBoxPriv
 {
-    MokoFixed* toolbar_page;
-    GtkHBox* buttonbox;
-    MokoFixed* searchbar_page;
-    GtkEntry* entry;
+    GtkWidget* toolbar_page;   /* MokoFixed */
+    GtkWidget* buttonbox;      /* GtkHBox   */
+    GtkWidget* searchbar_page; /* MokoFixed */
+    GtkWidget* entry;          /* GtkEntry  */
 } MokoToolBoxPriv;
 
 /* add your signals here */
@@ -138,10 +138,10 @@
     MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
 
     priv->toolbar_page = moko_fixed_new();
-    gtk_widget_set_name( GTK_WIDGET(priv->toolbar_page), "mokotoolbox-normal-mode" );
+    gtk_widget_set_name( priv->toolbar_page, "mokotoolbox-normal-mode" );
 
-    MokoPixmapButton* search = moko_pixmap_button_new();
-    gtk_widget_set_name( GTK_WIDGET(search), "mokotoolbox-search-button" );
+    GtkWidget* search = moko_pixmap_button_new();
+    gtk_widget_set_name( search, "mokotoolbox-search-button" );
     gtk_fixed_put( GTK_FIXED(priv->toolbar_page), search, 0, 0 );
     priv->buttonbox = gtk_hbox_new( FALSE, 17 ); //FIXME need to get from style
     gtk_fixed_put( GTK_FIXED(priv->toolbar_page), GTK_WIDGET(priv->buttonbox), 84, 7 ); //FIXME need to get from style
@@ -154,16 +154,16 @@
     gtk_widget_set_name( GTK_WIDGET(priv->searchbar_page), "mokotoolbox-search-mode" );
     gtk_notebook_append_page( GTK_NOTEBOOK(self), priv->searchbar_page, NULL );
 
-    MokoPixmapButton* back = moko_pixmap_button_new();
+    GtkWidget* back = moko_pixmap_button_new();
     gtk_widget_set_name( GTK_WIDGET(back), "mokotoolbox-back-button" );
     gtk_fixed_put( GTK_FIXED(priv->searchbar_page), back, 400, 0 ); //FIXME need to get from style
     g_signal_connect( G_OBJECT(back), "clicked", G_CALLBACK(_button_release), self );
 
     priv->entry = gtk_entry_new();
-    gtk_entry_set_has_frame( priv->entry, FALSE );
+    gtk_entry_set_has_frame( GTK_ENTRY (priv->entry), FALSE );
     // gtk_entry_set_inner_border( priv->entry, FALSE );
-    gtk_widget_set_name( GTK_WIDGET(priv->entry), "mokotoolbox-search-entry" );
-    moko_fixed_set_cargo( priv->searchbar_page, GTK_WIDGET(priv->entry) );
+    gtk_widget_set_name( priv->entry, "mokotoolbox-search-entry" );
+    moko_fixed_set_cargo( MOKO_FIXED (priv->searchbar_page), priv->entry );
     g_signal_connect ((gpointer) priv->entry, "focus_in_event",
                       G_CALLBACK (_entry_focus_in),
                       self);
@@ -205,13 +205,12 @@
     moko_debug( "moko_tool_box_add_action_button" );
     MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
 
-    MokoPixmapButton* button = moko_pixmap_button_new();
-    gtk_widget_set_name( GTK_WIDGET(button), "mokotoolbox-action-button" );
+    GtkWidget* button = moko_pixmap_button_new();
+    gtk_widget_set_name( button, "mokotoolbox-action-button" );
 
-    //gtk_box_pack_start( GTK_BOX(priv->buttonbox), GTK_WIDGET(button), FALSE, FALSE, 0 );
-    gtk_box_pack_end( GTK_BOX(priv->buttonbox), GTK_WIDGET(button), FALSE, FALSE, 0 );
+    gtk_box_pack_end( GTK_BOX(priv->buttonbox), button, FALSE, FALSE, 0 );
 
-    return GTK_WIDGET (button);
+    return button;
 }
 
 GtkWidget* moko_tool_box_get_entry(MokoToolBox* self)

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c	2007-02-14 12:48:13 UTC (rev 987)
@@ -30,6 +30,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <string.h>
+
 //#define DEBUG_THIS_FILE
 #undef DEBUG_THIS_FILE
 #ifdef DEBUG_THIS_FILE
@@ -73,7 +75,7 @@
 static void moko_window_class_init(MokoWindowClass *klass) /* Class Initialization */
 {
     moko_debug( "moko_window_class_init" );
-    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+    /* GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); */
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
     /* Set the global parent_class here */

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h	2007-02-14 09:23:32 UTC (rev 986)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h	2007-02-14 12:48:13 UTC (rev 987)
@@ -49,6 +49,7 @@
 GType moko_window_get_type();
 GtkWidget* moko_window_new();
 void moko_window_clear(MokoWindow *self);
+void moko_window_update_topmost (MokoWindow* self, Window window_id);
 
 Window moko_window_get_active_window();
 





More information about the commitlog mailing list