diff main/MainWindow.cpp @ 688:a2c308bd5530

Subrepo update

--- a/main/MainWindow.cpp	Wed Jan 15 09:58:34 2020 +0000
+++ b/main/MainWindow.cpp	Wed Mar 25 13:26:42 2020 +0000
@@ -1901,7 +1901,7 @@
         return;
     }
 
-    if (!m_abandoning && !checkSaveModified()) {
+    if (!checkSaveModified()) {
 //        cerr << "Ignoring close event" << endl;
         e->ignore();
         return;
@@ -2368,7 +2368,7 @@
 
     } else {
 
-        DataExportOptions options = DataExportOmitLevels;
+        DataExportOptions options = DataExportOmitLevel;
         
         CSVFileWriter writer(path, model.get(),
                              ((suffix == "csv") ? "," : "\t"),
@@ -3198,7 +3198,7 @@
 }
 
 void
-MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position)
+MainWindow::paneRightButtonMenuRequested(Pane *pane, QPoint position)
 {
 //    cerr << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl;
     m_paneStack->setCurrentPane(pane);
@@ -3206,6 +3206,16 @@
 }
 
 void
+MainWindow::panePropertiesRightButtonMenuRequested(Pane *, QPoint)
+{
+}
+
+void
+MainWindow::layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint)
+{
+}
+
+void
 MainWindow::handleOSCMessage(const OSCMessage &)
 {
     cerr << "MainWindow::handleOSCMessage: Not implemented" << endl;