diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-10-17 20:06:11 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:57 +0100 |
| commit | 34504e4af678b52b6d6cfe7519ee1934f89c95dd (patch) | |
| tree | c55a3767f9912d8cac1eac5a84a29a972e044953 /vcl/inc | |
| parent | 4e112800895748775a4e3d194985f3baa78f1270 (diff) | |
Chart menu works now.
Change-Id: I95861a5af8b9c72c74840868d0530d5855b87785
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/glomenu.h | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h index 4c7c3e568ecb..a1a615b3ba19 100644 --- a/vcl/inc/unx/gtk/glomenu.h +++ b/vcl/inc/unx/gtk/glomenu.h @@ -125,6 +125,10 @@ void g_lo_menu_set_submenu_to_item_in_section (GLOMenu gint position, GMenuModel *submenu); +void g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu, + gint section, + gint position); + GLOMenu * g_lo_menu_get_submenu_from_item_in_section (GLOMenu *menu, gint section, gint position); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index cc4451a1e331..b382e7e6d19d 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -303,6 +303,7 @@ public: guint m_nMenuExportId; guint m_nActionGroupExportId; + void FlushConnection(); // dispatches an event, returns true if dispatched // and false else; if true was returned the event should diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 6e7084bdc3e9..46ba21547339 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -45,6 +45,7 @@ private: sal_Bool mbMenuBar; Menu* mpVCLMenu; + GtkSalMenu* mpOldSalMenu; GtkSalMenu* mpParentSalMenu; const GtkSalFrame* mpFrame; @@ -102,7 +103,7 @@ public: void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate( const gchar* aMenuCommand ); void Deactivate( const gchar* aMenuCommand ); - void DisconnectFrame(); +// void DisconnectFrame(); void Display( sal_Bool bVisible ); void UpdateNativeMenu(); // void UpdateNativeSubMenu(); |