check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index d60e69d88554fc1afa5a27b8e79d905e5e3b0f55..4f42ad81d99ef53768300cbfffeeb7e41fdc7354 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,40 +17,42 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-#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"

-#include "wx/msw/private.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#if defined(__WIN95__)
+#if wxUSE_DRAGIMAGE

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/window.h"
-#include "wx/dcclient.h"
-#include "wx/dcscreen.h"
-#include "wx/dcmemory.h"
-#include "wx/settings.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include <stdio.h>
+    #include "wx/window.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcscreen.h"
+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/frame.h"
-#include "wx/image.h"
+#include "wx/msw/private.h"

 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
-#include <commctrl.h>
+#ifdef __WXWINCE__  // for SM_CXCURSOR and SM_CYCURSOR
+#include "wx/msw/wince/missing.h"
+#endif // __WXWINCE__
+
+// Wine doesn't have this yet
+#ifndef ListView_CreateDragImage
+#define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \
+    (HIMAGELIST)SNDMSG((hwnd), LVM_CREATEDRAGIMAGE, (WPARAM)(int)(i), (LPARAM)(LPPOINT)(lpptUpLeft))

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -78,16 +80,20 @@ wxDragImage::~wxDragImage()
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());

+#if !wxUSE_SIMPLER_DRAGIMAGE

     if ( m_hCursorImageList )
         ImageList_Destroy((HIMAGELIST) m_hCursorImageList);
     if ( m_hCursorImageList )
         ImageList_Destroy((HIMAGELIST) m_hCursorImageList);

+#endif

 }
 
 void wxDragImage::Init()
 {
     m_hImageList = 0;
 }
 
 void wxDragImage::Init()
 {
     m_hImageList = 0;

+#if !wxUSE_SIMPLER_DRAGIMAGE

     m_hCursorImageList = 0;
     m_hCursorImageList = 0;

+#endif

     m_window = (wxWindow*) NULL;
     m_window = (wxWindow*) NULL;

-    m_fullScreen = FALSE;
+    m_fullScreen = false;

 }
 
 // Attributes
 }
 
 // Attributes


@@ -98,13 +104,16 @@ void wxDragImage::Init()
 ////////////////////////////////////////////////////////////////////////////
 
 // Create a drag image from a bitmap and optional cursor
 ////////////////////////////////////////////////////////////////////////////
 
 // Create a drag image from a bitmap and optional cursor

-bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& hotspot)
+bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)

 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 

-    UINT flags = 0 ;
+#ifdef __WXWINCE__
+    UINT flags = ILC_COLOR;
+#else
+    UINT flags wxDUMMY_INITIALIZE(0) ;

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


@@ -115,10 +124,15 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wx
         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);

-    if ( mask )
-        flags |= ILC_MASK;
+
+    // Curiously, even if the image doesn't have a mask,
+    // we still have to use ILC_MASK or the image won't show
+    // up when dragged.
+//    if ( mask )
+    flags |= ILC_MASK;

 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 
 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 


@@ -142,19 +156,21 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wx
         wxLogError(_("Couldn't add an image to the image list."));
     }
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.
         wxLogError(_("Couldn't add an image to the image list."));
     }
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.

-    m_hotspot = hotspot;

 
     return (index != -1) ;
 }
 
 // Create a drag image from an icon and optional cursor
 
     return (index != -1) ;
 }
 
 // Create a drag image from an icon and optional cursor

-bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& hotspot)
+bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)

 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 

-    UINT flags = 0 ;
+#ifdef __WXWINCE__
+    UINT flags = ILC_COLOR;
+#else
+    UINT flags wxDUMMY_INITIALIZE(0) ;

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


@@ -165,9 +181,9 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPo
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;
         flags = ILC_COLOR24;
     else
         flags = ILC_COLOR32;

-    bool mask = TRUE;
-    if ( mask )
-        flags |= ILC_MASK;
+#endif
+
+    flags |= ILC_MASK;

 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 
 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 


