From 4e9ea206bf17a0520e154c0fabe0128a4cc4f6fb Mon Sep 17 00:00:00 2001
From: Alexander Valavanis <valavanisalex@gmail.com>
Date: Wed, 28 Jun 2017 16:57:52 +0200
Subject: Revert "menu-items: C++ify"

This reverts commit d483c2ab23354cf5ea58a2d2225ab464b77f6614.
---
 src/widgets/desktop-widget.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/widgets/desktop-widget.cpp')

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index fa7e680c6..ce4c5936c 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -66,7 +66,6 @@
 #include <gtkmm/cssprovider.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/messagedialog.h>
-#include <gtkmm/menubar.h>
 #include "inkscape-version.h"
 
 using Inkscape::UI::Widget::UnitTracker;
@@ -1440,9 +1439,9 @@ void SPDesktopWidget::layoutWidgets()
     }
 
     if (!prefs->getBool(pref_root + "menu/state", true)) {
-        dtw->menubar->hide();
+        gtk_widget_hide (dtw->menubar);
     } else {
-        dtw->menubar->show_all();
+        gtk_widget_show_all (dtw->menubar);
     }
     
     if (!prefs->getBool(pref_root + "commands/state", true)) {
@@ -1648,12 +1647,10 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     dtw->layer_selector->setDesktop(dtw->desktop);
 
     dtw->menubar = sp_ui_main_menubar (dtw->desktop);
-    dtw->menubar->set_name("MenuBar");
-    dtw->menubar->show_all();
+    gtk_widget_set_name(dtw->menubar, "MenuBar");
+    gtk_widget_show_all (dtw->menubar);
     SPNamedView *nv = dtw->desktop->namedview;
-    gtk_box_pack_start (GTK_BOX (dtw->vbox),
-                        GTK_WIDGET(dtw->menubar->gobj()),
-                        FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0);
     dtw->layoutWidgets();
 
     std::vector<GtkWidget *> toolboxes;
-- 
cgit v1.2.3