[commit] r1406 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Sun Jul 17 18:12:11 2011
New Revision: 1406

Log:
OnDestroy isnt being called for CMainForm, so move clearing gmeoleapp to m_pMainWnd.

Modified:
   trunk/GME/Gme/GMEApp.cpp
   trunk/GME/Gme/MainFrm.cpp
   trunk/GME/Gme/MainFrm.h

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Sun Jul 17 18:11:23 2011	(r1405)
+++ trunk/GME/Gme/GMEApp.cpp	Sun Jul 17 18:12:11 2011	(r1406)
@@ -1754,7 +1754,7 @@
 		long l;
 		COMTHROW(mgaProject->get_ProjectStatus(&l));
 		if (IsUndoPossible() && (l & PROJECT_STATUS_CHANGED))
-			ret = AfxMessageBox(_T("Save project '") + projectName + _T("'?"),  MB_YESNOCANCEL);
+			ret = AfxMessageBox(_T("Save project '") + projectName + _T("'?"),  MB_YESNO);
 		if (ret == IDCANCEL) {
 			return FALSE;
 		} else if (ret == IDNO) {
@@ -1762,9 +1762,10 @@
 			OnFileAbortProject();
 		} else {
 			((CMainFrame*)m_pMainWnd)->clearMgaProj();
-			return SafeCloseProject();
+			SafeCloseProject();
 		}
 	}
+    ((CMainFrame*)m_pMainWnd)->clearGmeOleApp();
 	return TRUE;
 }
 

Modified: trunk/GME/Gme/MainFrm.cpp
==============================================================================
--- trunk/GME/Gme/MainFrm.cpp	Sun Jul 17 18:11:23 2011	(r1405)
+++ trunk/GME/Gme/MainFrm.cpp	Sun Jul 17 18:12:11 2011	(r1406)
@@ -104,7 +104,6 @@
 	MSG_MAP_VIEW_PANE(ID_VIEW_CONSOLE,			CGMEConsole,		m_console)
 	MSG_MAP_VIEW_PANE(ID_VIEW_GMEBROWSER,		CGMEBrowser,		m_browser)
 	MSG_MAP_VIEW_PANE(ID_VIEW_SEARCH,			CGMESearch,			m_search)
-	ON_WM_CLOSE()
 	ON_WM_DROPFILES()
 	ON_UPDATE_COMMAND_UI_RANGE(ID_VIEW_APPLOOK_WIN_2000, ID_VIEW_APPLOOK_OFF_2007_AQUA, &CMainFrame::OnUpdateApplicationLook)
 	ON_COMMAND(ID_WINDOW_MANAGER, &CMainFrame::OnWindowManager)
@@ -220,12 +219,6 @@
 	m_console.SetGMEProj( 0 );
 }
 
-void CMainFrame::OnNcDestroy()
-{
-	clearGmeOleApp();
-	CMDIFrameWndEx::OnNcDestroy();
-}
-
 int CMainFrame::CreateToolBars()
 {
 	
@@ -916,11 +909,6 @@
     return TRUE;
 }
 
-BOOL CMainFrame::DestroyWindow()
-{
-	return CMDIFrameWndEx::DestroyWindow();
-}
-
 void CMainFrame::ShowObjectInspector()
 {
 	ShowPane(&m_objectInspector, TRUE, FALSE, TRUE);

Modified: trunk/GME/Gme/MainFrm.h
==============================================================================
--- trunk/GME/Gme/MainFrm.h	Sun Jul 17 18:11:23 2011	(r1405)
+++ trunk/GME/Gme/MainFrm.h	Sun Jul 17 18:12:11 2011	(r1406)
@@ -74,7 +74,6 @@
 	//{{AFX_VIRTUAL(CMainFrame)
 	public:
 	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	virtual BOOL DestroyWindow();
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	//}}AFX_VIRTUAL
 
@@ -147,7 +146,6 @@
 	}
 
 	afx_msg void OnUpdateWindowNew(CCmdUI* pCmdUI);
-	afx_msg void OnNcDestroy();
 public:
 	afx_msg void OnDropFiles(HDROP p_hDropInfo);
 protected: