diff options
Diffstat (limited to 'vcl/unx/gtk/gtkinst.cxx')
-rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 0bdaf3ee7a9f..368cdfb2c577 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -32,7 +32,6 @@ #include <headless/svpvd.hxx> #include <headless/svpbmp.hxx> #include <vcl/inputtypes.hxx> -#include <vcl/syswin.hxx> #include <unx/genpspgraphics.h> #include <rtl/strbuf.hxx> #include <rtl/uri.hxx> @@ -348,24 +347,10 @@ SalBitmap* GtkInstance::CreateSalBitmap() #ifdef ENABLE_GMENU_INTEGRATION -SalMenu* GtkInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu, SystemWindow* pAssociatedSystemWindow ) +SalMenu* GtkInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { EnsureInit(); - - GtkSalFrame *pFrame = pAssociatedSystemWindow ? dynamic_cast<GtkSalFrame*>(pAssociatedSystemWindow->ImplGetFrame()) - : nullptr; - - GActionGroup* pActionGroup; - if (pFrame) - { - GtkWidget* pWidget = pFrame->getWindow(); - GdkWindow* gdkWindow = gtk_widget_get_window( pWidget ); - pActionGroup = G_ACTION_GROUP( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-action-group" ) ); - } - else - pActionGroup = nullptr; - - GtkSalMenu* pSalMenu = new GtkSalMenu(bMenuBar, pActionGroup); + GtkSalMenu* pSalMenu = new GtkSalMenu( bMenuBar ); pSalMenu->SetMenu( pVCLMenu ); return pSalMenu; } |