GetParent() was always used in test for wxHSCROLL checked in in last commit; use...

[wxWidgets.git] / src / msw / ole / droptgt.cpp

diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index 8bc18646cdaf746ee8c2315e99ed65632639f754..7072586f09c8c9241cddd744562368fb73855c32 100644 (file)
--- a/src/msw/ole/droptgt.cpp
+++ b/src/msw/ole/droptgt.cpp
@@ -6,7 +6,7 @@
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 #pragma implementation "droptgt.h"
 #endif
 
 #pragma implementation "droptgt.h"
 #endif
 


@@ -32,12 +32,18 @@
 
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 

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

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

+#ifdef __WXWINCE__
+    #include <winreg.h>
+    #include <ole2.h>
+#endif
+

 #ifdef __WIN32__
     #if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
         #if wxCHECK_W32API_VERSION( 1, 0 )
 #ifdef __WIN32__
     #if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
         #if wxCHECK_W32API_VERSION( 1, 0 )

-            #include <windows.h>
+            #include "wx/msw/wrapwin.h"

         #endif
         #include <shlobj.h>            // for DROPFILES structure
     #endif
         #endif
         #include <shlobj.h>            // for DROPFILES structure
     #endif


@@ -47,11 +53,6 @@
 
 #include "wx/dnd.h"
 
 
 #include "wx/dnd.h"
 

-#ifndef __WIN32__
-    #include <ole2.h>
-    #include <olestd.h>
-#endif
-

 #include "wx/msw/ole/oleutils.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/msw/ole/oleutils.h"
 
 // ----------------------------------------------------------------------------


@@ -84,7 +85,9 @@ protected:
     HWND          m_hwnd;         // window we're associated with
 
     // get default drop effect for given keyboard flags
     HWND          m_hwnd;         // window we're associated with
 
     // get default drop effect for given keyboard flags

-    static inline DWORD GetDropEffect(DWORD flags);
+    static inline DWORD GetDropEffect(DWORD flags, wxDragResult defaultAction);
+
+    DECLARE_NO_COPY_CLASS(wxIDropTarget)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -106,14 +109,15 @@ static DWORD ConvertDragResultToEffect(wxDragResult result);
 // Notes   : We do "move" normally and "copy" if <Ctrl> is pressed,
 //           which is the standard behaviour (currently there is no
 //           way to redefine it)
 // Notes   : We do "move" normally and "copy" if <Ctrl> is pressed,
 //           which is the standard behaviour (currently there is no
 //           way to redefine it)

-DWORD wxIDropTarget::GetDropEffect(DWORD flags)
+DWORD wxIDropTarget::GetDropEffect(DWORD flags, wxDragResult defaultAction)

 {
 {

+  if (defaultAction == wxDragCopy)
+    return flags & MK_SHIFT ? DROPEFFECT_MOVE : DROPEFFECT_COPY;

   return flags & MK_CONTROL ? DROPEFFECT_COPY : DROPEFFECT_MOVE;
 }
 
 wxIDropTarget::wxIDropTarget(wxDropTarget *pTarget)
 {
   return flags & MK_CONTROL ? DROPEFFECT_COPY : DROPEFFECT_MOVE;
 }
 
 wxIDropTarget::wxIDropTarget(wxDropTarget *pTarget)
 {

-  m_cRef         = 0;

   m_pTarget      = pTarget;
   m_pIDataObject = NULL;
 }
   m_pTarget      = pTarget;
   m_pIDataObject = NULL;
 }


@@ -148,7 +152,7 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
                   _T("drop target must have data object") );
 
     // show the list of formats supported by the source data object for the
                   _T("drop target must have data object") );
 
     // show the list of formats supported by the source data object for the

-    // debugging purposes
+    // debugging purposes, this is quite useful sometimes - please don't remove

 #if 0
     IEnumFORMATETC *penumFmt;
     if ( SUCCEEDED(pIDataSource->EnumFormatEtc(DATADIR_GET, &penumFmt)) )
 #if 0
     IEnumFORMATETC *penumFmt;
     if ( SUCCEEDED(pIDataSource->EnumFormatEtc(DATADIR_GET, &penumFmt)) )


