diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-09-12 20:45:31 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:48 +0100 |
| commit | 6b42d547cfbe87e934f65c74cb180f5f1c10c6c2 (patch) | |
| tree | 8cea204a387f909f34e4210cd1fee2272b8ed55a /vcl/inc/unx | |
| parent | b789263fb7bf537cc85d3df3022282ab8f32bccb (diff) | |
Menus are generated on demand now, but with some issues.
Change-Id: Icec9b685e720a369cff4d2bbfc5bf4ba6614e390
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/gtk/gloactiongroup.h | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h index e0d783fe3778..61ec718d4cd3 100644 --- a/vcl/inc/unx/gtk/gloactiongroup.h +++ b/vcl/inc/unx/gtk/gloactiongroup.h @@ -67,11 +67,13 @@ GLOActionGroup * g_lo_action_group_new (gpointer void g_lo_action_group_insert (GLOActionGroup *group, const gchar *action_name, - gint item_id); + gint item_id, + gboolean submenu); void g_lo_action_group_insert_stateful (GLOActionGroup *group, const gchar *action_name, gint item_id, + gboolean submenu, const GVariantType *parameter_type, const GVariantType *state_type, GVariant *state_hint, diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index d7d59662f945..56aed28d8277 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -55,7 +55,7 @@ private: GMenuModel* mpMenuModel; GActionGroup* mpActionGroup; - GtkSalMenu* GetMenuForItemCommand( gchar* aCommand ); + GtkSalMenu* GetMenuForItemCommand( gchar* aCommand, gboolean bGetSubmenu ); public: GtkSalMenu( sal_Bool bMenuBar ); @@ -101,6 +101,8 @@ public: void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); void DispatchCommand( gint itemId, const gchar* aCommand ); + void Activate( const gchar* aMenuCommand ); + void Deactivate( const gchar* aMenuCommand ); }; class GtkSalMenuItem : public SalMenuItem |