@@ -180,17 +196,16 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPo
     }
 
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.
     }
 
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.

-    m_hotspot = hotspot;

 
     return (index != -1) ;
 }
 
 // Create a drag image from a string and optional cursor
 
     return (index != -1) ;
 }
 
 // Create a drag image from a string and optional cursor

-bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& hotspot)
+bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)

 {
 {

-    wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-    long w, h;
+    wxCoord w = 0, h = 0;

     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);


@@ -217,23 +232,29 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPo
 
     dc2.SelectObject(wxNullBitmap);
 
 
     dc2.SelectObject(wxNullBitmap);
 

+#if wxUSE_WXDIB

     // Make the bitmap masked
     // Make the bitmap masked

-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();

     image.SetMaskColour(255, 255, 255);
     image.SetMaskColour(255, 255, 255);

-    bitmap = image.ConvertToBitmap();
-
-    return Create(bitmap, cursor, hotspot);
+    return Create(wxBitmap(image), cursor);
+#else
+    return false;
+#endif

 }
 
 }
 

+#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());
 // 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)
 {
 // Create a drag image for the given list control item
 bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
 {


@@ -242,8 +263,9 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
     POINT pt;
     pt.x = 0; pt.y = 0;
     m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt);
     POINT pt;
     pt.x = 0; pt.y = 0;
     m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt);

-    return TRUE;
+    return true;

 }
 }

+#endif

 
 // Begin drag
 bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect)
 
 // Begin drag
 bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect)


@@ -261,19 +283,46 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
     {
         wxFAIL_MSG( _T("BeginDrag failed.") );
 
     {
         wxFAIL_MSG( _T("BeginDrag failed.") );
 

-        return FALSE;
+        return false;

     }
 
     if (m_cursor.Ok())
     {
     }
 
     if (m_cursor.Ok())
     {

+#if wxUSE_SIMPLER_DRAGIMAGE
+        m_oldCursor = window->GetCursor();
+        window->SetCursor(m_cursor);
+#else

         if (!m_hCursorImageList)
         if (!m_hCursorImageList)

-        {           
-            int cxCursor = GetSystemMetrics(SM_CXCURSOR); 
-            int cyCursor = GetSystemMetrics(SM_CYCURSOR); 
- 
+        {
+#ifndef SM_CXCURSOR
+            // Smartphone may not have these metric symbol
+            int cxCursor = 16;
+            int cyCursor = 16;
+#else
+            int cxCursor = ::GetSystemMetrics(SM_CXCURSOR);
+            int cyCursor = ::GetSystemMetrics(SM_CYCURSOR);
+#endif

             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 
             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 

+        // See if we can find the cursor hotspot
+        wxPoint curHotSpot(hotspot);
+
+        // Although it seems to produce the right position, when the hotspot goeos
+        // negative it has strange effects on the image.
+        // How do we stop the cursor jumping right and below of where it should be?
+#if 0
+        ICONINFO iconInfo;
+        if (::GetIconInfo((HICON) (HCURSOR) m_cursor.GetHCURSOR(), & iconInfo) != 0)
+        {
+            curHotSpot.x -= iconInfo.xHotspot;
+            curHotSpot.y -= iconInfo.yHotspot;
+        }
+#endif
+        //wxString msg;
+        //msg.Printf("Hotspot = %d, %d", curHotSpot.x, curHotSpot.y);
+        //wxLogDebug(msg);
+

         // First add the cursor to the image list
         HCURSOR hCursor = (HCURSOR) m_cursor.GetHCURSOR();
         int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hCursorImageList, (HICON) hCursor);
         // First add the cursor to the image list
         HCURSOR hCursor = (HCURSOR) m_cursor.GetHCURSOR();
         int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hCursorImageList, (HICON) hCursor);


@@ -282,16 +331,21 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
         if (cursorIndex != -1)
         {
 
         if (cursorIndex != -1)
         {

-            ImageList_SetDragCursorImage((HIMAGELIST) m_hCursorImageList, cursorIndex, m_hotspot.x, m_hotspot.y);
+            ImageList_SetDragCursorImage((HIMAGELIST) m_hCursorImageList, cursorIndex, curHotSpot.x, curHotSpot.y);

         }
         }

+#endif

     }
 
     }
 

