diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-06 16:18:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-06 16:18:41 +0100 |
| commit | 95b720f6d7ba2639c06ba07c3f70aca871a45950 (patch) | |
| tree | 97654e80487679996736354f9dcbb6baf62ee460 /vcl/inc/unx | |
| parent | Avoid reserved identifiers (diff) | |
| download | core-95b720f6d7ba2639c06ba07c3f70aca871a45950.tar.gz core-95b720f6d7ba2639c06ba07c3f70aca871a45950.zip | |
revert to fix tdf#98783 missing menubar
Change-Id: Ia322149a7ed461f528af856d9907fe4620f9e97f
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 5fec57974483..6f1f9999bc9b 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -199,7 +199,7 @@ public: virtual SalSystem* CreateSalSystem() override; virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) override; virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; - virtual SalMenu* CreateMenu( bool, Menu*, SystemWindow* ) override; + virtual SalMenu* CreateMenu( bool, Menu* ) override; virtual void DestroyMenu( SalMenu* pMenu ) override; virtual SalMenuItem* CreateMenuItem( const SalItemParams* ) override; virtual void DestroyMenuItem( SalMenuItem* pItem ) override; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 95789a0fa1d2..240f22f029c0 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -59,7 +59,7 @@ private: void ActivateAllSubmenus(Menu* pMenuBar); public: - GtkSalMenu(bool bMenuBar, GActionGroup* pActionGroup); + GtkSalMenu( bool bMenuBar ); virtual ~GtkSalMenu(); virtual bool VisibleMenuBar() override; // must return TRUE to actually DISPLAY native menu bars |