don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 7bb4c4def18ceb84482684bc6748bf2702892018..0789752ef0613378373fcdb9bcaaa6897cfe7dd2 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dragimag.h"
 #endif
 
 #pragma implementation "dragimag.h"
 #endif
 


@@ -51,6 +51,10 @@
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 

+#ifdef __WXWINCE__  // for SM_CXCURSOR and SM_CYCURSOR
+#include "wx/msw/wince/missing.h"
+#endif // __WXWINCE__
+

 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
 #include <commctrl.h>
 #endif
 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
 #include <commctrl.h>
 #endif


@@ -117,6 +121,9 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
     m_hImageList = 0;
 
     UINT flags = 0 ;
     m_hImageList = 0;
 
     UINT flags = 0 ;

+#ifdef __WXWINCE__
+    flags = ILC_COLOR;
+#else

     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)
     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)


@@ -127,6 +134,7 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;

+#endif

 
     bool mask = (image.GetMask() != 0);
 
 
     bool mask = (image.GetMask() != 0);
 


@@ -170,6 +178,9 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
     m_hImageList = 0;
 
     UINT flags = 0 ;
     m_hImageList = 0;
 
     UINT flags = 0 ;

+#ifdef __WXWINCE__
+    flags = ILC_COLOR;
+#else

     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)
     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)


@@ -180,6 +191,7 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;

+#endif

     bool mask = TRUE;
     if ( mask )
         flags |= ILC_MASK;
     bool mask = TRUE;
     if ( mask )
         flags |= ILC_MASK;


@@ -243,8 +255,9 @@ bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
 {
     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
 
 }
 #endif