Commit 76ef090f authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

user32/combo: Remove unnecessary argument from button painting helper.

parent 22c2ce2f
...@@ -574,10 +574,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG ...@@ -574,10 +574,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
* *
* Paint combo button (normal, pressed, and disabled states). * Paint combo button (normal, pressed, and disabled states).
*/ */
static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) static void CBPaintButton(HEADCOMBO *lphc, HDC hdc)
{ {
UINT buttonState = DFCS_SCROLLCOMBOBOX; UINT buttonState = DFCS_SCROLLCOMBOBOX;
if (IsRectEmpty(&lphc->buttonRect))
return;
if( lphc->wState & CBF_NOREDRAW ) if( lphc->wState & CBF_NOREDRAW )
return; return;
...@@ -588,7 +591,7 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) ...@@ -588,7 +591,7 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton)
if (CB_DISABLED(lphc)) if (CB_DISABLED(lphc))
buttonState |= DFCS_INACTIVE; buttonState |= DFCS_INACTIVE;
DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState); DrawFrameControl(hdc, &lphc->buttonRect, DFC_SCROLL, buttonState);
} }
/*********************************************************************** /***********************************************************************
...@@ -816,11 +819,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) ...@@ -816,11 +819,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC)
* In non 3.1 look, there is a sunken border on the combobox * In non 3.1 look, there is a sunken border on the combobox
*/ */
CBPaintBorder(lphc->self, lphc, hDC); CBPaintBorder(lphc->self, lphc, hDC);
CBPaintButton(lphc, hDC);
if( !IsRectEmpty(&lphc->buttonRect) )
{
CBPaintButton(lphc, hDC, lphc->buttonRect);
}
/* paint the edit control padding area */ /* paint the edit control padding area */
if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST)
......
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