Refactor fxge/fx_apple and fx_win header files

core/fxge/win32/cfx_windowsdib.h

Index: core/fxge/win32/cfx_windowsdib.h
diff --git a/core/fxge/include/fx_ge_win32.h b/core/fxge/win32/cfx_windowsdib.h
similarity index 55%
rename from core/fxge/include/fx_ge_win32.h
rename to core/fxge/win32/cfx_windowsdib.h
index e53ee2e0f787d91ed7fe30a9db5b2465e1f7f031..484a04e0ea9002bd9f5ce933e64b681aecdd7f15 100644
--- a/core/fxge/include/fx_ge_win32.h
+++ b/core/fxge/win32/cfx_windowsdib.h
@@ -4,9 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
-#define CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
-
+#ifndef CORE_FXGE_WIN32_CFX_WINDOWSDIB_H_
+#define CORE_FXGE_WIN32_CFX_WINDOWSDIB_H_
 #ifdef _WIN32
 #ifndef _WINDOWS_
 #include <windows.h>
@@ -14,18 +13,6 @@
 #define WINDIB_OPEN_MEMORY 0x1
 #define WINDIB_OPEN_PATHNAME 0x2
 
-class IFX_RenderDeviceDriver;
-
-#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
-typedef void (*PDFiumEnsureTypefaceCharactersAccessible)(const LOGFONT* font,
-                                                         const wchar_t* text,
-                                                         size_t text_length);
-
-extern bool g_pdfium_print_text_with_gdi;
-extern PDFiumEnsureTypefaceCharactersAccessible
-    g_pdfium_typeface_accessible_func;
-#endif
-
 typedef struct WINDIB_Open_Args_ {
   int flags;
 
@@ -60,30 +47,6 @@ class CFX_WindowsDIB : public CFX_DIBitmap {
   HBITMAP m_hOldBitmap;
 };
 
-class CFX_WindowsDevice : public CFX_RenderDevice {
- public:
-  static IFX_RenderDeviceDriver* CreateDriver(HDC hDC);
-
-  explicit CFX_WindowsDevice(HDC hDC);
-  ~CFX_WindowsDevice() override;
-
-  HDC GetDC() const;
-};
-
-class CFX_WinBitmapDevice : public CFX_RenderDevice {
- public:
-  CFX_WinBitmapDevice(int width, int height, FXDIB_Format format);
-  ~CFX_WinBitmapDevice() override;
-
-  HDC GetDC() { return m_hDC; }
-
- protected:
-  HBITMAP m_hBitmap;
-
-  HBITMAP m_hOldBitmap;
-
-  HDC m_hDC;
-};
 #endif

[Lei Zhang, 2016/07/29 21:12:27]

Ditto

[npm_g, 2016/07/29 21:26:07]

Done.

 
-#endif  // CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
+#endif  // CORE_FXGE_WIN32_CFX_WINDOWSDIB_H_