projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relinquish the mouse capture when a dialog is about to be made modal to ensure that...
[wxWidgets.git]
/
include
/
wx
/
generic
/
dragimgg.h
diff --git
a/include/wx/generic/dragimgg.h
b/include/wx/generic/dragimgg.h
index 18b984d6d74d8cc405385c31a58db3d45f3da243..583cc0a182a0822fa7178d0f06b10e2e4cbbdaa3 100644
(file)
--- a/
include/wx/generic/dragimgg.h
+++ b/
include/wx/generic/dragimgg.h
@@
-157,13
+157,14
@@
public:
// Attributes
////////////////////////////////////////////////////////////////////////////
// Attributes
////////////////////////////////////////////////////////////////////////////
+#ifdef wxHAS_NATIVE_OVERLAY
+ // backing store is not used when native overlays are
+ void SetBackingBitmap(wxBitmap* WXUNUSED(bitmap)) { }
+#else
// For efficiency, tell wxGenericDragImage to use a bitmap that's already
// created (e.g. from last drag)
// For efficiency, tell wxGenericDragImage to use a bitmap that's already
// created (e.g. from last drag)
- void SetBackingBitmap(wxBitmap* bitmap) {
-#if !wxHAS_NATIVE_OVERLAY
- m_pBackingBitmap = bitmap;
-#endif
- }
+ void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; }
+#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY
// Operations
////////////////////////////////////////////////////////////////////////////
// Operations
////////////////////////////////////////////////////////////////////////////
@@
-247,7
+248,7
@@
protected:
wxWindow* m_window;
wxDC* m_windowDC;
wxWindow* m_window;
wxDC* m_windowDC;
-#if wxHAS_NATIVE_OVERLAY
+#if
def
wxHAS_NATIVE_OVERLAY
wxOverlay m_overlay;
wxDCOverlay* m_dcOverlay;
#else
wxOverlay m_overlay;
wxDCOverlay* m_dcOverlay;
#else