@@ -187,8 +191,8 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
 
     // give some visual feedback
     *pdwEffect = ConvertDragResultToEffect(
 
     // give some visual feedback
     *pdwEffect = ConvertDragResultToEffect(

-                    m_pTarget->OnEnter(pt.x, pt.y,
-                        ConvertDragEffectToResult(GetDropEffect(grfKeyState))
+        m_pTarget->OnEnter(pt.x, pt.y, ConvertDragEffectToResult(
+            GetDropEffect(grfKeyState, m_pTarget->GetDefaultAction()))

                     )
                  );
 
                     )
                  );
 


@@ -212,7 +216,8 @@ STDMETHODIMP wxIDropTarget::DragOver(DWORD   grfKeyState,
 
     wxDragResult result;
     if ( m_pIDataObject ) {
 
     wxDragResult result;
     if ( m_pIDataObject ) {

-        result = ConvertDragEffectToResult(GetDropEffect(grfKeyState));
+        result = ConvertDragEffectToResult(
+            GetDropEffect(grfKeyState, m_pTarget->GetDefaultAction()));

     }
     else {
         // can't accept data anyhow normally
     }
     else {
         // can't accept data anyhow normally


@@ -284,7 +289,8 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
         m_pTarget->SetDataSource(pIDataSource);
 
         // and now it has the data
         m_pTarget->SetDataSource(pIDataSource);
 
         // and now it has the data

-        wxDragResult rc = ConvertDragEffectToResult(GetDropEffect(grfKeyState));
+        wxDragResult rc = ConvertDragEffectToResult(
+            GetDropEffect(grfKeyState, m_pTarget->GetDefaultAction()));

         rc = m_pTarget->OnData(pt.x, pt.y, rc);
         if ( wxIsDragResultOk(rc) ) {
             // operation succeeded
         rc = m_pTarget->OnData(pt.x, pt.y, rc);
         if ( wxIsDragResultOk(rc) ) {
             // operation succeeded


@@ -292,7 +298,7 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
         }
         //else: *pdwEffect is already DROPEFFECT_NONE
     }
         }
         //else: *pdwEffect is already DROPEFFECT_NONE
     }

-    //else: OnDrop() returned FALSE, no need to copy data
+    //else: OnDrop() returned false, no need to copy data

 
     // release the held object
     RELEASE_AND_NULL(m_pIDataObject);
 
     // release the held object
     RELEASE_AND_NULL(m_pIDataObject);


@@ -328,48 +334,72 @@ wxDropTarget::~wxDropTarget()
 
 bool wxDropTarget::Register(WXHWND hwnd)
 {
 
 bool wxDropTarget::Register(WXHWND hwnd)
 {

-    HRESULT hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE);
+    // FIXME
+    // RegisterDragDrop not available on Windows CE >= 400?
+    // Or maybe we can dynamically load them from ceshell.dll
+    // or similar.
+#if defined(__WXWINCE__) && _WIN32_WCE >= 400
+    wxUnusedVar(hwnd);
+    return false;
+#else
+    HRESULT hr;
+
+    // May exist in later WinCE versions
+#ifndef __WXWINCE__
+    hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE);

     if ( FAILED(hr) ) {
         wxLogApiError(wxT("CoLockObjectExternal"), hr);
     if ( FAILED(hr) ) {
         wxLogApiError(wxT("CoLockObjectExternal"), hr);

-        return FALSE;
+        return false;

     }
     }

+#endif

 
     hr = ::RegisterDragDrop((HWND) hwnd, m_pIDropTarget);
     if ( FAILED(hr) ) {
 
     hr = ::RegisterDragDrop((HWND) hwnd, m_pIDropTarget);
     if ( FAILED(hr) ) {

+    // May exist in later WinCE versions
+#ifndef __WXWINCE__

         ::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE);
         ::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE);

-
+#endif

         wxLogApiError(wxT("RegisterDragDrop"), hr);
         wxLogApiError(wxT("RegisterDragDrop"), hr);

-        return FALSE;
+        return false;

     }
 
     // we will need the window handle for coords transformation later
     m_pIDropTarget->SetHwnd((HWND)hwnd);
 
     }
 
     // we will need the window handle for coords transformation later
     m_pIDropTarget->SetHwnd((HWND)hwnd);
 

