--- a/libgui/graphics/Figure.cc	Fri Feb 27 09:44:58 2015 -0500
+++ b/libgui/graphics/Figure.cc	Fri Feb 27 18:36:05 2015 +0100
@@ -29,8 +29,6 @@
 #include <QActionGroup>
 #include <QApplication>
 #include <QEvent>
-#include <QFileDialog>
-#include <QFileInfo>
 #include <QFrame>
 #include <QMainWindow>
 #include <QMenu>
@@ -47,10 +45,6 @@
 #include "MouseModeActionGroup.h"
 #include "QtHandlesUtils.h"
 
-#include "octave-qt-link.h"
-
-#include "builtin-defun-decls.h"
-
 namespace QtHandles
 {
 
@@ -221,26 +215,6 @@
     return NoMode;
 }
 
-QString Figure::fileName (void)
-{
-  gh_manager::auto_lock lock;
-
-  const figure::properties& fp = properties<figure> ();
-
-  std::string name = fp.get_filename ();
-
-  return QString::fromStdString (name);
-}
-
-void Figure::setFileName (const QString& name)
-{
-  gh_manager::auto_lock lock;
-
-  figure::properties& fp = properties<figure> ();
-
-  fp.set_filename (name.toStdString ());
-}
-
 MouseMode Figure::mouseMode (void)
 {
   gh_manager::auto_lock lock;
@@ -285,31 +259,6 @@
   m_menuBar = new MenuBar (win);
   win->setMenuBar (m_menuBar);
 
-  QMenu* fileMenu = m_menuBar->addMenu (tr ("&File"));
-  fileMenu->menuAction ()->setObjectName ("builtinMenu");
-  fileMenu->addAction (tr ("&Save"), this, SLOT (fileSaveFigure (bool)));
-  fileMenu->addAction (tr ("Save &As"), this, SLOT (fileSaveFigureAs (void)));
-  fileMenu->addSeparator ();
-  fileMenu->addAction (tr ("&Close Figure"), this,
-                       SLOT (fileCloseFigure (void)), Qt::CTRL|Qt::Key_W);
-
-  QMenu* editMenu = m_menuBar->addMenu (tr ("&Edit"));
-  editMenu->menuAction ()->setObjectName ("builtinMenu");
-  editMenu->addAction (tr ("Cop&y"), this, SLOT (editCopy (void)),
-                       Qt::CTRL|Qt::Key_C)->setEnabled (false);
-  editMenu->addAction (tr ("Cu&t"), this, SLOT (editCut (void)),
-                       Qt::CTRL|Qt::Key_X)->setEnabled (false);
-  editMenu->addAction (tr ("&Paste"), this, SLOT (editPaste(void)),
-                       Qt::CTRL|Qt::Key_V)->setEnabled (false);
-  editMenu->addSeparator ();
-  editMenu->addActions (m_mouseModeGroup->actions ());
-
-  QMenu* helpMenu = m_menuBar->addMenu (tr ("&Help"));
-  helpMenu->menuAction ()->setObjectName ("builtinMenu");
-  helpMenu->addAction (tr ("&About QtHandles"), this,
-                       SLOT (helpAboutQtHandles (void)));
-  helpMenu->addAction (tr ("About &Qt"), qApp, SLOT (aboutQt (void)));
-
   m_menuBar->addReceiver (this);
 }
 
@@ -732,48 +681,6 @@
     canvas->setCursor (mode);
 }
 
-void Figure::fileSaveFigure (bool prompt)
-{
-  QString file = fileName ();
-
-  if (file.isEmpty ())
-    {
-      prompt = true;
-
-      file = "untitled.pdf";
-    }
-
-  if (prompt || file.isEmpty ())
-    {
-      QFileInfo finfo (file);
-
-      file = QFileDialog::getSaveFileName (qWidget<FigureWindow> (),
-                                           tr ("Save Figure As"),
-                                           finfo.absoluteFilePath (), 0, 0,
-                                           QFileDialog::DontUseNativeDialog);
-    }
-
-  if (! file.isEmpty ())
-    {
-      QFileInfo finfo (file);
-
-      setFileName (finfo.absoluteFilePath ());
-
-      octave_link::post_event (this, &Figure::save_figure_callback,
-                               file.toStdString ());
-    }
-}
-
-void Figure::save_figure_callback (const std::string& file)
-{
-  Ffeval (ovl ("print", file));
-}
-  
-void Figure::fileSaveFigureAs (void)
-{
-  fileSaveFigure (true);
-}
-
 void Figure::fileCloseFigure (void)
 {
   qWidget<QMainWindow> ()->close ();