diff options
author | George Hazan <george.hazan@gmail.com> | 2012-11-20 18:41:56 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2012-11-20 18:41:56 +0000 |
commit | 44141ccc8e279bfd390b91f2f0b737b39da6481c (patch) | |
tree | c3cee7cf5fde12c891c834272272b85911328198 /src/modules/extraicons/options_ei.cpp | |
parent | c5c8084eff5beffa9c007de67782b973f2c64fde (diff) |
automatic extra icon removal on dynamic plugin unloading
git-svn-id: http://svn.miranda-ng.org/main/trunk@2399 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/extraicons/options_ei.cpp')
-rw-r--r-- | src/modules/extraicons/options_ei.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/extraicons/options_ei.cpp b/src/modules/extraicons/options_ei.cpp index 2d4e9fd7df..3a70169f98 100644 --- a/src/modules/extraicons/options_ei.cpp +++ b/src/modules/extraicons/options_ei.cpp @@ -419,7 +419,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP TranslateDialogDefault(hwndDlg);
{
int numSlots = GetNumberOfSlots();
- if (numSlots < (int)registeredExtraIcons.size()) {
+ if (numSlots < (int)registeredExtraIcons.getCount()) {
TCHAR txt[512];
mir_sntprintf(txt, SIZEOF(txt), TranslateT("* only the first %d icons will be shown"), numSlots);
@@ -439,7 +439,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP DestroyIcon(hDefaultIcon);
unsigned int i;
- for (i = 0; i < registeredExtraIcons.size(); i++) {
+ for (i = 0; i < registeredExtraIcons.getCount(); i++) {
ExtraIcon *extra = registeredExtraIcons[i];
HICON hIcon = Skin_GetIcon(extra->getDescIcon());
@@ -489,9 +489,9 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP HWND tree = GetDlgItem(hwndDlg, IDC_EXTRAORDER);
// Store old slots
- int *oldSlots = new int[registeredExtraIcons.size()];
+ int *oldSlots = new int[registeredExtraIcons.getCount()];
int lastUsedSlot = -1;
- for (i = 0; i < registeredExtraIcons.size(); i++) {
+ for (i = 0; i < registeredExtraIcons.getCount(); i++) {
if (extraIconsByHandle[i] == registeredExtraIcons[i])
oldSlots[i] = registeredExtraIcons[i]->getSlot();
else
@@ -549,7 +549,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP }
// Store data
- for (i = 0; i < registeredExtraIcons.size(); i++) {
+ for (i = 0; i < registeredExtraIcons.getCount(); i++) {
BaseExtraIcon *extra = registeredExtraIcons[i];
char setting[512];
|