Fix dragimag sample compilation with modern compiler under MSW
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:
parent
155885a3dd
commit
392e119bbe
2 changed files with 4 additions and 1 deletions
|
|
@ -488,6 +488,7 @@ bool DragShape::Draw(wxDC& dc, bool highlight)
|
|||
return false;
|
||||
}
|
||||
|
||||
#if wxUSE_GENERIC_DRAGIMAGE
|
||||
// MyDragImage
|
||||
|
||||
// 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);
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -177,10 +177,12 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
#if wxUSE_GENERIC_DRAGIMAGE
|
||||
// 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.
|
||||
virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, const wxRect& sourceRect,
|
||||
const wxRect& destRect) const wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
MyCanvas* m_canvas;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue