Since OpenThemeData() should return 0 in case theming is disabled
globally or for the application we don't need to check that when calling OpenThemeData().
This commit is contained in:
parent
4641cb8d93
commit
d219a54e80
|
@ -1320,7 +1320,6 @@ HEADER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
TEXTMETRICW tm;
|
TEXTMETRICW tm;
|
||||||
HFONT hOldFont;
|
HFONT hOldFont;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
BOOL themingActive = IsAppThemed() && IsThemeActive();
|
|
||||||
|
|
||||||
infoPtr = (HEADER_INFO *)Alloc (sizeof(HEADER_INFO));
|
infoPtr = (HEADER_INFO *)Alloc (sizeof(HEADER_INFO));
|
||||||
SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr);
|
SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr);
|
||||||
|
@ -1350,7 +1349,7 @@ HEADER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
SelectObject (hdc, hOldFont);
|
SelectObject (hdc, hOldFont);
|
||||||
ReleaseDC (0, hdc);
|
ReleaseDC (0, hdc);
|
||||||
|
|
||||||
if (themingActive) OpenThemeData(hwnd, themeClass);
|
OpenThemeData(hwnd, themeClass);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7516,7 +7516,6 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
|
||||||
LISTVIEW_INFO *infoPtr;
|
LISTVIEW_INFO *infoPtr;
|
||||||
UINT uView = lpcs->style & LVS_TYPEMASK;
|
UINT uView = lpcs->style & LVS_TYPEMASK;
|
||||||
LOGFONTW logFont;
|
LOGFONTW logFont;
|
||||||
BOOL themingActive = IsAppThemed() && IsThemeActive();
|
|
||||||
|
|
||||||
TRACE("(lpcs=%p)\n", lpcs);
|
TRACE("(lpcs=%p)\n", lpcs);
|
||||||
|
|
||||||
|
@ -7599,7 +7598,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (themingActive) OpenThemeData(hwnd, themeClass);
|
OpenThemeData(hwnd, themeClass);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue