diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src/fxge/win32/win32_int.h | |
parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'core/src/fxge/win32/win32_int.h')
-rw-r--r-- | core/src/fxge/win32/win32_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index 83595cbf8d..bc3eb878d9 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -58,7 +58,7 @@ protected: HMODULE m_GdiModule; }; #include "dwrite_int.h" -class CWin32Platform : public CFX_Object +class CWin32Platform { public: FX_BOOL m_bHalfTone; @@ -164,7 +164,7 @@ protected: int m_HorzSize, m_VertSize; FX_BOOL m_bSupportROP; }; -class CPSOutput : public IFX_PSOutput, public CFX_Object +class CPSOutput : public IFX_PSOutput { public: CPSOutput(HDC hDC); |