X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b39dbf34b887a73c525da903d8599f4f6b7eb8f9..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/dragimag.cpp

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index a1dfb5b4b9..de1e7b088e 100644
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dragimag.h"
 #endif
 
@@ -117,6 +117,9 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
     m_hImageList = 0;
 
     UINT flags = 0 ;
+#ifdef __WXWINCE__
+    flags = ILC_COLOR;
+#else
     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)
@@ -127,6 +130,7 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;
+#endif
 
     bool mask = (image.GetMask() != 0);
 
@@ -170,6 +174,9 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
     m_hImageList = 0;
 
     UINT flags = 0 ;
+#ifdef __WXWINCE__
+    flags = ILC_COLOR;
+#else
     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)
@@ -180,6 +187,7 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;
+#endif
     bool mask = TRUE;
     if ( mask )
         flags |= ILC_MASK;
@@ -237,15 +245,19 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
     return Create(wxBitmap(image), cursor);
 }
 
+#if wxUSE_TREECTRL
 // Create a drag image for the given tree control item
 bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
-    m_hImageList = (WXHIMAGELIST) TreeView_CreateDragImage((HWND) treeCtrl.GetHWND(), (HTREEITEM) (WXHTREEITEM) id);
-    return TRUE;
+    m_hImageList = (WXHIMAGELIST)
+        TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem);
+    return m_hImageList != 0;
 }
+#endif
 
+#if wxUSE_LISTCTRL
 // Create a drag image for the given list control item
 bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
 {
@@ -256,6 +268,7 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
     m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt);
     return TRUE;
 }
+#endif
 
 // Begin drag
 bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect)