comctl32: Remove unused variables.
authorAndrew Talbot <andrew.talbot@talbotville.com>
Sat, 12 Apr 2008 17:31:43 +0000 (18:31 +0100)
committerAlexandre Julliard <julliard@winehq.org>
Mon, 14 Apr 2008 10:09:13 +0000 (12:09 +0200)
dlls/comctl32/comboex.c
dlls/comctl32/listview.c
dlls/comctl32/monthcal.c
dlls/comctl32/rebar.c

index a98243d1472ecdc174d795e0104b3f5d243af596..e79831d2b05afa1a0586d73ef809f626d6f16f67 100644 (file)
@@ -530,13 +530,11 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf)
 
 static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index)
 {
-    CBE_ITEMDATA const *item;
-
     TRACE("(index=%d)\n", index);
 
     /* if item number requested does not exist then return failure */
     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 */
     SendMessageW (infoPtr->hwndCombo, CB_DELETESTRING, (WPARAM)index, 0);
index abe1470e9b58c5597776c4af7885a32fa091fd0d..ab819e6b0a16df5f2c622b659f6f81e32e8d9f50 100644 (file)
@@ -9968,10 +9968,9 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA
             HFONT         hFont, hOldFont = 0;
            RECT          rect;
            SIZE          sz;
-           int           len;
 
            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);
 
             /* Select font to get the right dimension of the string */
index 1c325de4508e9597ba63001053ad84d81c46215d..a9647cd74a6dbf44a4e29122ae2372b46d6960e3 100644 (file)
@@ -442,7 +442,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT
   RECT *days=&dayrect;
   RECT rtoday;
   int i, j, m, mask, day, firstDay, weeknum, weeknum1,prevMonth;
-  int textHeight = infoPtr->textHeight, textWidth = infoPtr->textWidth;
+  int textHeight = infoPtr->textHeight;
   SIZE size;
   HBRUSH hbr;
   HFONT currentFont;
@@ -659,13 +659,11 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT
  * date if necessary */
 
   if(!(dwStyle & MCS_NOTODAY))  {
-    int offset = 0;
     if(!(dwStyle & MCS_NOTODAYCIRCLE))  {
       /*day is the number of days from nextmonth we put on the calendar */
       MONTHCAL_CircleDay(infoPtr, hdc,
                         day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear),
                         infoPtr->currentMonth);
-      offset+=textWidth;
     }
     if (!LoadStringW(COMCTL32_hModule,IDM_TODAY,buf1,countof(buf1)))
       {
index 033b47489bb0827f309272626e825d1fa6f4c064..638acea20f14f3f6f0afa6f00f24adee6162219b 100644 (file)
@@ -2848,7 +2848,6 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
     LPCREATESTRUCTW cs = (LPCREATESTRUCTW) lParam;
     RECT wnrc1, clrc1;
-    HTHEME theme;
 
     if (TRACE_ON(rebar)) {
        GetWindowRect(infoPtr->hwndSelf, &wnrc1);
@@ -2859,8 +2858,8 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
     }
 
     TRACE("created!\n");
-    
-    if ((theme = OpenThemeData (infoPtr->hwndSelf, themeClass)))
+
+    if (OpenThemeData (infoPtr->hwndSelf, themeClass))
     {
         /* native seems to clear WS_BORDER when themed */
         infoPtr->dwStyle &= ~WS_BORDER;