From 68a7d04f06d64b534e6e603bede441be991cb91f Mon Sep 17 00:00:00 2001 From: harukalover Date: Wed, 27 May 2009 02:08:21 +0000 Subject: [PATCH] Revert r2965 and r2961, although they fixed the memory leaks they also caused a crash when closing either dialog under some operating systems Originally committed to SVN as r2990. --- aegisub/src/dialog_kanji_timer.cpp | 8 -------- aegisub/src/dialog_kanji_timer.h | 1 - aegisub/src/dialog_translation.cpp | 8 -------- aegisub/src/dialog_translation.h | 1 - 4 files changed, 18 deletions(-) diff --git a/aegisub/src/dialog_kanji_timer.cpp b/aegisub/src/dialog_kanji_timer.cpp index 1274ec110..049280a15 100644 --- a/aegisub/src/dialog_kanji_timer.cpp +++ b/aegisub/src/dialog_kanji_timer.cpp @@ -169,14 +169,6 @@ DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid) } -////////////// -// Destructor -DialogKanjiTimer::~DialogKanjiTimer() { - SourceText->PopEventHandler(true); - DestText->PopEventHandler(true); -} - - /////////////// // Event table BEGIN_EVENT_TABLE(DialogKanjiTimer,wxDialog) diff --git a/aegisub/src/dialog_kanji_timer.h b/aegisub/src/dialog_kanji_timer.h index 866ffdcfe..8c580a849 100644 --- a/aegisub/src/dialog_kanji_timer.h +++ b/aegisub/src/dialog_kanji_timer.h @@ -91,7 +91,6 @@ private: public: DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *grid); - ~DialogKanjiTimer(); void OnKeyDown(wxKeyEvent &event); inline void OnMouseEvent(wxMouseEvent &event); DECLARE_EVENT_TABLE() diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp index 84c333234..c11b3267a 100644 --- a/aegisub/src/dialog_translation.cpp +++ b/aegisub/src/dialog_translation.cpp @@ -161,14 +161,6 @@ DialogTranslation::DialogTranslation (wxWindow *parent,AssFile *_subs,SubtitlesG } -////////////// -// Destructor -DialogTranslation::~DialogTranslation() { - TransText->PopEventHandler(true); - PreviewCheck->PopEventHandler(true); -} - - ////////////////////////// // Jumps to line at block bool DialogTranslation::JumpToLine(int n,int block) { diff --git a/aegisub/src/dialog_translation.h b/aegisub/src/dialog_translation.h index 96c0899cf..171fd488e 100644 --- a/aegisub/src/dialog_translation.h +++ b/aegisub/src/dialog_translation.h @@ -83,7 +83,6 @@ private: public: bool enablePreview; DialogTranslation (wxWindow *parent,AssFile *subs,SubtitlesGrid *grid,int startrow=0,bool preview=false); - ~DialogTranslation(); void OnTransBoxKey(wxKeyEvent &event);