+#if !wxUSE_SIMPLER_DRAGIMAGE
+    if (m_cursor.Ok())
+        ::ShowCursor(FALSE);
+#endif
+

     m_window = window;
     m_window = window;

-    ::ShowCursor(FALSE);

 
     ::SetCapture(GetHwndOf(window));
 
 
     ::SetCapture(GetHwndOf(window));
 

-    return TRUE;
+    return true;

 }
 
 // Begin drag. hotspot is the location of the drag position relative to the upper-left
 }
 
 // Begin drag. hotspot is the location of the drag position relative to the upper-left


@@ -303,7 +357,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow*
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;

-    
+

     wxSize sz = fullScreenRect->GetSize();
 
     if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
     wxSize sz = fullScreenRect->GetSize();
 
     if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))


@@ -312,7 +366,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow*
     rect.x = x; rect.y = y;
     rect.width = sz.x; rect.height = sz.y;
 
     rect.x = x; rect.y = y;
     rect.width = sz.x; rect.height = sz.y;
 

-    return BeginDrag(hotspot, window, TRUE, & rect);
+    return BeginDrag(hotspot, window, true, & rect);

 }
 
 // End drag
 }
 
 // End drag


@@ -327,10 +381,16 @@ bool wxDragImage::EndDrag()
         wxLogLastError(wxT("ReleaseCapture"));
     }
 
         wxLogLastError(wxT("ReleaseCapture"));
     }
 

+#if wxUSE_SIMPLER_DRAGIMAGE
+    if (m_cursor.Ok() && m_oldCursor.Ok())
+        m_window->SetCursor(m_oldCursor);
+#else

     ::ShowCursor(TRUE);
     ::ShowCursor(TRUE);

+#endif
+

     m_window = (wxWindow*) NULL;
 
     m_window = (wxWindow*) NULL;
 

-    return TRUE;
+    return true;

 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window
 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window


@@ -339,10 +399,32 @@ bool wxDragImage::Move(const wxPoint& pt)
 {
     wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in Move."));
 
 {
     wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in Move."));
 

-    // TODO: what coordinates are these in: window, client, or screen?
-    bool ret = (ImageList_DragMove( pt.x, pt.y ) != 0);
+    // These are in window, not client coordinates.
+    // So need to convert to client coordinates.
+    wxPoint pt2(pt);
+    if (m_window && !m_fullScreen)
+    {
+        RECT rect;
+        rect.left = 0; rect.top = 0;
+        rect.right = 0; rect.bottom = 0;
+        DWORD style = ::GetWindowLong((HWND) m_window->GetHWND(), GWL_STYLE);
+#ifdef __WIN32__
+        DWORD exStyle = ::GetWindowLong((HWND) m_window->GetHWND(), GWL_EXSTYLE);
+        ::AdjustWindowRectEx(& rect, style, FALSE, exStyle);
+#else
+        ::AdjustWindowRect(& rect, style, FALSE);
+#endif
+        // Subtract the (negative) values, i.e. add a small increment
+        pt2.x -= rect.left; pt2.y -= rect.top;
+    }
+    else if (m_window && m_fullScreen)
+    {
+        pt2 = m_window->ClientToScreen(pt2);
+    }
+
+    bool ret = (ImageList_DragMove( pt2.x, pt2.y ) != 0);

 
 

-    m_position = pt;
+    m_position = pt2;

 
     return ret;
 }
 
     return ret;
 }


@@ -373,6 +455,4 @@ bool wxDragImage::Hide()
     return ret;
 }
 
     return ret;
 }
 

-#endif
-    // __WIN95__
-
+#endif // wxUSE_DRAGIMAGE