From d483c2ab23354cf5ea58a2d2225ab464b77f6614 Mon Sep 17 00:00:00 2001
From: Alexander Valavanis <valavanisalex@gmail.com>
Date: Wed, 28 Jun 2017 15:17:39 +0200
Subject: menu-items: C++ify

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

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

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