Fix remaining -Wdelete-non-virtual-dtor violations on Windows.
[pdfium.git] / core / src / fxge / win32 / dwrite_int.h
index 1f0770d..2eecc7c 100644 (file)
@@ -1,59 +1,59 @@
-// Copyright 2014 PDFium Authors. All rights reserved.\r
-// Use of this source code is governed by a BSD-style license that can be\r
-// found in the LICENSE file.\r
\r
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com\r
-\r
-#ifndef _FX_DIRECT_WRITE_\r
-#define _FX_DIRECT_WRITE_\r
-#ifndef DECLSPEC_UUID\r
-#if (_MSC_VER >= 1100) && defined (__cplusplus)\r
-#define DECLSPEC_UUID(x)    __declspec(uuid(x))\r
-#else\r
-#define DECLSPEC_UUID(x)\r
-#endif\r
-#endif\r
-#ifndef DECLSPEC_NOVTABLE\r
-#if (_MSC_VER >= 1100) && defined(__cplusplus)\r
-#define DECLSPEC_NOVTABLE   __declspec(novtable)\r
-#else\r
-#define DECLSPEC_NOVTABLE\r
-#endif\r
-#endif\r
-#if(WINVER < 0x0500)\r
-#ifndef _MAC\r
-DECLARE_HANDLE(HMONITOR);\r
-#endif\r
-#endif\r
-class CDWriteExt\r
-{\r
-public:\r
-    CDWriteExt();\r
-    ~CDWriteExt();\r
-\r
-    void                       Load();\r
-    void            Unload();\r
-\r
-    FX_BOOL                    IsAvailable()\r
-    {\r
-        return m_pDWriteFactory != NULL;\r
-    }\r
-\r
-    void*                      DwCreateFontFaceFromStream(FX_LPBYTE pData, FX_DWORD size, int simulation_style);\r
-    FX_BOOL         DwCreateRenderingTarget(CFX_DIBitmap* pSrc, void** renderTarget);\r
-    void            DwDeleteRenderingTarget(void* renderTarget);\r
-    FX_BOOL                    DwRendingString(void* renderTarget, CFX_ClipRgn* pClipRgn, FX_RECT& stringRect, CFX_AffineMatrix* pMatrix,\r
-                                    void *font, FX_FLOAT font_size, FX_ARGB text_color,\r
-                                    int glyph_count, unsigned short* glyph_indices,\r
-                                    FX_FLOAT baselineOriginX, FX_FLOAT baselineOriginY,\r
-                                    void* glyph_offsets,\r
-                                    FX_FLOAT* glyph_advances);\r
-    void                       DwDeleteFont(void* pFont);\r
-\r
-protected:\r
-    void*                      m_hModule;\r
-    void*                      m_pDWriteFactory;\r
-    void*                  m_pDwFontContext;\r
-    void*              m_pDwTextRenderer;\r
-};\r
-#endif\r
+// Copyright 2014 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef _FX_DIRECT_WRITE_
+#define _FX_DIRECT_WRITE_
+#ifndef DECLSPEC_UUID
+#if (_MSC_VER >= 1100) && defined (__cplusplus)
+#define DECLSPEC_UUID(x)    __declspec(uuid(x))
+#else
+#define DECLSPEC_UUID(x)
+#endif
+#endif
+#ifndef DECLSPEC_NOVTABLE
+#if (_MSC_VER >= 1100) && defined(__cplusplus)
+#define DECLSPEC_NOVTABLE   __declspec(novtable)
+#else
+#define DECLSPEC_NOVTABLE
+#endif
+#endif
+#if(WINVER < 0x0500)
+#ifndef _MAC
+DECLARE_HANDLE(HMONITOR);
+#endif
+#endif
+class CDWriteExt
+{
+public:
+    CDWriteExt();
+    ~CDWriteExt();
+
+    void                       Load();
+    void            Unload();
+
+    FX_BOOL                    IsAvailable()
+    {
+        return m_pDWriteFactory != NULL;
+    }
+
+    void*                      DwCreateFontFaceFromStream(FX_LPBYTE pData, FX_DWORD size, int simulation_style);
+    FX_BOOL         DwCreateRenderingTarget(CFX_DIBitmap* pSrc, void** renderTarget);
+    void            DwDeleteRenderingTarget(void* renderTarget);
+    FX_BOOL                    DwRendingString(void* renderTarget, CFX_ClipRgn* pClipRgn, FX_RECT& stringRect, CFX_AffineMatrix* pMatrix,
+                                    void *font, FX_FLOAT font_size, FX_ARGB text_color,
+                                    int glyph_count, unsigned short* glyph_indices,
+                                    FX_FLOAT baselineOriginX, FX_FLOAT baselineOriginY,
+                                    void* glyph_offsets,
+                                    FX_FLOAT* glyph_advances);
+    void                       DwDeleteFont(void* pFont);
+
+protected:
+    void*                      m_hModule;
+    void*                      m_pDWriteFactory;
+    void*                  m_pDwFontContext;
+    void*              m_pDwTextRenderer;
+};
+#endif