if (pwndData == NULL)
return NULL;
+ if (!(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
+ {
+ if (pwndData->hthemeWindow)
+ {
+ CloseThemeData(pwndData->hthemeWindow);
+ pwndData->hthemeWindow = NULL;
+ }
+ return NULL;
+ }
+
/* If the theme data was not cached, open it now */
if (!pwndData->hthemeWindow)
pwndData->hthemeWindow = OpenThemeDataEx(hWnd, L"WINDOW", OTD_NONCLIENT);
if (pwndData == NULL)
return NULL;
+ if (!(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
+ {
+ if (pwndData->hthemeScrollbar)
+ {
+ CloseThemeData(pwndData->hthemeScrollbar);
+ pwndData->hthemeScrollbar = NULL;
+ }
+ return NULL;
+ }
+
/* If the theme data was not cached, open it now */
if (!pwndData->hthemeScrollbar)
pwndData->hthemeScrollbar = OpenThemeDataEx(hWnd, L"SCROLLBAR", OTD_NONCLIENT);
if (pwndData->UpdatingRgn == TRUE)
return 0;
- if(!IsAppThemed())
+ if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
{
if(pwndData->HasThemeRgn)
{
static LRESULT CALLBACK
ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{
- if(!IsAppThemed())
+ if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
{
return g_user32ApiHook.DefWindowProcW(hWnd,
Msg,
static LRESULT CALLBACK
ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{
- if(!IsAppThemed())
+ if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
{
return g_user32ApiHook.DefWindowProcA(hWnd,
Msg,
HBRUSH* phbrush = (HBRUSH*)ret;
HTHEME hTheme;
- if (!IsAppThemed())
+ if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
break;
if (!IsThemeDialogTextureEnabled (hWnd))
BOOL ret;
/* Avoid creating a window context if it is not needed */
- if(!IsAppThemed())
+ if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
goto dodefault;
style = GetWindowLongW(hwnd, GWL_STYLE);