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

[ken_zhao at gta01.hmw-consulting.de]

Author: ken_zhao
Date: 2006-12-18 06:45:11 +0100 (Mon, 18 Dec 2006)
New Revision: 423

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
Log:


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	2006-12-18 03:53:53 UTC (rev 422)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2006-12-18 05:45:11 UTC (rev 423)
@@ -28,7 +28,7 @@
 #define moko_debug(fmt,...)
 #endif
 
-G_DEFINE_TYPE (MokoPixmapButton, moko_pixmap_button, GTK_TYPE_BUTTON);
+G_DEFINE_TYPE (MokoPixmapButton, moko_pixmap_button, GTK_TYPE_BUTTON)
 
 #define MOKO_PIXMAP_BUTTON_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_PIXMAP_BUTTON, MokoPixmapButtonPrivate))
 
@@ -297,7 +297,7 @@
     MokoPixmapButtonPrivate* priv = MOKO_PIXMAP_BUTTON_GET_PRIVATE (self);
 	  
     GdkPixbuf *src_pixbuf, *dest_pixbuf;
-    src_pixbuf = gtk_image_get_pixbuf (image);
+    src_pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
     dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, 35, 35, GDK_INTERP_NEAREST);
 
     if ( priv->fingertoolboxbtnimage == NULL )

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h	2006-12-18 03:53:53 UTC (rev 422)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h	2006-12-18 05:45:11 UTC (rev 423)
@@ -22,6 +22,9 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkvbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkmain.h>
 
 #include <glib-object.h>
 

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	2006-12-18 03:53:53 UTC (rev 422)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c	2006-12-18 05:45:11 UTC (rev 423)
@@ -62,7 +62,7 @@
     moko_debug( "moko_tool_box_button_release: current_page is now: %d", current_page );
 
     if( current_page == 1 )
-        gtk_widget_grab_focus( priv->entry );
+        gtk_widget_grab_focus (GTK_WIDGET (priv->entry));
 
     current_page = 1 - current_page;
     g_signal_emit( G_OBJECT(self), current_page ? moko_tool_box_signals[SEARCHBOX_INVISIBLE] : moko_tool_box_signals[SEARCHBOX_VISIBLE], 0, NULL );