diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-10-01 08:00:36 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:52 +0100 |
| commit | 3a324cd0d8b00b7b6c28225dbba9d88d3f8ded71 (patch) | |
| tree | ff19de76f6da1ad58aa3f750e061524c4477fb01 /vcl/inc/unx/gtk | |
| parent | 920dc60a8c019ed464634fec1657fedb167ff373 (diff) | |
move UpdateNativeMenu2 back into UpdateNativeMenu
Diffstat (limited to 'vcl/inc/unx/gtk')
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7601a3fe0774..abcbcae62c73 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -50,8 +50,6 @@ private: GtkSalMenu* mpParentSalMenu; const GtkSalFrame* mpFrame; - sal_uInt32 mWatcherId; - // GMenuModel and GActionGroup attributes GMenuModel* mpMenuModel; GActionGroup* mpActionGroup; @@ -104,11 +102,7 @@ public: void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate( const gchar* aMenuCommand ); void Deactivate( const gchar* aMenuCommand ); - inline void DisconnectFrame() - { - mpMenuModel = NULL; - mpActionGroup = NULL; - }; + void DisconnectFrame(); void UpdateNativeMenu(); void UpdateNativeMenu2(); bool CanUpdate(); |