fixed dll import specification of wxGetHInstance()

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index bff7fab2658d6f7ed54eed914cad6cd32f3bcc09..4dcd3e57f8851728bfecd1bacecb3ed00e21f27c 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -17,18 +17,19 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 #pragma implementation "dragimag.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #pragma implementation "dragimag.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

+#if wxUSE_DRAGIMAGE
+

 #if defined(__WIN95__)
 
 #ifndef WX_PRECOMP
 #if defined(__WIN95__)
 
 #ifndef WX_PRECOMP


@@ -41,6 +42,7 @@
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"
 #endif
 

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

 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/frame.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/frame.h"


@@ -49,10 +51,20 @@
 #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__))
+#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
 
 #include <commctrl.h>
 #endif
 

+// 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
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -91,7 +103,7 @@ void wxDragImage::Init()
     m_hCursorImageList = 0;
 #endif
     m_window = (wxWindow*) NULL;
     m_hCursorImageList = 0;
 #endif
     m_window = (wxWindow*) NULL;

-    m_fullScreen = FALSE;
+    m_fullScreen = false;

 }
 
 // Attributes
 }
 
 // Attributes


@@ -108,7 +120,10 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 
         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)


@@ -119,10 +134,15 @@ 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);

-    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);
 


@@ -157,7 +177,10 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 
         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)


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

-    bool mask = TRUE;
+#endif
+    bool mask = true;

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


@@ -190,7 +214,7 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
 // Create a drag image from a string and optional cursor
 bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
 // Create a drag image from a string and optional cursor
 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;
     wxScreenDC dc;
 
     long w, h;
     wxScreenDC dc;


@@ -220,22 +244,24 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
     dc2.SelectObject(wxNullBitmap);
 
     // Make the bitmap masked
     dc2.SelectObject(wxNullBitmap);
 
     // 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);
+    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());
 // 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)
 {


@@ -244,8 +270,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)


@@ -258,32 +285,34 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
         m_boundingRect = * rect;
 
     bool ret = (ImageList_BeginDrag(GetHimageList(), 0, hotspot.x, hotspot.y) != 0);
         m_boundingRect = * rect;
 
     bool ret = (ImageList_BeginDrag(GetHimageList(), 0, hotspot.x, hotspot.y) != 0);

-    //bool ret = (ImageList_BeginDrag(GetHimageList(), 0, 0, 0) != 0);

 
     if (!ret)
     {
         wxFAIL_MSG( _T("BeginDrag failed.") );
 
 
     if (!ret)
     {
         wxFAIL_MSG( _T("BeginDrag failed.") );
 

-        return FALSE;
+        return false;

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

-           m_oldCursor = window->GetCursor();
-           window->SetCursor(m_cursor);
+        m_oldCursor = window->GetCursor();
+        window->SetCursor(m_cursor);

 #else
         if (!m_hCursorImageList)
 #else
         if (!m_hCursorImageList)

-        {           
-            int cxCursor = GetSystemMetrics(SM_CXCURSOR); 
-            int cyCursor = GetSystemMetrics(SM_CYCURSOR); 
- 
+        {
+            int cxCursor = GetSystemMetrics(SM_CXCURSOR);
+            int cyCursor = GetSystemMetrics(SM_CYCURSOR);
+

             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 
         // See if we can find the cursor hotspot
         wxPoint curHotSpot(hotspot);
 
             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)
 #if 0
         ICONINFO iconInfo;
         if (::GetIconInfo((HICON) (HCURSOR) m_cursor.GetHCURSOR(), & iconInfo) != 0)


@@ -292,9 +321,9 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
             curHotSpot.y -= iconInfo.yHotspot;
         }
 #endif
             curHotSpot.y -= iconInfo.yHotspot;
         }
 #endif

-        wxString msg;
-        msg.Printf("Hotspot = %d, %d", curHotSpot.x, curHotSpot.y);
-        wxLogDebug(msg);
+        //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();
 
         // First add the cursor to the image list
         HCURSOR hCursor = (HCURSOR) m_cursor.GetHCURSOR();


@@ -318,7 +347,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
     ::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


@@ -330,7 +359,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)))


@@ -339,7 +368,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


@@ -356,14 +385,14 @@ bool wxDragImage::EndDrag()
 
 #if wxUSE_SIMPLER_DRAGIMAGE
     if (m_cursor.Ok() && m_oldCursor.Ok())
 
 #if wxUSE_SIMPLER_DRAGIMAGE
     if (m_cursor.Ok() && m_oldCursor.Ok())

-           m_window->SetCursor(m_oldCursor);
+        m_window->SetCursor(m_oldCursor);

 #else
     ::ShowCursor(TRUE);
 #endif
 
     m_window = (wxWindow*) NULL;
 
 #else
     ::ShowCursor(TRUE);
 #endif
 
     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


@@ -431,3 +460,4 @@ bool wxDragImage::Hide()
 #endif
     // __WIN95__
 
 #endif
     // __WIN95__
 

+#endif // wxUSE_DRAGIMAGE