diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CrashDumper/src/ui.cpp | 3 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/ui.h | 3 | ||||
| -rw-r--r-- | plugins/Dbx_mdbx/src/dbcrypt.cpp | 2 | ||||
| -rw-r--r-- | plugins/Folders/src/dlg_handlers.cpp | 3 | ||||
| -rw-r--r-- | plugins/Import/src/wizard.cpp | 6 | ||||
| -rw-r--r-- | plugins/MyDetails/src/services.cpp | 3 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp | 6 |
7 files changed, 9 insertions, 17 deletions
diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp index 7018e90521..9dd4dc0cd5 100644 --- a/plugins/CrashDumper/src/ui.cpp +++ b/plugins/CrashDumper/src/ui.cpp @@ -65,7 +65,7 @@ public: return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
Window_FreeIcon_IcoLib(m_hwnd);
Utils_SaveWindowPosition(m_hwnd, NULL, MODULENAME, "ViewInfo_");
@@ -73,7 +73,6 @@ public: pViewDialog = nullptr;
if (g_plugin.bServiceMode)
PostQuitMessage(0);
- return true;
}
int Resizer(UTILRESIZECONTROL *urc) override
diff --git a/plugins/Db3x_mmap/src/ui.h b/plugins/Db3x_mmap/src/ui.h index 83d7d3dbb4..c52a479bc6 100644 --- a/plugins/Db3x_mmap/src/ui.h +++ b/plugins/Db3x_mmap/src/ui.h @@ -7,6 +7,7 @@ class CSelectCryptoDialog : public CDlgBase CRYPTO_PROVIDER **m_provs;
size_t m_provscount;
CRYPTO_PROVIDER *m_selected;
+
public:
CSelectCryptoDialog(CRYPTO_PROVIDER **provs, size_t count) :
CDlgBase(g_plugin, IDD_SELECT_CRYPTOPROVIDER),
@@ -31,7 +32,7 @@ public: return true;
}
- bool OnClose() override
+ bool OnApply() override
{
m_selected = m_provs[ m_combo.GetItemData(m_combo.GetCurSel()) ];
return true;
diff --git a/plugins/Dbx_mdbx/src/dbcrypt.cpp b/plugins/Dbx_mdbx/src/dbcrypt.cpp index 117c5e0af6..8c47a1a4d3 100644 --- a/plugins/Dbx_mdbx/src/dbcrypt.cpp +++ b/plugins/Dbx_mdbx/src/dbcrypt.cpp @@ -44,7 +44,7 @@ class CSelectCryptoDialog : public CDlgBase return true;
}
- bool OnClose() override
+ bool OnApply() override
{
m_selected = m_provs[m_combo.GetItemData(m_combo.GetCurSel())];
m_bTotalEncryption = m_chkTotalCrypt.GetState() != 0;
diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index d29e02aaaa..7e45a57575 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -52,11 +52,10 @@ public: return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
if (pHelpDialog == this)
pHelpDialog = nullptr;
- return true;
}
void OnCloseClick(CCtrlBase*)
diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index 4cb84ce5bc..fcc3bbd8d4 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -147,16 +147,12 @@ public: return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;
}
- bool OnClose() override
+ void OnDestroy() override
{
Utils_SaveWindowPosition(m_hwnd, 0, IMPORT_MODULE, "wiz");
if (hwndPage)
DestroyWindow(hwndPage);
- return true;
- }
- void OnDestroy() override
- {
g_hwndWizard = nullptr;
delete g_pBatch; g_pBatch = nullptr;
diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp index 1043d70898..b5089e9a42 100644 --- a/plugins/MyDetails/src/services.cpp +++ b/plugins/MyDetails/src/services.cpp @@ -96,11 +96,10 @@ public: return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
if (pSetNickDialog == this)
pSetNickDialog = nullptr;
- return true;
}
};
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index faead58d54..52d0293005 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -1114,12 +1114,11 @@ public: return true;
}
- bool OnClose() override
+ bool OnApply() override
{
if (m_pReminder)
DeleteReminder(m_pReminder);
JustSaveReminders();
- NotifyList();
return true;
}
@@ -1419,12 +1418,11 @@ public: return true;
}
- bool OnClose() override
+ void OnDestroy() override
{
bNewReminderVisible = false;
if (m_pReminder)
m_pReminder->bVisible = false;
- return true;
}
void onClick_Add(CCtrlButton*)
|