From bf6c2a4873f8cc12ad910fb904218a78087a3735 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 8 Jun 2015 17:25:42 -0700 Subject: Remove more cruft from fx_system.h - include system headers first and alphabetize. - remove unsupported FX_WIN32_MOBILE symbol. - actually define a FX_WIN64 symbol and make consistent. - use final/override, not FX_FINAL. - let stdint.h resolve FX_WORDSIZE concerns. - unused FX_ERR and FX_SUCCESS() macros. - unused FX_LSB_FIRST macro. - outline FX type deprecation plan. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1169963003 --- core/src/fxge/win32/fx_win32_dwrite.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/fxge/win32/fx_win32_dwrite.cpp') diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 7a17c4ad09..0849583384 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxge/fx_ge.h" -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ +#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include "../../../include/fxge/fx_ge_win32.h" #include "dwrite_int.h" #include @@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject) } return newObject; } -class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream +class CDwFontFileStream final : public IDWriteFontFileStream { public: explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize); @@ -46,7 +46,7 @@ private: void const* resourcePtr_; DWORD resourceSize_; }; -class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader +class CDwFontFileLoader final : public IDWriteFontFileLoader { public: virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject); -- cgit v1.2.3