summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-05-13 18:18:50 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-05-13 18:18:50 +0000
commit81afea3f11e1d51023a5bbd333d327452cf7e2d3 (patch)
treeed538b44e3e3c85298de6e1e95bd0509522a933e
parente798063b5ef778f4c8fb70238c019f2a4d1affdb (diff)
missing window unsubclassing
git-svn-id: http://svn.miranda-ng.org/main/trunk@16824 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/SmileyAdd/src/dlgboxsubclass.cpp3
-rw-r--r--plugins/SpellChecker/src/utils.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
index 2f6663f051..fa5d09face 100644
--- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
@@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static mir_cs csWndList;
-static LRESULT CALLBACK MessageDlgSubclass(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
// type definitions
class MsgWndData : public MZeroedObject
@@ -314,6 +312,7 @@ static int MsgDlgHook(WPARAM, LPARAM lParam)
CloseRichCallback(wndEvtData->hwndLog);
CloseRichOwnerCallback(wndEvtData->hwndWindow);
}
+ mir_unsubclassWindow(wndEvtData->hwndWindow, MessageDlgSubclass);
break;
}
return 0;
diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp
index 808f16a623..605fec74c6 100644
--- a/plugins/SpellChecker/src/utils.cpp
+++ b/plugins/SpellChecker/src/utils.cpp
@@ -961,6 +961,9 @@ int RemoveContactTextBox(HWND hwnd)
KillTimer(hwnd, TIMER_ID);
mir_unsubclassWindow(hwnd, EditProc);
+ if (dlg->hwnd_owner)
+ mir_unsubclassWindow(dlg->hwnd_owner, OwnerProc);
+
dialogs.erase(hwnd);
if (dlg->hwnd_owner != NULL)
dialogs.erase(dlg->hwnd_owner);