Commit 24c20f39 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Fixed activate_exit in the GE editor.

parent 97f471f3
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
#include "wb_wnav_selformat.h" #include "wb_wnav_selformat.h"
#include <QApplication> #include <QApplication>
#include <QCloseEvent>
#include <QFontDatabase> #include <QFontDatabase>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QInputDialog> #include <QInputDialog>
...@@ -1237,7 +1238,7 @@ void GeQt::update() ...@@ -1237,7 +1238,7 @@ void GeQt::update()
void GeQtWidget::closeEvent(QCloseEvent* event) void GeQtWidget::closeEvent(QCloseEvent* event)
{ {
ge->Ge::activate_exit(); ge->Ge::activate_exit();
QWidget::closeEvent(event); event->ignore();
} }
void GeQtWidget::focusInEvent(QFocusEvent* event) void GeQtWidget::focusInEvent(QFocusEvent* event)
...@@ -1260,15 +1261,6 @@ void GeQtWidget::focusInEvent(QFocusEvent* event) ...@@ -1260,15 +1261,6 @@ void GeQtWidget::focusInEvent(QFocusEvent* event)
GeQt::~GeQt() GeQt::~GeQt()
{ {
if (graph->is_modified()) {
open_yesnodia("Do you wan't to save changes", "Save", Ge::exit_save_cb,
Ge::exit_nosave_cb);
}
if (open_dialog) {
wow->DeleteList(open_dialog);
}
if (subgraphs_widget) { if (subgraphs_widget) {
subgraphs_widget->close(); subgraphs_widget->close();
} }
...@@ -1288,7 +1280,7 @@ GeQt::~GeQt() ...@@ -1288,7 +1280,7 @@ GeQt::~GeQt()
delete objectnav; delete objectnav;
} }
toplevel->close(); delete toplevel;
if (exit_when_close) { if (exit_when_close) {
exit(0); exit(0);
...@@ -1325,7 +1317,6 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close, ...@@ -1325,7 +1317,6 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
toplevel->setMinimumSize(window_width, window_height); toplevel->setMinimumSize(window_width, window_height);
toplevel->setWindowTitle(fl(title)); toplevel->setWindowTitle(fl(title));
toplevel->setAttribute(Qt::WA_DeleteOnClose);
CoWowQt::SetWindowIcon(toplevel); CoWowQt::SetWindowIcon(toplevel);
...@@ -2023,4 +2014,4 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close, ...@@ -2023,4 +2014,4 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
ge_get_systemname(systemname); ge_get_systemname(systemname);
graph->set_systemname(systemname); graph->set_systemname(systemname);
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment