summaryrefslogtreecommitdiff
path: root/plugins/NewAwaySysMod/src/GroupCheckbox.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-04-05 12:47:07 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-04-05 12:47:07 +0000
commit8717c665cc0c324e3732a3350571069d9aecf539 (patch)
treebea28e690e42a5a687dc872fc489eb844217ad86 /plugins/NewAwaySysMod/src/GroupCheckbox.cpp
parent61b47480e829441e8411bab1ca88eef4d8882dd3 (diff)
some useless malloc() calls removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@12607 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NewAwaySysMod/src/GroupCheckbox.cpp')
-rw-r--r--plugins/NewAwaySysMod/src/GroupCheckbox.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/plugins/NewAwaySysMod/src/GroupCheckbox.cpp b/plugins/NewAwaySysMod/src/GroupCheckbox.cpp
index fed51eb888..1cc6c21e01 100644
--- a/plugins/NewAwaySysMod/src/GroupCheckbox.cpp
+++ b/plugins/NewAwaySysMod/src/GroupCheckbox.cpp
@@ -88,17 +88,15 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
HFONT hOldFont = (HFONT)SelectObject(hdc, dat->hFont);
RECT rcText = { 0 };
if (hTheme) {
- WCHAR *szText = (WCHAR*)malloc(Len * sizeof(WCHAR));
+ WCHAR *szText = (WCHAR*)_alloca(Len * sizeof(WCHAR));
GetWindowTextW(hWnd, szText, Len);
GetThemeTextExtent(hTheme, hdc, BP_GROUPBOX, IsWindowEnabled(hWnd) ? GBS_NORMAL : GBS_DISABLED, szText, -1, DT_CALCRECT | DT_LEFT | DT_VCENTER | DT_SINGLELINE, 0, &rcText);
- free(szText);
}
else {
SIZE size;
- TCHAR *szText = (TCHAR*)malloc(Len * sizeof(TCHAR));
+ TCHAR *szText = (TCHAR*)_alloca(Len * sizeof(TCHAR));
GetWindowText(hWnd, szText, Len);
GetTextExtentPoint32(hdc, szText, (int)mir_tstrlen(szText), &size);
- free(szText);
rcText.right = size.cx;
rcText.bottom = size.cy;
}
@@ -276,7 +274,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
rc.left += CG_CHECKBOX_INDENT + CG_CHECKBOX_WIDTH + CG_TEXT_INDENT;
int Len = GetWindowTextLength(hWnd) + 1;
- TCHAR *szTextT = (TCHAR*)malloc(Len * sizeof(TCHAR));
+ TCHAR *szTextT = (TCHAR*)_alloca(Len * sizeof(TCHAR));
GetWindowText(hWnd, szTextT, Len);
HFONT hOldFont = (HFONT)SelectObject(hdcMem, dat->hFont);
@@ -301,11 +299,10 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
InflateRect(&rcText, 1, -1);
DrawFocusRect(hdcMem, &rcText);
}
- free(szTextT);
SelectObject(hdcMem, hOldFont);
- if (hTheme) {
+ if (hTheme)
CloseThemeData(hTheme);
- }
+
BitBlt(hdc, 0, 0, rc.right, rc.bottom, hdcMem, 0, 0, SRCCOPY);
SelectObject(hdcMem, hbmOld);
DeleteObject(hbmMem);