diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-09-11 12:21:28 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:47 +0100 |
| commit | 1f4f5a55556dae157eaeec14d34f3f706d93b983 (patch) | |
| tree | 27d068139820f6822b323d0037983ab326e716e6 /vcl/inc/unx/gtk | |
| parent | 44192ffba03ffe5b1f387f90893dc0ca22bc8762 (diff) | |
Fixed crashes when executing some menu actions.
Change-Id: I80bb1ed74e823d4b66df05eb15c9b5ed2e58b7f6
Diffstat (limited to 'vcl/inc/unx/gtk')
| -rw-r--r-- | vcl/inc/unx/gtk/gloactiongroup.h | 11 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h index bc4d59d86a9c..e0d783fe3778 100644 --- a/vcl/inc/unx/gtk/gloactiongroup.h +++ b/vcl/inc/unx/gtk/gloactiongroup.h @@ -63,15 +63,15 @@ struct _GLOActionGroupClass GType g_lo_action_group_get_type (void) G_GNUC_CONST; -GLOActionGroup * g_lo_action_group_new (void); +GLOActionGroup * g_lo_action_group_new (gpointer frame); void g_lo_action_group_insert (GLOActionGroup *group, const gchar *action_name, - gpointer action_info); + gint item_id); void g_lo_action_group_insert_stateful (GLOActionGroup *group, const gchar *action_name, - gpointer action_info, + gint item_id, const GVariantType *parameter_type, const GVariantType *state_type, GVariant *state_hint, @@ -79,10 +79,7 @@ void g_lo_action_group_insert_stateful (GLOActionGroup void g_lo_action_group_set_action_enabled (GLOActionGroup *group, const gchar *action_name, - gboolean enabled); - -gpointer g_lo_action_group_get_action_item (GLOActionGroup *group, - const gchar *action_name); + gboolean enabled); void g_lo_action_group_remove (GLOActionGroup *group, const gchar *action_name); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index ddb6a6bb6c26..f746b4bb2063 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -89,6 +89,7 @@ public: virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } virtual GActionGroup* GetActionGroup() { return mpActionGroup; } + GtkSalMenu* GetMenuForItemCommand( gchar* aCommand ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText ); void NativeSetItemCommand( unsigned nSection, unsigned nItemPos, GtkSalMenuItem* pItem, const gchar* aCommandStr ); |