X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..4ac483ebb295cf318c79ae9078af06daa686f51d:/src/generic/dragimgg.cpp diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index c931955788..06912f3064 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dragimgg.cpp +// Name: src/generic/dragimgg.cpp // Purpose: Generic wxDragImage implementation // Author: Julian Smart // Modified by: @@ -28,7 +28,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/frame.h" #include "wx/dcclient.h" @@ -154,7 +153,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor) dc2.SelectObject(wxNullBitmap); -#if wxUSE_IMAGE_IN_DRAGIMAGE +#if wxUSE_IMAGE_IN_DRAGIMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) // Make the bitmap masked wxImage image = bitmap.ConvertToImage(); image.SetMaskColour(255, 255, 255);