fix for non precomp

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index f604cad75f9fbc1f9f82ecaff7125370d210151b..9249d8c35c19b873e0c5a8ad2a2a03a83d35072e 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:
@@ -26,11 +26,8 @@
 
 #if wxUSE_DRAGIMAGE
 
-#if defined(__WIN95__)
-
 #ifndef WX_PRECOMP
 #include <stdio.h>
-#include "wx/setup.h"
 #include "wx/window.h"
 #include "wx/dcclient.h"
 #include "wx/dcscreen.h"
@@ -51,9 +48,8 @@
 #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
@@ -212,7 +208,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
-    long w, h;
+    long w = 0, h = 0;
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
@@ -239,10 +235,14 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 
     dc2.SelectObject(wxNullBitmap);
 
+#if wxUSE_WXDIB
     // 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
@@ -453,7 +453,4 @@ bool wxDragImage::Hide()
     return ret;
 }
 
-#endif
-    // __WIN95__
-
 #endif // wxUSE_DRAGIMAGE