Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion fred2/bgbitmapdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,13 @@ void bg_bitmap_dlg::OnCancel()
OnClose();
}

void bg_bitmap_dlg::OnClose()
BOOL bg_bitmap_dlg::DestroyWindow()
{
Bg_bitmap_dialog = nullptr;
return CDialog::DestroyWindow();
}

void bg_bitmap_dlg::OnClose()
{
UpdateData(TRUE);
Mission_palette = m_nebula_color;
Expand Down
2 changes: 2 additions & 0 deletions fred2/bgbitmapdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ class bg_bitmap_dlg : public CDialog
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(bg_bitmap_dlg)
public:
virtual BOOL DestroyWindow();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
Expand Down
3 changes: 2 additions & 1 deletion fred2/briefingeditordlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1408,8 +1408,9 @@ void briefing_editor_dlg::OnEndlabeleditTree(NMHDR* pNMHDR, LRESULT* pResult)
*pResult = m_tree.end_label_edit(pTVDispInfo->item);
}

BOOL briefing_editor_dlg::DestroyWindow()
BOOL briefing_editor_dlg::DestroyWindow()
{
Briefing_dialog = nullptr;
m_play_bm.DeleteObject();
audiostream_close_file(m_voice_id, 0);
return CDialog::DestroyWindow();
Expand Down
3 changes: 2 additions & 1 deletion fred2/debriefingeditordlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,9 @@ BOOL debriefing_editor_dlg::OnCommand(WPARAM wParam, LPARAM lParam)
return CDialog::OnCommand(wParam, lParam);
}

BOOL debriefing_editor_dlg::DestroyWindow()
BOOL debriefing_editor_dlg::DestroyWindow()
{
Debriefing_dialog = nullptr;
audiostream_close_file(m_voice_id, 0);
m_play_bm.DeleteObject();
return CDialog::DestroyWindow();
Expand Down
4 changes: 3 additions & 1 deletion fred2/eventeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1520,8 +1520,10 @@ void event_editor::OnSelchangeWaveFilename()
update_persona();
}

BOOL event_editor::DestroyWindow()
BOOL event_editor::DestroyWindow()
{
Event_editor_dlg = nullptr;

audiostream_close_file(m_wave_id, 0);
m_wave_id = -1;

Expand Down
4 changes: 2 additions & 2 deletions fred2/fredview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5048,9 +5048,9 @@ void CFREDView::OnUpdateViewFullDetail(CCmdUI *pCmdUI)
pCmdUI->SetCheck(FullDetail);
}

BOOL CFREDView::DestroyWindow()
BOOL CFREDView::DestroyWindow()
{
// TODO: Add your specialized code here and/or call the base class
Fred_view_wnd = nullptr;
return CView::DestroyWindow();
}

Expand Down
8 changes: 7 additions & 1 deletion fred2/messageeditordlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,13 @@ void CMessageEditorDlg::OnNew()
update_cur_message();
}

void CMessageEditorDlg::OnClose()
BOOL CMessageEditorDlg::DestroyWindow()
{
Message_editor_dlg = nullptr;
return CDialog::DestroyWindow();
}

void CMessageEditorDlg::OnClose()
{
int z;

Expand Down
2 changes: 2 additions & 0 deletions fred2/messageeditordlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class CMessageEditorDlg : public CDialog
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMessageEditorDlg)
public:
virtual BOOL DestroyWindow();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
Expand Down
6 changes: 6 additions & 0 deletions fred2/missioncutscenesdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,12 @@ void CMissionCutscenesDlg::OnCancel()
CDialog::OnCancel();
}

BOOL CMissionCutscenesDlg::DestroyWindow()
{
Cutscene_editor_dlg = nullptr;
return CDialog::DestroyWindow();
}

void CMissionCutscenesDlg::OnClose()
{
if (query_modified()) {
Expand Down
2 changes: 2 additions & 0 deletions fred2/missioncutscenesdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class CMissionCutscenesDlg : public CDialog
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMissionCutscenesDlg)
public:
virtual BOOL DestroyWindow();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
Expand Down
8 changes: 7 additions & 1 deletion fred2/missiongoalsdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,13 @@ void CMissionGoalsDlg::OnCancel()
CDialog::OnCancel();
}

void CMissionGoalsDlg::OnClose()
BOOL CMissionGoalsDlg::DestroyWindow()
{
Goal_editor_dlg = nullptr;
return CDialog::DestroyWindow();
}

void CMissionGoalsDlg::OnClose()
{
int z;

Expand Down
2 changes: 2 additions & 0 deletions fred2/missiongoalsdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class CMissionGoalsDlg : public CDialog
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMissionGoalsDlg)
public:
virtual BOOL DestroyWindow();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
Expand Down
Loading