summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/IRCG/src/irc_dlg.h5
-rw-r--r--protocols/IRCG/src/options.cpp6
-rw-r--r--protocols/IRCG/src/windows.cpp22
-rw-r--r--protocols/JabberG/src/jabber_bookmarks.cpp23
-rw-r--r--protocols/JabberG/src/jabber_console.cpp9
-rw-r--r--protocols/JabberG/src/jabber_disco.cpp11
-rw-r--r--protocols/JabberG/src/jabber_iqid_muc.cpp10
-rw-r--r--protocols/JabberG/src/jabber_notes.cpp13
-rw-r--r--protocols/JabberG/src/jabber_privacy.cpp12
-rw-r--r--protocols/JabberG/src/jabber_svc.cpp3
-rw-r--r--protocols/Steam/src/steam_dialogs.cpp9
-rw-r--r--protocols/Steam/src/steam_dialogs.h6
12 files changed, 36 insertions, 93 deletions
diff --git a/protocols/IRCG/src/irc_dlg.h b/protocols/IRCG/src/irc_dlg.h
index 6da582a634..b070217fd7 100644
--- a/protocols/IRCG/src/irc_dlg.h
+++ b/protocols/IRCG/src/irc_dlg.h
@@ -65,7 +65,6 @@ struct CWhoisDlg : public CCoolIrcDlg
void OnVersion(CCtrlButton*);
bool OnInitDialog() override;
- bool OnClose() override;
void OnDestroy() override;
};
@@ -170,7 +169,7 @@ struct CQuestionDlg : public CCoolIrcDlg
bool OnInitDialog() override;
bool OnApply() override;
- bool OnClose() override;
+ void OnDestroy() override;
void Activate();
@@ -300,5 +299,5 @@ struct CAddIgnoreDlg : public CProtoDlgBase < CIrcProto >
bool OnInitDialog() override;
bool OnApply() override;
- bool OnClose() override;
+ void OnDestroy() override;
};
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 22bbde0610..853cbd8048 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -365,13 +365,12 @@ struct CServerDlg : public CProtoDlgBase<CIrcProto>
return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
m_owner->m_serverCombo.Enable();
m_owner->m_add.Enable();
m_owner->m_edit.Enable();
m_owner->m_del.Enable();
- return true;
}
};
@@ -1220,10 +1219,9 @@ bool CAddIgnoreDlg::OnApply()
return true;
}
-bool CAddIgnoreDlg::OnClose()
+void CAddIgnoreDlg::OnDestroy()
{
m_owner->FixButtons();
- return true;
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index b952e936f3..44a5d90d79 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -90,13 +90,6 @@ bool CWhoisDlg::OnInitDialog()
return true;
}
-bool CWhoisDlg::OnClose()
-{
- ShowWindow(m_hwnd, SW_HIDE);
- SendMessage(m_hwnd, WM_SETREDRAW, FALSE, 0);
- return true;
-}
-
void CWhoisDlg::OnDestroy()
{
CCoolIrcDlg::OnDestroy();
@@ -722,13 +715,6 @@ bool CQuestionDlg::OnInitDialog()
return true;
}
-bool CQuestionDlg::OnClose()
-{
- if (m_owner)
- m_owner->CloseQuestion();
- return true;
-}
-
bool CQuestionDlg::OnApply()
{
int i = GetWindowTextLength(GetDlgItem(m_hwnd, IDC_EDIT));
@@ -776,6 +762,12 @@ bool CQuestionDlg::OnApply()
return true;
}
+void CQuestionDlg::OnDestroy()
+{
+ if (m_owner)
+ m_owner->CloseQuestion();
+}
+
void CQuestionDlg::Activate()
{
ShowWindow(m_hwnd, SW_SHOW);
@@ -934,7 +926,7 @@ bool CManagerDlg::OnClose()
m_proto->setWString(p, S.c_str());
mir_free(p);
}
- DestroyWindow(m_hwnd);
+
return true;
}
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 92f4d11467..527c149497 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -214,7 +214,7 @@ public:
return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
LVCOLUMN lvc = { 0 };
lvc.mask = LVCF_WIDTH;
@@ -227,28 +227,7 @@ public:
Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "bookmarksWnd_");
- return CSuper::OnClose();
- }
-
- void OnDestroy() override
- {
m_proto->m_pDlgBookmarks = nullptr;
- CSuper::OnDestroy();
- }
-
- INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override
- {
- switch (msg) {
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
- case IDOK:
- OpenBookmark();
- return TRUE;
- }
- break;
- }
-
- return CSuper::DlgProc(msg, wParam, lParam);
}
int Resizer(UTILRESIZECONTROL *urc) override
diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index e44fce1c29..8d14701bf4 100644
--- a/protocols/JabberG/src/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
@@ -377,21 +377,20 @@ public:
return true;
}
- bool OnClose() override
+ bool OnApply() override
{
m_proto->setByte("consoleWnd_msg", m_proto->m_filterInfo.msg);
m_proto->setByte("consoleWnd_presence", m_proto->m_filterInfo.presence);
m_proto->setByte("consoleWnd_iq", m_proto->m_filterInfo.iq);
m_proto->setByte("consoleWnd_ftype", m_proto->m_filterInfo.type);
m_proto->setWString("consoleWnd_fpattern", m_proto->m_filterInfo.pattern);
-
- Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "consoleWnd_");
- DestroyWindow(m_hwnd);
- return CSuper::OnClose();
+ return true;
}
void OnDestroy() override
{
+ Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "consoleWnd_");
+
IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(m_hwnd, IDC_BTN_MSG, BM_SETIMAGE, IMAGE_ICON, 0));
IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(m_hwnd, IDC_BTN_PRESENCE, BM_SETIMAGE, IMAGE_ICON, 0));
IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(m_hwnd, IDC_BTN_IQ, BM_SETIMAGE, IMAGE_ICON, 0));
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index 5986f09eb0..99489348bd 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -667,13 +667,12 @@ public:
if ((GetWindowLongPtr(hwndFocus, GWL_ID) == IDC_COMBO_NODE) || (GetWindowLongPtr(hwndFocus, GWL_ID) == IDC_COMBO_JID))
PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_BROWSE, 0), 0);
+ m_proto->setByte("discoWnd_useTree", IsDlgButtonChecked(m_hwnd, IDC_BTN_VIEWTREE));
return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
- m_proto->setByte("discoWnd_useTree", IsDlgButtonChecked(m_hwnd, IDC_BTN_VIEWTREE));
-
LVCOLUMN lvc = { 0 };
lvc.mask = LVCF_WIDTH;
m_lstDiscoTree.GetColumn(0, &lvc);
@@ -684,13 +683,7 @@ public:
m_proto->setWord("discoWnd_cx2", lvc.cx);
Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "discoWnd_");
- DestroyWindow(m_hwnd);
- return CSuper::OnClose();
- }
-
- void OnDestroy() override
- {
m_proto->m_pDlgServiceDiscovery = nullptr;
{
mir_cslock lck(m_proto->m_SDManager.cs());
diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index 458b89473e..0a504a99ea 100644
--- a/protocols/JabberG/src/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
@@ -210,16 +210,12 @@ public:
return true;
}
- bool OnClose() override
- {
- FreeList();
- m_proto->GetMucDlg(m_info->type) = nullptr;
- return true;
- }
-
void OnDestroy() override
{
Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "jidListWnd_");
+
+ FreeList();
+ m_proto->GetMucDlg(m_info->type) = nullptr;
}
INT_PTR DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) override
diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index c7065598cb..eacdc679aa 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -222,11 +222,10 @@ public:
return CSuper::Resizer(urc);
}
- bool OnClose() override
+ void OnDestroy() override
{
if (m_fnProcess)
(m_proto->*m_fnProcess)(m_pNote, false);
- return CSuper::OnClose();
}
};
@@ -524,14 +523,16 @@ public:
if (IDYES != MessageBox(m_hwnd, TranslateT("Notes are not saved, close this window without uploading data to server?"), TranslateT("Are you sure?"), MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2))
return false;
- Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "notesWnd_");
- DeleteObject(m_hfntSmall);
- DeleteObject(m_hfntBold);
- return CSuper::OnClose();
+ return true;
}
void OnDestroy() override
{
+ Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "notesWnd_");
+
+ DeleteObject(m_hfntSmall);
+ DeleteObject(m_hfntBold);
+
m_tvFilter.DeleteAllItems();
m_proto->m_pDlgNotes = nullptr;
CSuper::OnDestroy();
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index ce16d1ae0c..5c9cfb9eff 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -307,12 +307,6 @@ public:
m_txtName.GetTextU(szLine, _countof(szLine));
return true;
}
-
- bool OnClose() override
- {
- EndModal(m_bSucceeded);
- return true;
- }
};
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1369,11 +1363,7 @@ public:
bool OnClose() override
{
- if (!CanExit())
- return false;
-
- DestroyWindow(m_hwnd);
- return CSuper::OnClose();
+ return CanExit();
}
void OnDestroy() override
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index fd41daf761..12c582a3f5 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -579,12 +579,11 @@ public:
return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
m_proto->SendHttpAuthReply(m_pParams, m_bSucceeded);
m_pParams->Free();
mir_free(m_pParams);
- return true;
}
UI_MESSAGE_MAP(CJabberDlgHttpAuth, CSuper);
diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp
index 690e04d1e6..1a8fcf474b 100644
--- a/protocols/Steam/src/steam_dialogs.cpp
+++ b/protocols/Steam/src/steam_dialogs.cpp
@@ -29,10 +29,9 @@ bool CSteamPasswordEditor::OnApply()
return true;
}
-bool CSteamPasswordEditor::OnClose()
+void CSteamPasswordEditor::OnDestroy()
{
Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "PasswordWindow");
- return true;
}
/////////////////////////////////////////////////////////////////////////////////
@@ -67,11 +66,10 @@ bool CSteamGuardDialog::OnApply()
return true;
}
-bool CSteamGuardDialog::OnClose()
+void CSteamGuardDialog::OnDestroy()
{
m_proto->m_hwndGuard = nullptr;
Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "GuardWindow");
- return true;
}
/////////////////////////////////////////////////////////////////////////////////
@@ -102,10 +100,9 @@ bool CSteamTwoFactorDialog::OnApply()
return true;
}
-bool CSteamTwoFactorDialog::OnClose()
+void CSteamTwoFactorDialog::OnDestroy()
{
Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "TwoFactorWindow");
- return true;
}
/////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Steam/src/steam_dialogs.h b/protocols/Steam/src/steam_dialogs.h
index 8389e0bfd3..0322056230 100644
--- a/protocols/Steam/src/steam_dialogs.h
+++ b/protocols/Steam/src/steam_dialogs.h
@@ -15,7 +15,7 @@ class CSteamPasswordEditor : public CSteamDlgBase
protected:
bool OnInitDialog() override;
bool OnApply() override;
- bool OnClose() override;
+ void OnDestroy() override;
public:
CSteamPasswordEditor(CSteamProto *proto);
@@ -34,7 +34,7 @@ class CSteamGuardDialog : public CSteamDlgBase
protected:
bool OnInitDialog() override;
bool OnApply() override;
- bool OnClose() override;
+ void OnDestroy() override;
public:
CSteamGuardDialog(CSteamProto *proto, const char *domain);
@@ -55,7 +55,7 @@ class CSteamTwoFactorDialog : public CSteamDlgBase
protected:
bool OnInitDialog() override;
bool OnApply() override;
- bool OnClose() override;
+ void OnDestroy() override;
public:
CSteamTwoFactorDialog(CSteamProto *proto);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 21:08:49 +0000