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

Merge branch 'd2d-gcc-fixes'

Browse Source 
Fix compilation errors and warnings in wxD2DRenderer code with g++.

Closes #16625.
This commit is contained in:
Vadim Zeitlin
2015-09-29 00:55:40 +02:00
parent ccc94f46e0 d1dfcd1497
commit 97f260bcea
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/graphicsd2d.cpp
View File

@@ -46,6 +46,8 @@
#include "wx/graphics.h" #include "wx/graphics.h"
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/dynlib.h" #include "wx/dynlib.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/module.h" #include "wx/module.h"
@@ -53,6 +55,7 @@
#include "wx/private/graphics.h" #include "wx/private/graphics.h"
#include "wx/stack.h" #include "wx/stack.h"
#include "wx/sharedptr.h" #include "wx/sharedptr.h"
#include "wx/window.h"
// This must be the last header included to only affect the DEFINE_GUID() // This must be the last header included to only affect the DEFINE_GUID()
// occurrences below but not any GUIDs declared in the standard files included // occurrences below but not any GUIDs declared in the standard files included
@@ -311,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() {};
}; };
@@ -1352,6 +1355,8 @@ public:
{ {
} }
virtual ~wxHatchBitmapSource() {}
HRESULT STDMETHODCALLTYPE GetSize(__RPC__out UINT *width, __RPC__out UINT *height) wxOVERRIDE HRESULT STDMETHODCALLTYPE GetSize(__RPC__out UINT *width, __RPC__out UINT *height) wxOVERRIDE
{ {
if (width != NULL) *width = 8; if (width != NULL) *width = 8;
@@ -1372,10 +1377,9 @@ public:
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE CopyPalette(__RPC__in_opt IWICPalette *palette) wxOVERRIDE HRESULT STDMETHODCALLTYPE CopyPalette(__RPC__in_opt IWICPalette* WXUNUSED(palette)) wxOVERRIDE
{ {
palette = NULL; return WINCODEC_ERR_PALETTEUNAVAILABLE;
return S_OK;
} }
HRESULT STDMETHODCALLTYPE CopyPixels( HRESULT STDMETHODCALLTYPE CopyPixels(
@@ -1449,7 +1453,7 @@ public:
ULONG STDMETHODCALLTYPE Release(void) wxOVERRIDE ULONG STDMETHODCALLTYPE Release(void) wxOVERRIDE
{ {
wxCHECK2_MSG(m_refCount > 0, 0, "Unbalanced number of calls to Release"); wxCHECK_MSG(m_refCount > 0, 0, "Unbalanced number of calls to Release");
ULONG refCount = InterlockedDecrement(&m_refCount); ULONG refCount = InterlockedDecrement(&m_refCount);
if (m_refCount == 0) if (m_refCount == 0)
@@ -2794,7 +2798,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;
@@ -2803,7 +2807,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;
@@ -3698,6 +3702,12 @@ void wxD2DRenderer::GetVersion(int* major, int* minor, int* micro) const
case wxDirect2D::wxD2D_VERSION_1_1: case wxDirect2D::wxD2D_VERSION_1_1:
*minor = 1; *minor = 1;
break; break;
case wxDirect2D::wxD2D_VERSION_NONE:
// This is not supposed to happen, but we handle this value in
// the switch to ensure that we'll get warnings if any new
// values, not handled here, are added to the enum later.
*minor = -1;
break;
} }
} }