Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes for C++98 compilers in D2D graphics code

Browse Source 
Don't use ">>" token in nested templates, this is not allowed in C++98 but
only C++11.

Also don't use "= NULL" on pure virtual functions.

See #16625.
This commit is contained in:
Vadim Zeitlin
2015-09-29 00:44:08 +02:00
parent 827e3d455a
commit db415ad04d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/graphicsd2d.cpp
View File

@@ -314,10 +314,10 @@ class wxD2DResourceManager;
class wxD2DManagedObject class wxD2DManagedObject
{ {
public: public:
virtual void Bind(wxD2DResourceManager* manager) = NULL; virtual void Bind(wxD2DResourceManager* manager) = 0;
virtual void UnBind() = NULL; virtual void UnBind() = 0;
virtual bool IsBound() = NULL; virtual bool IsBound() = 0;
virtual wxD2DResourceManager* GetManager() = NULL; virtual wxD2DResourceManager* GetManager() = 0;
virtual ~wxD2DManagedObject() {}; virtual ~wxD2DManagedObject() {};
}; };
@@ -2797,7 +2797,7 @@ private:
// A ID2D1DrawingStateBlock represents the drawing state of a render target: // A ID2D1DrawingStateBlock represents the drawing state of a render target:
// the anti aliasing mode, transform, tags, and text-rendering options. // the anti aliasing mode, transform, tags, and text-rendering options.
// The context owns these pointers and is responsible for releasing them. // The context owns these pointers and is responsible for releasing them.
wxStack<wxCOMPtr<ID2D1DrawingStateBlock>> m_stateStack; wxStack<wxCOMPtr<ID2D1DrawingStateBlock> > m_stateStack;
ClipMode m_clipMode; ClipMode m_clipMode;
@@ -2806,7 +2806,7 @@ private:
// A direct2d layer is a device-dependent resource. // A direct2d layer is a device-dependent resource.
wxCOMPtr<ID2D1Layer> m_clipLayer; wxCOMPtr<ID2D1Layer> m_clipLayer;
wxStack<wxCOMPtr<ID2D1Layer>> m_layers; wxStack<wxCOMPtr<ID2D1Layer> > m_layers;
ID2D1RenderTarget* m_cachedRenderTarget; ID2D1RenderTarget* m_cachedRenderTarget;