* src/hildon-program-private.h
* src/hildon-program.c
(hildon_program_set_common_menu)
(hildon_program_get_common_menu)
(hildon_program_set_common_app_menu)
(hildon_program_get_common_app_menu):
Change common menu pointers from GtkWidget* to GtkMenu* and
HildonAppMenu* to avoid unnecessary casts.
+2009-03-04 Alberto Garcia <agarcia@igalia.com>
+
+ * src/hildon-program-private.h
+ * src/hildon-program.c
+ (hildon_program_set_common_menu)
+ (hildon_program_get_common_menu)
+ (hildon_program_set_common_app_menu)
+ (hildon_program_get_common_app_menu):
+ Change common menu pointers from GtkWidget* to GtkMenu* and
+ HildonAppMenu* to avoid unnecessary casts.
+
2009-03-03 Alberto Garcia <agarcia@igalia.com>
* src/hildon-window.c (hildon_window_set_main_menu):
2009-03-03 Alberto Garcia <agarcia@igalia.com>
* src/hildon-window.c (hildon_window_set_main_menu):
gboolean killable;
gboolean is_topmost;
guint window_count;
gboolean killable;
gboolean is_topmost;
guint window_count;
- GtkWidget *common_menu;
- GtkWidget *common_app_menu;
+ GtkMenu *common_menu;
+ HildonAppMenu *common_app_menu;
GtkWidget *common_toolbar;
GSList *windows;
Window window_group;
GtkWidget *common_toolbar;
GSList *windows;
Window window_group;
{
if (GTK_WIDGET_VISIBLE (priv->common_menu))
{
{
if (GTK_WIDGET_VISIBLE (priv->common_menu))
{
- gtk_menu_popdown (GTK_MENU (priv->common_menu));
+ gtk_menu_popdown (priv->common_menu);
gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->common_menu));
}
gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->common_menu));
}
- if (gtk_menu_get_attach_widget (GTK_MENU (priv->common_menu)))
+ if (gtk_menu_get_attach_widget (priv->common_menu))
- gtk_menu_detach (GTK_MENU (priv->common_menu));
+ gtk_menu_detach (priv->common_menu);
- priv->common_menu = GTK_WIDGET (menu);
+ priv->common_menu = menu;
priv = HILDON_PROGRAM_GET_PRIVATE (self);
g_assert (priv);
priv = HILDON_PROGRAM_GET_PRIVATE (self);
g_assert (priv);
- return GTK_MENU (priv->common_menu);
+ return priv->common_menu;
HildonAppMenu *menu)
{
HildonProgramPrivate *priv;
HildonAppMenu *menu)
{
HildonProgramPrivate *priv;
+ HildonAppMenu *old_menu;
g_return_if_fail (HILDON_IS_PROGRAM (self));
g_return_if_fail (menu == NULL || HILDON_IS_APP_MENU (menu));
g_return_if_fail (HILDON_IS_PROGRAM (self));
g_return_if_fail (menu == NULL || HILDON_IS_APP_MENU (menu));
old_menu = priv->common_app_menu;
/* Set new menu */
old_menu = priv->common_app_menu;
/* Set new menu */
- priv->common_app_menu = GTK_WIDGET (menu);
+ priv->common_app_menu = menu;
if (menu)
g_object_ref_sink (menu);
/* Hide and unref old menu */
if (old_menu) {
if (menu)
g_object_ref_sink (menu);
/* Hide and unref old menu */
if (old_menu) {
- hildon_app_menu_set_parent_window (HILDON_APP_MENU (old_menu), NULL);
+ hildon_app_menu_set_parent_window (old_menu, NULL);
g_object_unref (old_menu);
}
}
g_object_unref (old_menu);
}
}
priv = HILDON_PROGRAM_GET_PRIVATE (self);
g_assert (priv);
priv = HILDON_PROGRAM_GET_PRIVATE (self);
g_assert (priv);
- return HILDON_APP_MENU (priv->common_app_menu);
+ return priv->common_app_menu;