diff --git a/reactos/base/shell/explorer/precomp.h b/reactos/base/shell/explorer/precomp.h index de88514231b..7ed7549b6b2 100644 --- a/reactos/base/shell/explorer/precomp.h +++ b/reactos/base/shell/explorer/precomp.h @@ -56,15 +56,23 @@ extern HKEY hkExplorer; * explorer.c */ +static inline LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, -IN LONG dwStyle); +IN LONG dwStyle) +{ + return SHSetWindowBits(hWnd, GWL_STYLE, dwStyleMask, dwStyle); +} +static inline LONG SetWindowExStyle(IN HWND hWnd, IN LONG dwStyleMask, -IN LONG dwStyle); +IN LONG dwStyle) +{ + return SHSetWindowBits(hWnd, GWL_EXSTYLE, dwStyleMask, dwStyle); +} HMENU LoadPopupMenu(IN HINSTANCE hInstance, diff --git a/reactos/base/shell/explorer/util.cpp b/reactos/base/shell/explorer/util.cpp index 6bdea90833c..543df9f678f 100644 --- a/reactos/base/shell/explorer/util.cpp +++ b/reactos/base/shell/explorer/util.cpp @@ -30,50 +30,6 @@ IsSameObject(IN IUnknown *punk1, IN IUnknown *punk2) return (punk1 == punk2) ? S_OK : S_FALSE; } -LONG -SetWindowStyle(IN HWND hWnd, - IN LONG dwStyleMask, - IN LONG dwStyle) -{ - LONG PrevStyle, Style; - - ASSERT((~dwStyleMask & dwStyle) == 0); - - PrevStyle = GetWindowLong(hWnd, GWL_STYLE); - if (PrevStyle != 0 && - (PrevStyle & dwStyleMask) != dwStyle) - { - Style = PrevStyle & ~dwStyleMask; - Style |= dwStyle; - - PrevStyle = SetWindowLong(hWnd, GWL_STYLE, Style); - } - - return PrevStyle; -} - -LONG -SetWindowExStyle(IN HWND hWnd, - IN LONG dwStyleMask, - IN LONG dwStyle) -{ - LONG PrevStyle, Style; - - ASSERT((~dwStyleMask & dwStyle) == 0); - - PrevStyle = GetWindowLong(hWnd, GWL_EXSTYLE); - if (PrevStyle != 0 && - (PrevStyle & dwStyleMask) != dwStyle) - { - Style = PrevStyle & ~dwStyleMask; - Style |= dwStyle; - - PrevStyle = SetWindowLong(hWnd, GWL_EXSTYLE, Style); - } - - return PrevStyle; -} - HMENU LoadPopupMenu(IN HINSTANCE hInstance, IN LPCTSTR lpMenuName)