r980 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Tue Feb 13 16:22:25 CET 2007
Author: thomas
Date: 2007-02-13 16:22:20 +0100 (Tue, 13 Feb 2007)
New Revision: 980
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-dialog-window.h
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.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
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-search-bar.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h
trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in
Log:
* Standardise return types for functions returning widgets
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -387,10 +387,10 @@
*
* @return the main #MokoWindow for the current #MokoApplication.
**/
-MokoWindow* moko_application_get_main_window(MokoApplication* self)
+GtkWidget* moko_application_get_main_window(MokoApplication* self)
{
MokoApplicationPrivate* priv = MOKO_APPLICATION_GET_PRIVATE(self);
- return priv->main_window;
+ return GTK_WIDGET (priv->main_window);
}
/**
* moko_application_set_main_window:
@@ -466,11 +466,11 @@
*
* create a modal dialog window with @a title and @a contents
**/
-MokoDialogWindow* moko_application_execute_dialog(MokoApplication* self, const gchar* title, GtkWidget* contents)
+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 );
- return 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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -50,12 +50,12 @@
MokoApplication* moko_application_get_instance();
gboolean moko_application_get_is_topmost(MokoApplication* self);
void moko_application_set_main_window(MokoApplication* self, MokoWindow* window);
-MokoWindow* moko_application_get_main_window(MokoApplication* self);
+GtkWidget* moko_application_get_main_window(MokoApplication* self);
gchar* moko_application_get_style_pixmap_dir();
void moko_application_add_stock_icons(MokoApplication* self, ...);
-MokoDialogWindow* moko_application_execute_dialog(MokoApplication* self, const gchar* title, GtkWidget* contents);
+GtkWidget* moko_application_execute_dialog(MokoApplication* self, const gchar* title, GtkWidget* contents);
G_END_DECLS
#endif /* _MOKO_APPLICATION_H_ */
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -88,10 +88,10 @@
gtk_scrolled_window_set_policy( self, GTK_POLICY_NEVER, GTK_POLICY_NEVER );
}
-MokoDetailsWindow*
+GtkWidget*
moko_details_window_new (void)
{
- return g_object_new(MOKO_TYPE_DETAILS_WINDOW, NULL );
+ return GTK_WIDGET (g_object_new(MOKO_TYPE_DETAILS_WINDOW, NULL ));
}
GtkBox* moko_details_window_put_in_box(MokoDetailsWindow* self)
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -42,7 +42,7 @@
} MokoDetailsWindowClass;
GType moko_details_window_get_type();
-MokoDetailsWindow* moko_details_window_new();
+GtkWidget* moko_details_window_new();
GtkBox* moko_details_window_put_in_box(MokoDetailsWindow* self);
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -135,10 +135,10 @@
object_class->finalize = moko_dialog_window_finalize;
}
-MokoDialogWindow*
+GtkWidget*
moko_dialog_window_new(void)
{
- return g_object_new(MOKO_TYPE_DIALOG_WINDOW, NULL);
+ return GTK_WIDGET (g_object_new(MOKO_TYPE_DIALOG_WINDOW, NULL));
}
static void
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -41,7 +41,7 @@
} MokoDialogWindowClass;
GType moko_dialog_window_get_type();
-MokoDialogWindow* moko_dialog_window_new();
+GtkWidget* moko_dialog_window_new();
void moko_dialog_window_set_title(MokoDialogWindow* self, const gchar* title);
void moko_dialog_window_set_contents(MokoDialogWindow* self, GtkWidget* contents);
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -316,21 +316,21 @@
return GTK_WIDGET(self);
}
-GtkButton*
+GtkWidget*
moko_finger_tool_box_add_button(MokoFingerToolBox* self)
{
static gchar text[] = "0\0";
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
- MokoPixmapButton* b = moko_pixmap_button_new();
+ GtkWidget* b = moko_pixmap_button_new();
gtk_button_set_label( GTK_BUTTON(b), &text );
text[0]++;
- gtk_widget_set_name( GTK_WIDGET(b), "mokofingertoolbox-toolbutton" );
+ gtk_widget_set_name( b, "mokofingertoolbox-toolbutton" );
priv->numberOfButtons++;
gtk_box_pack_start( GTK_BOX(priv->hbox), b, FALSE, FALSE, 0 );
- gtk_widget_show( GTK_WIDGET(b) );
+ gtk_widget_show( b );
// save button for inside the expose event we want to get its shape
//if ( !priv->button ) priv->button = b;
@@ -341,18 +341,18 @@
}
-GtkButton*
+GtkWidget*
moko_finger_tool_box_add_button_without_label(MokoFingerToolBox* self)
{
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
- MokoPixmapButton* b = moko_pixmap_button_new();
- gtk_widget_set_name( GTK_WIDGET(b), "mokofingertoolbox-toolbutton" );
+ GtkWidget* b = moko_pixmap_button_new();
+ gtk_widget_set_name( b, "mokofingertoolbox-toolbutton" );
priv->numberOfButtons++;
gtk_box_pack_start( GTK_BOX(priv->hbox), b, FALSE, FALSE, 0 );
- gtk_widget_show( GTK_WIDGET(b) );
+ gtk_widget_show( b );
// save button for inside the expose event we want to get its shape
//if ( !priv->button ) priv->button = b;
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -46,8 +46,8 @@
GtkWidget* moko_finger_tool_box_new ( GtkWidget* parent);
-GtkButton* moko_finger_tool_box_add_button(MokoFingerToolBox* self);
-GtkButton* moko_finger_tool_box_add_button_without_label(MokoFingerToolBox* self);
+GtkWidget* moko_finger_tool_box_add_button(MokoFingerToolBox* self);
+GtkWidget* moko_finger_tool_box_add_button_without_label(MokoFingerToolBox* self);
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -105,20 +105,20 @@
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(child), TRUE, TRUE, 0 );
}
-MokoFingerWheel* moko_finger_window_get_wheel(MokoFingerWindow* self)
+GtkWidget* moko_finger_window_get_wheel(MokoFingerWindow* self)
{
moko_debug( "moko_finger_window_get_wheel" );
MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
if (!priv->wheel) priv->wheel = moko_finger_wheel_new(self);
- return priv->wheel;
+ return GTK_WIDGET (priv->wheel);
}
-MokoFingerToolBox* moko_finger_window_get_toolbox(MokoFingerWindow* self)
+GtkWidget* moko_finger_window_get_toolbox(MokoFingerWindow* self)
{
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);
- return priv->tools;
+ return GTK_WIDGET (priv->tools);
}
gboolean moko_finger_window_get_geometry_hint(MokoFingerWindow* self, GtkWidget* hintee, GtkAllocation* allocation)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -49,8 +49,8 @@
GtkWidget* moko_finger_window_new (void);
void moko_finger_window_set_application_menu(MokoFingerWindow* self, GtkMenu* menu);
void moko_finger_window_set_contents(MokoFingerWindow* self, GtkWidget* child);
-MokoFingerWheel* moko_finger_window_get_wheel(MokoFingerWindow* self);
-MokoFingerToolBox* moko_finger_window_get_toolbox(MokoFingerWindow* self);
+GtkWidget* moko_finger_window_get_wheel(MokoFingerWindow* self);
+GtkWidget* moko_finger_window_get_toolbox(MokoFingerWindow* self);
gboolean moko_finger_window_get_geometry_hint(MokoFingerWindow* self, GtkWidget* hintee, GtkAllocation* allocation);
G_END_DECLS
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -331,15 +331,15 @@
gtk_fixed_put ( GTK_FIXED (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
}
-MokoNavigationList*
+GtkWidget*
moko_navigation_list_new (void)
{
MokoNavigationList* self = MOKO_NAVIGATION_LIST ( g_object_new (MOKO_TYPE_NAVIGATION_LIST, NULL));
- return self;
+ return GTK_WIDGET (self);
}
-MokoNavigationList*
+GtkWidget*
moko_navigation_list_new_with_model (GtkTreeModel *model)
{
@@ -359,7 +359,7 @@
gtk_fixed_put ( GTK_FIXED (priv->navigationcontainer), GTK_WIDGET (priv->navigationsw), 4, 2 );
- return self;
+ return GTK_WIDGET (self);
}
@@ -369,10 +369,10 @@
moko_tree_view_append_column( MOKO_TREE_VIEW (priv->treeview), column );
}
-MokoTreeView* moko_navigation_list_get_tree_view (MokoNavigationList* self)
+GtkWidget* moko_navigation_list_get_tree_view (MokoNavigationList* self)
{
MokoNavigationListPrivate* priv = NAVIGATION_LIST_PRIVATE (self);
- return priv->treeview;
+ return GTK_WIDGET (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 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -48,11 +48,11 @@
} MokoNavigationListClass;
GType moko_navigation_list_get_type (void);
-MokoNavigationList* moko_navigation_list_new (void);
-MokoNavigationList* moko_navigation_list_new_with_model (GtkTreeModel *model);
+GtkWidget* moko_navigation_list_new (void);
+GtkWidget* 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);
+GtkWidget* moko_navigation_list_get_tree_view(MokoNavigationList* self);
G_END_DECLS
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -99,10 +99,10 @@
/* PUBLIC API */
-MokoMenuBox* moko_paned_window_get_menubox(MokoPanedWindow* self)
+GtkWidget* moko_paned_window_get_menubox(MokoPanedWindow* self)
{
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
- return priv->menubox;
+ return GTK_WIDGET (priv->menubox);
}
void moko_paned_window_set_application_menu(MokoPanedWindow* self, GtkMenu* menu)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -57,7 +57,7 @@
void moko_paned_window_clear (MokoPanedWindow *self);
/* menu */
-MokoMenuBox* moko_paned_window_get_menubox(MokoPanedWindow* self);
+GtkWidget* moko_paned_window_get_menubox(MokoPanedWindow* self);
void moko_paned_window_set_application_menu(MokoPanedWindow* self, GtkMenu* menu);
void moko_paned_window_set_filter_menu(MokoPanedWindow* self, GtkMenu* menu);
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -110,10 +110,10 @@
G_TYPE_NONE, 0);
}
-MokoPanelApplet*
+GtkWidget*
moko_panel_applet_new()
{
- return g_object_new(MOKO_TYPE_PANEL_APPLET, NULL);
+ return GTK_WIDGET (g_object_new(MOKO_TYPE_PANEL_APPLET, NULL));
}
static void
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -72,7 +72,7 @@
/* type interface */
GType moko_panel_applet_get_type();
-MokoPanelApplet* moko_panel_applet_new();
+GtkWidget* moko_panel_applet_new();
void moko_panel_system_init( int* argc, char*** argv );
/* simple interface */
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -60,7 +60,7 @@
gtk_toolbar_insert( self, GTK_TOOL_ITEM(item), 0 );
}
-MokoSearchBar*
+GtkWidget*
moko_search_bar_new (void)
{
return GTK_WIDGET(g_object_new(moko_search_bar_get_type(), NULL));
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -42,7 +42,7 @@
GType moko_search_bar_get_type (void);
-MokoSearchBar* moko_search_bar_new (void);
+GtkWidget* moko_search_bar_new (void);
G_END_DECLS
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-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -194,13 +194,13 @@
#endif
}
-GtkHBox* moko_tool_box_get_button_box(MokoToolBox* self)
+GtkWidget* moko_tool_box_get_button_box(MokoToolBox* self)
{
MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
- return priv->buttonbox;
+ return GTK_WIDGET (priv->buttonbox);
}
-MokoPixmapButton* moko_tool_box_add_action_button(MokoToolBox* self)
+GtkWidget* moko_tool_box_add_action_button(MokoToolBox* self)
{
moko_debug( "moko_tool_box_add_action_button" );
MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
@@ -211,11 +211,11 @@
//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 );
- return button;
+ return GTK_WIDGET (button);
}
-GtkEntry* moko_tool_box_get_entry(MokoToolBox* self)
+GtkWidget* moko_tool_box_get_entry(MokoToolBox* self)
{
MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
- return priv->entry;
+ return GTK_WIDGET (priv->entry);
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -57,9 +57,9 @@
GtkWidget* moko_tool_box_new_with_search();
void moko_tool_box_clear(MokoToolBox* self);
-GtkHBox* moko_tool_box_get_button_box( MokoToolBox* self );
-GtkEntry* moko_tool_box_get_entry(MokoToolBox* self);
-MokoPixmapButton* moko_tool_box_add_action_button(MokoToolBox* self);
+GtkWidget* moko_tool_box_get_button_box( MokoToolBox* self );
+GtkWidget* moko_tool_box_get_entry(MokoToolBox* self);
+GtkWidget* moko_tool_box_add_action_button(MokoToolBox* self);
G_END_DECLS
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2007-02-13 15:22:20 UTC (rev 980)
@@ -92,12 +92,12 @@
NULL );
}
-GtkScrolledWindow* moko_tree_view_put_into_scrolled_window(MokoTreeView* self)
+GtkWidget* moko_tree_view_put_into_scrolled_window(MokoTreeView* self)
{
GtkScrolledWindow* scrolledwindow = gtk_scrolled_window_new( NULL, NULL );
//FIXME get from style or (even better) set as initial size hint in MokoPanedWindow (also via style sheet of course)
gtk_widget_set_size_request( GTK_WIDGET(scrolledwindow), 0, 170 );
gtk_scrolled_window_set_policy( scrolledwindow, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
gtk_container_add( scrolledwindow, GTK_WIDGET(self) );
- return scrolledwindow;
+ return GTK_WIDGET (scrolledwindow);
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h 2007-02-13 15:22:20 UTC (rev 980)
@@ -47,7 +47,7 @@
GtkWidget* moko_tree_view_new_with_model(GtkTreeModel* model);
void moko_tree_view_append_column(MokoTreeView* self, GtkTreeViewColumn* column);
-GtkScrolledWindow* moko_tree_view_put_into_scrolled_window(MokoTreeView* self);
+GtkWidget* moko_tree_view_put_into_scrolled_window(MokoTreeView* self);
G_END_DECLS
Modified: trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in 2007-02-13 01:41:21 UTC (rev 979)
+++ trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in 2007-02-13 15:22:20 UTC (rev 980)
@@ -8,4 +8,4 @@
Version: @VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lmokoui
-Requires: gtk+-2.0 libmb
+Requires: gtk+-2.0
More information about the commitlog
mailing list
