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

Fix dragimag sample compilation with modern compiler under MSW

Browse Source 
Don't "override" UpdateBackingFromWindow() method of the base class
unless it really exists, which is only the case for the generic
wxDragImage implementation but not the native MSW one.

See https://github.com/wxWidgets/wxWidgets/pull/1671
This commit is contained in:
catalinr
2019-12-06 22:21:42 +02:00
committed by Vadim Zeitlin
parent 155885a3dd
commit 392e119bbe
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/dragimag/dragimag.cpp
View File

@@ -488,6 +488,7 @@ bool DragShape::Draw(wxDC& dc, bool highlight)
return false; return false;
} }
#if wxUSE_GENERIC_DRAGIMAGE
// MyDragImage // MyDragImage
// On some platforms, notably Mac OS X with Core Graphics, we can't blit from // On some platforms, notably Mac OS X with Core Graphics, we can't blit from
@@ -503,4 +504,4 @@ bool MyDragImage::UpdateBackingFromWindow(wxDC& WXUNUSED(windowDC), wxMemoryDC&
m_canvas->DrawShapes(destDC); m_canvas->DrawShapes(destDC);
return true; return true;
} }
#endif

2
samples/dragimag/dragimag.h
View File

@@ -177,10 +177,12 @@ public:
{ {
} }
#if wxUSE_GENERIC_DRAGIMAGE
// On some platforms, notably Mac OS X with Core Graphics, we can't blit from // On some platforms, notably Mac OS X with Core Graphics, we can't blit from
// a window, so we need to draw the background explicitly. // a window, so we need to draw the background explicitly.
virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, const wxRect& sourceRect, virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, const wxRect& sourceRect,
const wxRect& destRect) const wxOVERRIDE; const wxRect& destRect) const wxOVERRIDE;
#endif
protected: protected:
MyCanvas* m_canvas; MyCanvas* m_canvas;