diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-09-28 19:16:18 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:49 +0100 |
| commit | 05888c86739f5ec77d96b62a997e8fce90d090c1 (patch) | |
| tree | 6078a3b8defa4de13bbd7b1362272421c7af84fe /vcl/inc/unx | |
| parent | ea2261fac59fde0129bcdafb3e8f8ee94afc635f (diff) | |
moved dbus and menumodel ownership to frame, where it belongs
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 3c7c10614271..1f8f4a3ca208 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -54,6 +54,8 @@ typedef XLIB_Window GdkNativeWindow; #define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b) #endif +static sal_Bool bDBusIsAvailable = sal_False; + class GtkSalFrame : public SalFrame { static const int nMaxGraphics = 2; @@ -342,7 +344,7 @@ public: virtual void SetMenu( SalMenu *pSalMenu ); virtual SalMenu* GetMenu( void ); virtual void DrawMenuBar(); - void SetWatcherId( sal_uInt32 watcherId ); + void EnsureAppMenuWatch(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); // Before the window is visible, a resize event diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 56aed28d8277..77e22c375f96 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -38,6 +38,7 @@ class MenuItemList; class GtkSalMenuItem; + class GtkSalMenu : public SalMenu { private: @@ -103,6 +104,11 @@ 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; + }; }; class GtkSalMenuItem : public SalMenuItem |