Commit bab7871c authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

comctl32: Remove unused variables.

parent 07d73206
...@@ -530,13 +530,11 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf) ...@@ -530,13 +530,11 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf)
static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index) static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index)
{ {
CBE_ITEMDATA const *item;
TRACE("(index=%d)\n", index); TRACE("(index=%d)\n", index);
/* if item number requested does not exist then return failure */ /* if item number requested does not exist then return failure */
if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR; if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR;
if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR; if (!COMBOEX_FindItem(infoPtr, index)) return CB_ERR;
/* doing this will result in WM_DELETEITEM being issued */ /* doing this will result in WM_DELETEITEM being issued */
SendMessageW (infoPtr->hwndCombo, CB_DELETESTRING, (WPARAM)index, 0); SendMessageW (infoPtr->hwndCombo, CB_DELETESTRING, (WPARAM)index, 0);
......
...@@ -9968,10 +9968,9 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA ...@@ -9968,10 +9968,9 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA
HFONT hFont, hOldFont = 0; HFONT hFont, hOldFont = 0;
RECT rect; RECT rect;
SIZE sz; SIZE sz;
int len;
if (!infoPtr->hwndEdit || !hdc) return 0; if (!infoPtr->hwndEdit || !hdc) return 0;
len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0]));
GetWindowRect(infoPtr->hwndEdit, &rect); GetWindowRect(infoPtr->hwndEdit, &rect);
/* Select font to get the right dimension of the string */ /* Select font to get the right dimension of the string */
......
...@@ -442,7 +442,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT ...@@ -442,7 +442,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT
RECT *days=&dayrect; RECT *days=&dayrect;
RECT rtoday; RECT rtoday;
int i, j, m, mask, day, firstDay, weeknum, weeknum1,prevMonth; int i, j, m, mask, day, firstDay, weeknum, weeknum1,prevMonth;
int textHeight = infoPtr->textHeight, textWidth = infoPtr->textWidth; int textHeight = infoPtr->textHeight;
SIZE size; SIZE size;
HBRUSH hbr; HBRUSH hbr;
HFONT currentFont; HFONT currentFont;
...@@ -659,13 +659,11 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT ...@@ -659,13 +659,11 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT
* date if necessary */ * date if necessary */
if(!(dwStyle & MCS_NOTODAY)) { if(!(dwStyle & MCS_NOTODAY)) {
int offset = 0;
if(!(dwStyle & MCS_NOTODAYCIRCLE)) { if(!(dwStyle & MCS_NOTODAYCIRCLE)) {
/*day is the number of days from nextmonth we put on the calendar */ /*day is the number of days from nextmonth we put on the calendar */
MONTHCAL_CircleDay(infoPtr, hdc, MONTHCAL_CircleDay(infoPtr, hdc,
day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear),
infoPtr->currentMonth); infoPtr->currentMonth);
offset+=textWidth;
} }
if (!LoadStringW(COMCTL32_hModule,IDM_TODAY,buf1,countof(buf1))) if (!LoadStringW(COMCTL32_hModule,IDM_TODAY,buf1,countof(buf1)))
{ {
......
...@@ -2848,7 +2848,6 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2848,7 +2848,6 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
LPCREATESTRUCTW cs = (LPCREATESTRUCTW) lParam; LPCREATESTRUCTW cs = (LPCREATESTRUCTW) lParam;
RECT wnrc1, clrc1; RECT wnrc1, clrc1;
HTHEME theme;
if (TRACE_ON(rebar)) { if (TRACE_ON(rebar)) {
GetWindowRect(infoPtr->hwndSelf, &wnrc1); GetWindowRect(infoPtr->hwndSelf, &wnrc1);
...@@ -2859,8 +2858,8 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2859,8 +2858,8 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
TRACE("created!\n"); TRACE("created!\n");
if ((theme = OpenThemeData (infoPtr->hwndSelf, themeClass))) if (OpenThemeData (infoPtr->hwndSelf, themeClass))
{ {
/* native seems to clear WS_BORDER when themed */ /* native seems to clear WS_BORDER when themed */
infoPtr->dwStyle &= ~WS_BORDER; infoPtr->dwStyle &= ~WS_BORDER;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment