Bug 513162 - Fix for MOZ_WINSDK_TARGETVER < MOZ_NTDDI_LONGHORN r=jmathies

This commit is contained in:
Jacek Caban 2010-06-28 11:41:01 +02:00
parent d7da9f3152
commit 3470e16e4e
2 changed files with 5 additions and 1 deletions

View File

@ -187,13 +187,15 @@ public:
static DwmSetWindowAttributeProc dwmSetWindowAttributePtr;
static DwmInvalidateIconicBitmapsProc dwmInvalidateIconicBitmapsPtr;
static DwmDefWindowProcProc dwmDwmDefWindowProcPtr;
#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
static PRBool CheckForCompositor() {
BOOL compositionIsEnabled = FALSE;
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
if(dwmIsCompositionEnabledPtr)
dwmIsCompositionEnabledPtr(&compositionIsEnabled);
#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
return sHaveCompositor = (compositionIsEnabled != 0);
}
#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
};
#endif // __UXThemeData_h__

View File

@ -4399,6 +4399,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
static PRBool getWheelInfo = PR_TRUE;
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
// Glass hit testing w/custom transparent margins
LRESULT dwmHitResult;
if (mCustomNonClient &&
@ -4408,6 +4409,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
*aRetValue = dwmHitResult;
return PR_TRUE;
}
#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
switch (msg) {
#ifndef WINCE