Andrew Talbot : comctl32: Remove unused variables.
Alexandre Julliard
julliard at winehq.org
Mon Apr 14 07:14:23 CDT 2008
Module: wine
Branch: master
Commit: 369d414d59bb2845a35e5fdd0e1179dee72850f7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=369d414d59bb2845a35e5fdd0e1179dee72850f7
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sat Apr 12 18:31:47 2008 +0100
comctl32: Remove unused variables.
---
dlls/comctl32/propsheet.c | 2 --
dlls/comctl32/toolbar.c | 3 +--
dlls/comctl32/trackbar.c | 3 +--
dlls/comctl32/treeview.c | 3 +--
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index a193082..84b1b7f 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3412,7 +3412,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
PropSheetInfo* psInfo = (PropSheetInfo*) lParam;
WCHAR* strCaption = (WCHAR*)Alloc(MAX_CAPTION_LENGTH*sizeof(WCHAR));
HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
- LPCPROPSHEETPAGEW ppshpage;
int idx;
LOGFONTW logFont;
@@ -3508,7 +3507,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
PSCB_INITIALIZED, (LPARAM)0);
idx = psInfo->active_page;
- ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage;
psInfo->active_page = -1;
PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage);
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 1bda0cc..9991683 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1280,7 +1280,7 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle )
TBUTTON_INFO *btnPtr;
INT x, cx, i, j;
RECT rc;
- BOOL bWrap, bButtonWrap;
+ BOOL bButtonWrap;
/* When the toolbar window style is not TBSTYLE_WRAPABLE, */
/* no layout is necessary. Applications may use this style */
@@ -1314,7 +1314,6 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle )
for (i = 0; i < infoPtr->nNumButtons; i++ )
{
- bWrap = FALSE;
btnPtr[i].fsState &= ~TBSTATE_WRAP;
if (btnPtr[i].fsState & TBSTATE_HIDDEN)
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 7cdfe71..e81d55f 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -822,7 +822,6 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst)
HBITMAP hOldBmp = 0, hOffScreenBmp = 0;
NMCUSTOMDRAW nmcd;
int gcdrf, icdrf;
- HTHEME theme;
if (infoPtr->flags & TB_THUMBCHANGED) {
TRACKBAR_UpdateThumb (infoPtr);
@@ -867,7 +866,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst)
/* Erase background */
if (gcdrf == CDRF_DODEFAULT ||
notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) {
- if ((theme = GetWindowTheme (infoPtr->hwndSelf))) {
+ if (GetWindowTheme (infoPtr->hwndSelf)) {
DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0);
}
else
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 5650c46..2b71a3b 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3575,12 +3575,11 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
TREEVIEW_ITEM *editItem = infoPtr->selectedItem;
HDC hdc = GetDC(infoPtr->hwndEdit);
SIZE sz;
- int len;
HFONT hFont, hOldFont = 0;
infoPtr->bLabelChanged = TRUE;
- len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0]));
+ GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0]));
/* Select font to get the right dimension of the string */
hFont = (HFONT)SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0);
More information about the wine-cvs
mailing list