| Index: core/include/fxge/fx_ge.h
|
| diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h
|
| index ef3c8f665eca18920493bbb325f30f7c1904255a..4cfe622007ef607bf6a7c83b7f1d36ae70dbc35c 100644
|
| --- a/core/include/fxge/fx_ge.h
|
| +++ b/core/include/fxge/fx_ge.h
|
| @@ -10,17 +10,12 @@
|
| #include "fx_dib.h"
|
| #include "fx_font.h"
|
|
|
| -class CFX_ClipRgn;
|
| -class CFX_PathData;
|
| -class CFX_GraphStateData;
|
| class CFX_Font;
|
| class CFX_FontMgr;
|
| class CFX_FontCache;
|
| class CFX_FaceCache;
|
| -class CFX_RenderDevice;
|
| class IFX_RenderDeviceDriver;
|
| class CCodec_ModuleMgr;
|
| -class IFXG_PaintModuleMgr;
|
|
|
| class CFX_GEModule {
|
| public:
|
| @@ -435,8 +430,7 @@ class CFX_RenderDevice {
|
| class CFX_FxgeDevice : public CFX_RenderDevice {
|
| public:
|
| CFX_FxgeDevice();
|
| -
|
| - ~CFX_FxgeDevice();
|
| + ~CFX_FxgeDevice() override;
|
|
|
| FX_BOOL Attach(CFX_DIBitmap* pBitmap,
|
| int dither_bits = 0,
|
| @@ -456,8 +450,7 @@ class CFX_FxgeDevice : public CFX_RenderDevice {
|
| class CFX_SkiaDevice : public CFX_RenderDevice {
|
| public:
|
| CFX_SkiaDevice();
|
| -
|
| - ~CFX_SkiaDevice();
|
| + ~CFX_SkiaDevice() override;
|
|
|
| FX_BOOL Attach(CFX_DIBitmap* pBitmap,
|
| int dither_bits = 0,
|
| @@ -474,6 +467,7 @@ class CFX_SkiaDevice : public CFX_RenderDevice {
|
| protected:
|
| FX_BOOL m_bOwnedBitmap;
|
| };
|
| +
|
| class IFX_RenderDeviceDriver {
|
| public:
|
| static IFX_RenderDeviceDriver* CreateFxgeDriver(
|
| @@ -613,14 +607,16 @@ class IFX_RenderDeviceDriver {
|
|
|
| virtual void ClearDriver() {}
|
| };
|
| +
|
| class IFX_PSOutput {
|
| public:
|
| virtual void Release() = 0;
|
| virtual void OutputPS(const FX_CHAR* string, int len) = 0;
|
|
|
| protected:
|
| - ~IFX_PSOutput() {}
|
| + virtual ~IFX_PSOutput() {}
|
| };
|
| +
|
| class CPSFont;
|
| class CFX_PSRenderer {
|
| public:
|
|
|