From 951b1119d4c7487364bee4c5124b36453e00130d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 2 Oct 2017 10:38:55 -0400 Subject: More define cleanup Remove unused defines; Move to .cpp files where possible; Fixup values. Change-Id: I88cd5deb04b14ab8e9f8097a695c3d0b52d64b4c Reviewed-on: https://pdfium-review.googlesource.com/15130 Reviewed-by: Henrique Nakashima Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fwl/cfwl_form.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fwl/cfwl_form.cpp') diff --git a/xfa/fwl/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp index 9042e3bc74..d1c178322c 100644 --- a/xfa/fwl/cfwl_form.cpp +++ b/xfa/fwl/cfwl_form.cpp @@ -83,7 +83,7 @@ void CFWL_Form::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) { IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; DrawBackground(pGraphics, pTheme); -#ifdef FWL_UseMacSystemBorder +#if _FX_OS_ == _FX_OS_MACOSX_ return; #endif CFWL_ThemeBackground param; @@ -177,7 +177,7 @@ void CFWL_Form::SetWorkAreaRect() { void CFWL_Form::Layout() { m_rtRelative = GetRelativeRect(); -#ifndef FWL_UseMacSystemBorder +#if _FX_OS_ == _FX_OS_MACOSX_ IFWL_ThemeProvider* theme = GetAvailableTheme(); m_fCXBorder = theme ? theme->GetCXBorderSize() : 0.0f; m_fCYBorder = theme ? theme->GetCYBorderSize() : 0.0f; @@ -211,7 +211,7 @@ void CFWL_Form::UnRegisterForm() { } void CFWL_Form::OnProcessMessage(CFWL_Message* pMessage) { -#ifndef FWL_UseMacSystemBorder +#if _FX_OS_ == _FX_OS_MACOSX_ if (!pMessage) return; @@ -233,7 +233,7 @@ void CFWL_Form::OnProcessMessage(CFWL_Message* pMessage) { default: break; } -#endif // FWL_UseMacSystemBorder +#endif // _FX_OS_ == _FX_OS_MACOSX_ } void CFWL_Form::OnDrawWidget(CXFA_Graphics* pGraphics, -- cgit v1.2.3