diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-09-12 16:33:13 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:48 +0100 |
| commit | b789263fb7bf537cc85d3df3022282ab8f32bccb (patch) | |
| tree | 89edaefde8a2577589cbf558fd774534e7e7e764 /vcl/inc | |
| parent | cfc3eded6233996ad7103d256b8a36e8d31df3b9 (diff) | |
Initial integration with Gtk+/Unity menus about-to-show feature.
Change-Id: I064cf73e23b175140bdac2616ac922c349f0f051
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/glomenu.h | 6 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h index c45be50d6fbc..4c7c3e568ecb 100644 --- a/vcl/inc/unx/gtk/glomenu.h +++ b/vcl/inc/unx/gtk/glomenu.h @@ -28,6 +28,7 @@ #define G_LO_MENU_ATTRIBUTE_ACCELERATOR "accel" #define G_LO_MENU_ATTRIBUTE_COMMAND "command" +#define G_LO_MENU_ATTRIBUTE_SUBMENU_ACTION "submenu-action" G_BEGIN_DECLS @@ -128,6 +129,11 @@ GLOMenu * g_lo_menu_get_submenu_from_item_in_section (GLOMenu gint section, gint position); +void g_lo_menu_set_submenu_action_to_item_in_section (GLOMenu *menu, + gint section, + gint position, + const gchar *action); + GLOMenu * g_lo_menu_get_menu_containing_item (GLOMenu *menu, gint item_id); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index d88c50d181ad..d7d59662f945 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -89,7 +89,13 @@ public: virtual GActionGroup* GetActionGroup() { return mpActionGroup; } void NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText ); - void NativeSetItemCommand( unsigned nSection, unsigned nItemPos, GtkSalMenuItem* pItem, const gchar* aCommandStr ); + void NativeSetItemCommand( unsigned nSection, + unsigned nItemPos, + sal_uInt16 nId, + const gchar* aCommand, + MenuItemBits nBits, + gboolean bChecked, + gboolean bIsSubmenu ); void NativeSetEnableItem( gchar* aCommand, gboolean bEnable ); void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck ); void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); |