diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-10-26 00:01:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-10-26 00:01:16 +0000 |
| commit | 1fcc1afe0d54bc1034dd500837050dd972e45161 (patch) | |
| tree | 273a9aa0b3af2fe36294336fa4e88a4809766af5 /plugins/Popup/src | |
| parent | 57e1d54a667e66b9409db2ea4137e883ba1187ac (diff) | |
- old crap killed in NewXStatusNotify
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@2081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src')
| -rw-r--r-- | plugins/Popup/src/history.cpp | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp index 7da08ec60b..6775efe666 100644 --- a/plugins/Popup/src/history.cpp +++ b/plugins/Popup/src/history.cpp @@ -83,16 +83,9 @@ void PopupHistoryResize() }
for(i = 0; i < toDelete; ++i){//free too old ones
POPUPDATA2 *ppd = &oldPopupHistory[(oldStart + i)%oldBuffer];
- if (ppd->flags & PU2_UNICODE)
- {
- mir_free(ppd->lpwzTitle);
- mir_free(ppd->lpwzText);
- } else
- {
- mir_free(ppd->lpzTitle);
- mir_free(ppd->lpzText);
- }
- if (ppd->lpzSkin) mir_free(ppd->lpzSkin);
+ mir_free(ppd->lpzTitle);
+ mir_free(ppd->lpzText);
+ mir_free(ppd->lpzSkin);
}
delete [] oldPopupHistory;
}
@@ -102,16 +95,9 @@ void PopupHistoryUnload() for (int i = 0; i < popupHistorySize; ++i)
{
POPUPDATA2 *ppd = &popupHistory[getHistoryIndex(i)];
- if (ppd->flags & PU2_UNICODE)
- {
- mir_free(ppd->lpwzTitle);
- mir_free(ppd->lpwzText);
- } else
- {
- mir_free(ppd->lpzTitle);
- mir_free(ppd->lpzText);
- }
- if (ppd->lpzSkin) mir_free(ppd->lpzSkin);
+ mir_free(ppd->lpzTitle);
+ mir_free(ppd->lpzText);
+ mir_free(ppd->lpzSkin);
}
delete [] popupHistory;
popupHistory = NULL;
@@ -286,11 +272,11 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return TRUE;
LPMEASUREITEMSTRUCT lpmis;
- lpmis = (LPMEASUREITEMSTRUCT) lParam;
+ lpmis = (LPMEASUREITEMSTRUCT) lParam;
if (lpmis->itemID == -1)
return FALSE;
lpmis->itemHeight = 50;
- return TRUE;
+ return TRUE;
}
case WM_DRAWITEM:
{
|