DeleteFunction argument should be non-const since it

[wxWidgets.git] / src / msw / dragimag.cpp

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index b56c1ef18ad5520811fe2c29692d8dddc1ddfd8f..396962f92f1b808a5621cb59690b60e74f253d93 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dragimag.cpp
+// Name:        src/msw/dragimag.cpp

 // Purpose:     wxDragImage
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDragImage
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dragimag.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,11 +26,8 @@
 
 #if wxUSE_DRAGIMAGE
 
 
 #if wxUSE_DRAGIMAGE
 

-#if defined(__WIN95__)
-

 #ifndef WX_PRECOMP
 #include <stdio.h>
 #ifndef WX_PRECOMP
 #include <stdio.h>

-#include "wx/setup.h"

 #include "wx/window.h"
 #include "wx/dcclient.h"
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 #include "wx/dcclient.h"
 #include "wx/dcscreen.h"


@@ -55,9 +48,8 @@
 #include "wx/msw/wince/missing.h"
 #endif // __WXWINCE__
 
 #include "wx/msw/wince/missing.h"
 #endif // __WXWINCE__
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-#include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 // Wine doesn't have this yet
 #ifndef ListView_CreateDragImage
 
 // Wine doesn't have this yet
 #ifndef ListView_CreateDragImage


@@ -243,10 +235,14 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 
     dc2.SelectObject(wxNullBitmap);
 
 
     dc2.SelectObject(wxNullBitmap);
 

+#if wxUSE_WXDIB

     // Make the bitmap masked
     wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
     return Create(wxBitmap(image), cursor);
     // Make the bitmap masked
     wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
     return Create(wxBitmap(image), cursor);

+#else
+    return false;
+#endif

 }
 
 #if wxUSE_TREECTRL
 }
 
 #if wxUSE_TREECTRL


@@ -457,7 +453,4 @@ bool wxDragImage::Hide()
     return ret;
 }
 
     return ret;
 }
 

-#endif
-    // __WIN95__
-

 #endif // wxUSE_DRAGIMAGE
 #endif // wxUSE_DRAGIMAGE