From fbf9015b528f428a67c02e0e39a86899348177f2 Mon Sep 17 00:00:00 2001 From: Kevin Hendricks Date: Sat, 2 Mar 2019 12:10:45 -0500 Subject: [PATCH] macOS specific cleanup when Mainwindow Closes --- src/MainUI/MainWindow.cpp | 25 +++++++++++++++++++++++++ src/MainUI/MainWindow.h | 1 + 2 files changed, 26 insertions(+) diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp index af3177b77a..3c8a748d82 100644 --- a/src/MainUI/MainWindow.cpp +++ b/src/MainUI/MainWindow.cpp @@ -222,6 +222,31 @@ MainWindow::~MainWindow() m_ViewImage->close(); m_ViewImage = NULL; } + +#ifdef Q_OS_MAC + if (m_ClipboardHistorySelector) delete m_ClipboardHistorySelector; + if (m_LinkOrStyleBookmark) delete m_LinkOrStyleBookmark; + if (m_Reports) delete m_Reports; + if (m_ViewImage) delete m_ViewImage; + if (m_SelectCharacter) delete m_SelectCharacter; + if (m_SpellcheckEditor) delete m_SpellcheckEditor; + if (m_IndexEditor) delete m_IndexEditor; + if (m_ClipEditor) delete m_ClipEditor; + if (m_SearchEditor) delete m_SearchEditor; + if (m_pluginMapper) delete m_pluginMapper; + if (m_casingChangeMapper) delete m_casingChangeMapper; + if (m_headingMapper) delete m_headingMapper; + if (m_lbZoomLabel) delete m_lbZoomLabel; + if (m_slZoomSlider) delete m_slZoomSlider; + if (m_ValidationResultsView) delete m_ValidationResultsView; + if (m_TableOfContents) delete m_TableOfContents; + if (m_FindReplace) delete m_FindReplace; + if (m_Clips) delete m_Clips; + if (m_BookBrowser) delete m_BookBrowser; + if (m_TabManager) delete m_TabManager; + if (m_PreviewWindow) delete m_PreviewWindow; +#endif + } diff --git a/src/MainUI/MainWindow.h b/src/MainUI/MainWindow.h index a5eef1a2d3..9a5afc6ee0 100644 --- a/src/MainUI/MainWindow.h +++ b/src/MainUI/MainWindow.h @@ -1,5 +1,6 @@ /************************************************************************ ** +** Copyright (C) 2016-2019 Kevin B. Hendricks, Stratford, Ontario, Canada ** Copyright (C) 2012-2015 John Schember ** Copyright (C) 2012 Dave Heiland ** Copyright (C) 2009-2011 Strahinja Markovic