Some minor corrections (typos, return value handling).

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index b56c1ef18ad5520811fe2c29692d8dddc1ddfd8f..24e30dcc8941ff85876eea248566cc7cd1146c78 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,8 +26,6 @@
 
 #if wxUSE_DRAGIMAGE
 
 
 #if wxUSE_DRAGIMAGE
 

-#if defined(__WIN95__)
-

 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/setup.h"
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/setup.h"


@@ -55,9 +49,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


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

-#endif
-    // __WIN95__
-

 #endif // wxUSE_DRAGIMAGE
 #endif // wxUSE_DRAGIMAGE