Revert "menu-items: C++ify"

This reverts commit d483c2ab23354cf5ea58a2d2225ab464b77f6614.

2 files changed, 6 insertions, 13 deletions

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;
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 1aaa20afe..0d5f40987 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -28,9 +28,6 @@ class SPDesktop;
 struct SPDesktopWidget;
 class SPObject;
 
-namespace Gtk {
-class MenuBar;
-}
 
 #define SP_TYPE_DESKTOP_WIDGET SPDesktopWidget::getType()
 #define SP_DESKTOP_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_DESKTOP_WIDGET, SPDesktopWidget))
@@ -82,8 +79,7 @@ struct SPDesktopWidget {
 
     GtkWidget *hbox;
 
-    Gtk::MenuBar *menubar;
-    GtkWidget    *statusbar;
+    GtkWidget *menubar, *statusbar;
 
     Inkscape::UI::Dialogs::SwatchesPanel *panels;