Commit 74ab88ca authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

comctl32: Replace inline static with static inline.

parent 525b5f4e
...@@ -135,17 +135,17 @@ static LRESULT WINAPI COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -135,17 +135,17 @@ static LRESULT WINAPI COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam,
static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr); static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr);
typedef INT (WINAPI *cmp_func_t)(LPCWSTR, LPCWSTR); typedef INT (WINAPI *cmp_func_t)(LPCWSTR, LPCWSTR);
inline static BOOL is_textW(LPCWSTR str) static inline BOOL is_textW(LPCWSTR str)
{ {
return str && str != LPSTR_TEXTCALLBACKW; return str && str != LPSTR_TEXTCALLBACKW;
} }
inline static BOOL is_textA(LPCSTR str) static inline BOOL is_textA(LPCSTR str)
{ {
return str && str != LPSTR_TEXTCALLBACKA; return str && str != LPSTR_TEXTCALLBACKA;
} }
inline static LPCSTR debugstr_txt(LPCWSTR str) static inline LPCSTR debugstr_txt(LPCWSTR str)
{ {
if (str == LPSTR_TEXTCALLBACKW) return "(callback)"; if (str == LPSTR_TEXTCALLBACKW) return "(callback)";
return debugstr_w(str); return debugstr_w(str);
...@@ -174,13 +174,13 @@ static void COMBOEX_DumpInput (COMBOBOXEXITEMW *input) ...@@ -174,13 +174,13 @@ static void COMBOEX_DumpInput (COMBOBOXEXITEMW *input)
} }
inline static CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index) static inline CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index)
{ {
return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA, return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA,
(WPARAM)index, 0); (WPARAM)index, 0);
} }
inline static cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr) static inline cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr)
{ {
return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW; return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW;
} }
...@@ -601,7 +601,7 @@ static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) ...@@ -601,7 +601,7 @@ static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit)
} }
inline static BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr) static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr)
{ {
return COMBOEX_HasEdit(infoPtr) && return COMBOEX_HasEdit(infoPtr) &&
(infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED; (infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED;
......
...@@ -161,7 +161,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, HDITEMW * ...@@ -161,7 +161,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, HDITEMW *
} }
} }
inline static LRESULT static inline LRESULT
HEADER_IndexToOrder (HWND hwnd, INT iItem) HEADER_IndexToOrder (HWND hwnd, INT iItem)
{ {
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
...@@ -1178,7 +1178,7 @@ HEADER_GetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) ...@@ -1178,7 +1178,7 @@ HEADER_GetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode)
} }
inline static LRESULT static inline LRESULT
HEADER_GetItemCount (HWND hwnd) HEADER_GetItemCount (HWND hwnd)
{ {
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
...@@ -1239,7 +1239,7 @@ HEADER_SetOrderArray(HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1239,7 +1239,7 @@ HEADER_SetOrderArray(HWND hwnd, WPARAM wParam, LPARAM lParam)
return TRUE; return TRUE;
} }
inline static LRESULT static inline LRESULT
HEADER_GetUnicodeFormat (HWND hwnd) HEADER_GetUnicodeFormat (HWND hwnd)
{ {
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
...@@ -1432,7 +1432,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) ...@@ -1432,7 +1432,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode)
return TRUE; return TRUE;
} }
inline static LRESULT static inline LRESULT
HEADER_SetUnicodeFormat (HWND hwnd, WPARAM wParam) HEADER_SetUnicodeFormat (HWND hwnd, WPARAM wParam)
{ {
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
......
...@@ -274,7 +274,7 @@ HOTKEY_EraseBackground (HOTKEY_INFO *infoPtr, HDC hdc) ...@@ -274,7 +274,7 @@ HOTKEY_EraseBackground (HOTKEY_INFO *infoPtr, HDC hdc)
} }
inline static LRESULT static inline LRESULT
HOTKEY_GetFont (HOTKEY_INFO *infoPtr) HOTKEY_GetFont (HOTKEY_INFO *infoPtr)
{ {
return (LRESULT)infoPtr->hFont; return (LRESULT)infoPtr->hFont;
...@@ -402,7 +402,7 @@ HOTKEY_LButtonDown (HOTKEY_INFO *infoPtr) ...@@ -402,7 +402,7 @@ HOTKEY_LButtonDown (HOTKEY_INFO *infoPtr)
} }
inline static LRESULT static inline LRESULT
HOTKEY_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs) HOTKEY_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs)
{ {
HOTKEY_INFO *infoPtr; HOTKEY_INFO *infoPtr;
......
...@@ -1978,7 +1978,7 @@ REBAR_GetBandBorders (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -1978,7 +1978,7 @@ REBAR_GetBandBorders (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
REBAR_GetBandCount (REBAR_INFO *infoPtr) REBAR_GetBandCount (REBAR_INFO *infoPtr)
{ {
TRACE("band count %u!\n", infoPtr->uNumBands); TRACE("band count %u!\n", infoPtr->uNumBands);
...@@ -2102,7 +2102,7 @@ REBAR_GetBarInfo (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2102,7 +2102,7 @@ REBAR_GetBarInfo (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
REBAR_GetBkColor (REBAR_INFO *infoPtr) REBAR_GetBkColor (REBAR_INFO *infoPtr)
{ {
COLORREF clr = infoPtr->clrBk; COLORREF clr = infoPtr->clrBk;
...@@ -2152,7 +2152,7 @@ REBAR_GetRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2152,7 +2152,7 @@ REBAR_GetRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
REBAR_GetRowCount (REBAR_INFO *infoPtr) REBAR_GetRowCount (REBAR_INFO *infoPtr)
{ {
TRACE("%u\n", infoPtr->uNumRows); TRACE("%u\n", infoPtr->uNumRows);
...@@ -2183,7 +2183,7 @@ REBAR_GetRowHeight (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2183,7 +2183,7 @@ REBAR_GetRowHeight (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
REBAR_GetTextColor (REBAR_INFO *infoPtr) REBAR_GetTextColor (REBAR_INFO *infoPtr)
{ {
TRACE("text color 0x%06x!\n", infoPtr->clrText); TRACE("text color 0x%06x!\n", infoPtr->clrText);
...@@ -2192,14 +2192,14 @@ REBAR_GetTextColor (REBAR_INFO *infoPtr) ...@@ -2192,14 +2192,14 @@ REBAR_GetTextColor (REBAR_INFO *infoPtr)
} }
inline static LRESULT static inline LRESULT
REBAR_GetToolTips (REBAR_INFO *infoPtr) REBAR_GetToolTips (REBAR_INFO *infoPtr)
{ {
return (LRESULT)infoPtr->hwndToolTip; return (LRESULT)infoPtr->hwndToolTip;
} }
inline static LRESULT static inline LRESULT
REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr) REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr)
{ {
TRACE("%s hwnd=%p\n", TRACE("%s hwnd=%p\n",
...@@ -2209,7 +2209,7 @@ REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr) ...@@ -2209,7 +2209,7 @@ REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr)
} }
inline static LRESULT static inline LRESULT
REBAR_GetVersion (REBAR_INFO *infoPtr) REBAR_GetVersion (REBAR_INFO *infoPtr)
{ {
TRACE("version %d\n", infoPtr->iVersion); TRACE("version %d\n", infoPtr->iVersion);
...@@ -2619,7 +2619,7 @@ REBAR_SetTextColor (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2619,7 +2619,7 @@ REBAR_SetTextColor (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
/* << REBAR_SetTooltips >> */ /* << REBAR_SetTooltips >> */
inline static LRESULT static inline LRESULT
REBAR_SetUnicodeFormat (REBAR_INFO *infoPtr, WPARAM wParam) REBAR_SetUnicodeFormat (REBAR_INFO *infoPtr, WPARAM wParam)
{ {
BOOL bTemp = infoPtr->bUnicode; BOOL bTemp = infoPtr->bUnicode;
...@@ -2999,7 +2999,7 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2999,7 +2999,7 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
REBAR_NCCalcSize (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) REBAR_NCCalcSize (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
HTHEME theme; HTHEME theme;
...@@ -3283,7 +3283,7 @@ REBAR_SetFont (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -3283,7 +3283,7 @@ REBAR_SetFont (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
REBAR_SetRedraw (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) REBAR_SetRedraw (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
/***************************************************** /*****************************************************
* *
......
...@@ -828,7 +828,7 @@ STATUSBAR_SetTipTextW (STATUS_INFO *infoPtr, INT id, LPWSTR text) ...@@ -828,7 +828,7 @@ STATUSBAR_SetTipTextW (STATUS_INFO *infoPtr, INT id, LPWSTR text)
} }
inline static LRESULT static inline LRESULT
STATUSBAR_SetUnicodeFormat (STATUS_INFO *infoPtr, BOOL bUnicode) STATUSBAR_SetUnicodeFormat (STATUS_INFO *infoPtr, BOOL bUnicode)
{ {
BOOL bOld = infoPtr->bUnicode; BOOL bOld = infoPtr->bUnicode;
......
...@@ -256,7 +256,7 @@ static void TOOLBAR_TooltipSetRect(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button); ...@@ -256,7 +256,7 @@ static void TOOLBAR_TooltipSetRect(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button);
static LRESULT static LRESULT
TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam);
inline static int default_top_margin(TOOLBAR_INFO *infoPtr) static inline int default_top_margin(TOOLBAR_INFO *infoPtr)
{ {
return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER);
} }
...@@ -3519,7 +3519,7 @@ TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -3519,7 +3519,7 @@ TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLBAR_GetExtendedStyle (HWND hwnd) TOOLBAR_GetExtendedStyle (HWND hwnd)
{ {
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
...@@ -3739,7 +3739,7 @@ TOOLBAR_GetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -3739,7 +3739,7 @@ TOOLBAR_GetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLBAR_GetVersion (HWND hwnd) TOOLBAR_GetVersion (HWND hwnd)
{ {
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
...@@ -3774,7 +3774,7 @@ TOOLBAR_HideButton (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -3774,7 +3774,7 @@ TOOLBAR_HideButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLBAR_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
return TOOLBAR_InternalHitTest (hwnd, (LPPOINT)lParam); return TOOLBAR_InternalHitTest (hwnd, (LPPOINT)lParam);
...@@ -4045,7 +4045,7 @@ TOOLBAR_MarkButton (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -4045,7 +4045,7 @@ TOOLBAR_MarkButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* fixes up an index of a button affected by a move */ /* fixes up an index of a button affected by a move */
inline static void TOOLBAR_MoveFixupIndex(INT* pIndex, INT nIndex, INT nMoveIndex, BOOL bMoveUp) static inline void TOOLBAR_MoveFixupIndex(INT* pIndex, INT nIndex, INT nMoveIndex, BOOL bMoveUp)
{ {
if (bMoveUp) if (bMoveUp)
{ {
...@@ -5058,7 +5058,7 @@ TOOLBAR_SetStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -5058,7 +5058,7 @@ TOOLBAR_SetStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLBAR_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
...@@ -6078,7 +6078,7 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -6078,7 +6078,7 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLBAR_NCActivate (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_NCActivate (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
/* if (wndPtr->dwStyle & CCS_NODIVIDER) */ /* if (wndPtr->dwStyle & CCS_NODIVIDER) */
...@@ -6088,7 +6088,7 @@ TOOLBAR_NCActivate (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -6088,7 +6088,7 @@ TOOLBAR_NCActivate (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLBAR_NCCalcSize (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_NCCalcSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
if (!(GetWindowLongW(hwnd, GWL_STYLE) & CCS_NODIVIDER)) if (!(GetWindowLongW(hwnd, GWL_STYLE) & CCS_NODIVIDER))
...@@ -6336,7 +6336,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm ...@@ -6336,7 +6336,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
} }
inline static LRESULT static inline LRESULT
TOOLBAR_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
......
...@@ -174,7 +174,7 @@ static LRESULT CALLBACK ...@@ -174,7 +174,7 @@ static LRESULT CALLBACK
TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef);
inline static UINT_PTR static inline UINT_PTR
TOOLTIPS_GetTitleIconIndex(HICON hIcon) TOOLTIPS_GetTitleIconIndex(HICON hIcon)
{ {
UINT i; UINT i;
...@@ -1484,7 +1484,7 @@ TOOLTIPS_GetMargin (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1484,7 +1484,7 @@ TOOLTIPS_GetMargin (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_GetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_GetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1540,7 +1540,7 @@ TOOLTIPS_GetTextW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1540,7 +1540,7 @@ TOOLTIPS_GetTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_GetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_GetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1548,7 +1548,7 @@ TOOLTIPS_GetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1548,7 +1548,7 @@ TOOLTIPS_GetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_GetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_GetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1556,7 +1556,7 @@ TOOLTIPS_GetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1556,7 +1556,7 @@ TOOLTIPS_GetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_GetToolCount (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_GetToolCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1756,7 +1756,7 @@ TOOLTIPS_NewToolRectW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1756,7 +1756,7 @@ TOOLTIPS_NewToolRectW (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_Pop (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_Pop (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1889,7 +1889,7 @@ TOOLTIPS_SetMargin (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1889,7 +1889,7 @@ TOOLTIPS_SetMargin (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_SetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_SetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1901,7 +1901,7 @@ TOOLTIPS_SetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1901,7 +1901,7 @@ TOOLTIPS_SetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_SetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_SetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
...@@ -1912,7 +1912,7 @@ TOOLTIPS_SetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1912,7 +1912,7 @@ TOOLTIPS_SetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
} }
inline static LRESULT static inline LRESULT
TOOLTIPS_SetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLTIPS_SetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
......
...@@ -237,7 +237,7 @@ TRACKBAR_GetAutoPageDirection (TRACKBAR_INFO *infoPtr, POINT clickPoint) ...@@ -237,7 +237,7 @@ TRACKBAR_GetAutoPageDirection (TRACKBAR_INFO *infoPtr, POINT clickPoint)
return 0; return 0;
} }
inline static void static inline void
TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr) TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
{ {
if (infoPtr->lPos == infoPtr->lRangeMax) return; if (infoPtr->lPos == infoPtr->lRangeMax) return;
...@@ -249,7 +249,7 @@ TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr) ...@@ -249,7 +249,7 @@ TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
} }
inline static void static inline void
TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr) TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
{ {
if (infoPtr->lPos == infoPtr->lRangeMin) return; if (infoPtr->lPos == infoPtr->lRangeMin) return;
...@@ -260,7 +260,7 @@ TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr) ...@@ -260,7 +260,7 @@ TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
notify_with_scroll (infoPtr, TB_PAGEUP); notify_with_scroll (infoPtr, TB_PAGEUP);
} }
inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) static inline void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
{ {
if (infoPtr->lPos == infoPtr->lRangeMin) return; if (infoPtr->lPos == infoPtr->lRangeMin) return;
infoPtr->lPos -= infoPtr->lLineSize; infoPtr->lPos -= infoPtr->lLineSize;
...@@ -269,7 +269,7 @@ inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) ...@@ -269,7 +269,7 @@ inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
notify_with_scroll (infoPtr, TB_LINEUP); notify_with_scroll (infoPtr, TB_LINEUP);
} }
inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) static inline void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
{ {
if (infoPtr->lPos == infoPtr->lRangeMax) return; if (infoPtr->lPos == infoPtr->lRangeMax) return;
infoPtr->lPos += infoPtr->lLineSize; infoPtr->lPos += infoPtr->lLineSize;
...@@ -374,7 +374,7 @@ TRACKBAR_CalcThumb (TRACKBAR_INFO *infoPtr, LONG lPos, RECT *thumb) ...@@ -374,7 +374,7 @@ TRACKBAR_CalcThumb (TRACKBAR_INFO *infoPtr, LONG lPos, RECT *thumb)
} }
} }
inline static void static inline void
TRACKBAR_UpdateThumb (TRACKBAR_INFO *infoPtr) TRACKBAR_UpdateThumb (TRACKBAR_INFO *infoPtr)
{ {
TRACKBAR_CalcThumb(infoPtr, infoPtr->lPos, &infoPtr->rcThumb); TRACKBAR_CalcThumb(infoPtr, infoPtr->lPos, &infoPtr->rcThumb);
...@@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumbMove (TRACKBAR_INFO *infoPtr, LONG oldPos, LONG newPos) ...@@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumbMove (TRACKBAR_INFO *infoPtr, LONG oldPos, LONG newPos)
TRACKBAR_InvalidateThumb (infoPtr, newPos); TRACKBAR_InvalidateThumb (infoPtr, newPos);
} }
inline static BOOL static inline BOOL
TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr) TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr)
{ {
return infoPtr->lSelMin != infoPtr->lSelMax; return infoPtr->lSelMin != infoPtr->lSelMax;
...@@ -757,7 +757,7 @@ TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) ...@@ -757,7 +757,7 @@ TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle)
} }
inline static void static inline void
TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow)
{ {
TTTOOLINFOW ti; TTTOOLINFOW ti;
...@@ -1022,7 +1022,7 @@ TRACKBAR_ClearTics (TRACKBAR_INFO *infoPtr, BOOL fRedraw) ...@@ -1022,7 +1022,7 @@ TRACKBAR_ClearTics (TRACKBAR_INFO *infoPtr, BOOL fRedraw)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
{ {
if (lprc == NULL) return 0; if (lprc == NULL) return 0;
...@@ -1036,7 +1036,7 @@ TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) ...@@ -1036,7 +1036,7 @@ TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
} }
inline static LONG static inline LONG
TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr)
{ {
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS)
...@@ -1061,7 +1061,7 @@ static int comp_tics(const void *ap, const void *bp) ...@@ -1061,7 +1061,7 @@ static int comp_tics(const void *ap, const void *bp)
} }
inline static LONG static inline LONG
TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
{ {
if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics) if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics)
...@@ -1072,7 +1072,7 @@ TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) ...@@ -1072,7 +1072,7 @@ TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
} }
inline static LONG static inline LONG
TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic) TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic)
{ {
LONG range, width, pos, tic; LONG range, width, pos, tic;
...@@ -1114,7 +1114,7 @@ TRACKBAR_SetBuddy (TRACKBAR_INFO *infoPtr, BOOL fLocation, HWND hwndBuddy) ...@@ -1114,7 +1114,7 @@ TRACKBAR_SetBuddy (TRACKBAR_INFO *infoPtr, BOOL fLocation, HWND hwndBuddy)
} }
inline static LONG static inline LONG
TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
{ {
LONG lTemp = infoPtr->lLineSize; LONG lTemp = infoPtr->lLineSize;
...@@ -1125,7 +1125,7 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) ...@@ -1125,7 +1125,7 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
} }
inline static LONG static inline LONG
TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
{ {
LONG lTemp = infoPtr->lPageSize; LONG lTemp = infoPtr->lPageSize;
...@@ -1136,7 +1136,7 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) ...@@ -1136,7 +1136,7 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
{ {
LONG oldPos = infoPtr->lPos; LONG oldPos = infoPtr->lPos;
...@@ -1155,7 +1155,7 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) ...@@ -1155,7 +1155,7 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
{ {
infoPtr->lRangeMin = (SHORT)LOWORD(lRange); infoPtr->lRangeMin = (SHORT)LOWORD(lRange);
...@@ -1180,7 +1180,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) ...@@ -1180,7 +1180,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax)
{ {
infoPtr->lRangeMax = lMax; infoPtr->lRangeMax = lMax;
...@@ -1198,7 +1198,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) ...@@ -1198,7 +1198,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin)
{ {
infoPtr->lRangeMin = lMin; infoPtr->lRangeMin = lMin;
...@@ -1216,7 +1216,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) ...@@ -1216,7 +1216,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
{ {
if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){ if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){
...@@ -1240,7 +1240,7 @@ TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) ...@@ -1240,7 +1240,7 @@ TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
{ {
if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){ if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){
...@@ -1260,7 +1260,7 @@ TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) ...@@ -1260,7 +1260,7 @@ TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart)
{ {
if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){ if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){
...@@ -1280,7 +1280,7 @@ TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) ...@@ -1280,7 +1280,7 @@ TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
{ {
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) {
...@@ -1293,7 +1293,7 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) ...@@ -1293,7 +1293,7 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
{ {
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS)
...@@ -1320,7 +1320,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) ...@@ -1320,7 +1320,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
{ {
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) {
...@@ -1333,7 +1333,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) ...@@ -1333,7 +1333,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
} }
inline static INT static inline INT
TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation) TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
{ {
INT fTemp = infoPtr->fLocation; INT fTemp = infoPtr->fLocation;
...@@ -1344,7 +1344,7 @@ TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation) ...@@ -1344,7 +1344,7 @@ TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
} }
inline static LRESULT static inline LRESULT
TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT) TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
{ {
infoPtr->hwndToolTip = hwndTT; infoPtr->hwndToolTip = hwndTT;
...@@ -1353,7 +1353,7 @@ TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT) ...@@ -1353,7 +1353,7 @@ TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
} }
inline static BOOL static inline BOOL
TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode)
{ {
BOOL bTemp = infoPtr->bUnicode; BOOL bTemp = infoPtr->bUnicode;
...@@ -1712,7 +1712,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) ...@@ -1712,7 +1712,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
} }
inline static BOOL static inline BOOL
TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
{ {
switch (nVirtKey) { switch (nVirtKey) {
......
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