-    return TRUE;
+    return true;
+#endif

 }
 
 void wxDropTarget::Revoke(WXHWND hwnd)
 {
 }
 
 void wxDropTarget::Revoke(WXHWND hwnd)
 {

+#if defined(__WXWINCE__) && _WIN32_WCE >= 400
+    // Not available, see note above
+    wxUnusedVar(hwnd);
+#else

     HRESULT hr = ::RevokeDragDrop((HWND) hwnd);
 
     if ( FAILED(hr) ) {
         wxLogApiError(wxT("RevokeDragDrop"), hr);
     }
 
     HRESULT hr = ::RevokeDragDrop((HWND) hwnd);
 
     if ( FAILED(hr) ) {
         wxLogApiError(wxT("RevokeDragDrop"), hr);
     }
 

+    // May exist in later WinCE versions
+#ifndef __WXWINCE__

     ::CoLockObjectExternal(m_pIDropTarget, FALSE, TRUE);
     ::CoLockObjectExternal(m_pIDropTarget, FALSE, TRUE);

+#endif

 
     m_pIDropTarget->SetHwnd(0);
 
     m_pIDropTarget->SetHwnd(0);

+#endif

 }
 
 // ----------------------------------------------------------------------------
 // base class pure virtuals
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // base class pure virtuals
 // ----------------------------------------------------------------------------
 

-// OnDrop() is called only if we previously returned TRUE from
+// OnDrop() is called only if we previously returned true from

 // IsAcceptedData(), so no need to check anything here
 bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 {
 // IsAcceptedData(), so no need to check anything here
 bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 {

-    return TRUE;
+    return true;

 }
 
 // copy the data from the data source to the target data object
 }
 
 // copy the data from the data source to the target data object


@@ -380,7 +410,7 @@ bool wxDropTarget::GetData()
         // this is strange because IsAcceptedData() succeeded previously!
         wxFAIL_MSG(wxT("strange - did supported formats list change?"));
 
         // this is strange because IsAcceptedData() succeeded previously!
         wxFAIL_MSG(wxT("strange - did supported formats list change?"));
 

-        return FALSE;
+        return false;

     }
 
     STGMEDIUM stm;
     }
 
     STGMEDIUM stm;


@@ -391,7 +421,7 @@ bool wxDropTarget::GetData()
     fmtMemory.lindex    = -1;
     fmtMemory.tymed     = TYMED_HGLOBAL;  // TODO to add other media
 
     fmtMemory.lindex    = -1;
     fmtMemory.tymed     = TYMED_HGLOBAL;  // TODO to add other media
 

-    bool rc = FALSE;
+    bool rc = false;

 
     HRESULT hr = m_pIDataSource->GetData(&fmtMemory, &stm);
     if ( SUCCEEDED(hr) ) {
 
     HRESULT hr = m_pIDataSource->GetData(&fmtMemory, &stm);
     if ( SUCCEEDED(hr) ) {


@@ -399,14 +429,14 @@ bool wxDropTarget::GetData()
 
         hr = dataObject->SetData(&fmtMemory, &stm, TRUE);
         if ( SUCCEEDED(hr) ) {
 
         hr = dataObject->SetData(&fmtMemory, &stm, TRUE);
         if ( SUCCEEDED(hr) ) {

-            rc = TRUE;
+            rc = true;

         }
         else {
         }
         else {

-            wxLogLastError(wxT("IDataObject::SetData()"));
+            wxLogApiError(wxT("IDataObject::SetData()"), hr);

         }
     }
     else {
         }
     }
     else {

-        wxLogLastError(wxT("IDataObject::GetData()"));
+        wxLogApiError(wxT("IDataObject::GetData()"), hr);

     }
 
     return rc;
     }
 
     return rc;


@@ -484,6 +514,9 @@ static wxDragResult ConvertDragEffectToResult(DWORD dwEffect)
         case DROPEFFECT_COPY:
             return wxDragCopy;
 
         case DROPEFFECT_COPY:
             return wxDragCopy;
 

+        case DROPEFFECT_LINK:
+            return wxDragLink;
+

         case DROPEFFECT_MOVE:
             return wxDragMove;
 
         case DROPEFFECT_MOVE:
             return wxDragMove;
 


@@ -502,6 +535,9 @@ static DWORD ConvertDragResultToEffect(wxDragResult result)
         case wxDragCopy:
             return DROPEFFECT_COPY;
 
         case wxDragCopy:
             return DROPEFFECT_COPY;
 

+        case wxDragLink:
+            return DROPEFFECT_LINK;
+

         case wxDragMove:
             return DROPEFFECT_MOVE;
 
         case wxDragMove:
             return DROPEFFECT_MOVE;