1. sorted wxListBox and wxComboBox seem to work under wxGTK

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 86f31d8c585e78e0c5453a76e49f1aee8d53e9a3..3ddecc92ea70d20bf2748a4c0dcc61734428a48c 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -36,17 +36,17 @@
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/log.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/log.h"

-#include "wx/dataobj.h"
-#include "wx/msw/ole/dropsrc.h"
+#include "wx/dnd.h"

 
 #include <windows.h>
 
 #include <windows.h>

+

 #ifdef wxUSE_NORLANDER_HEADERS
 #ifdef wxUSE_NORLANDER_HEADERS

-#include <ole2.h>
+    #include <ole2.h>

 #endif
 
 #ifndef __WIN32__
 #endif
 
 #ifndef __WIN32__

-  #include <ole2.h>
-  #include <olestd.h>
+    #include <ole2.h>
+    #include <olestd.h>

 #endif
 
 #include <oleauto.h>
 #endif
 
 #include <oleauto.h>


@@ -160,23 +160,22 @@ void wxDropSource::Init()
   m_pIDropSource->AddRef();
 }
 
   m_pIDropSource->AddRef();
 }
 

-wxDropSource::wxDropSource(wxWindow* WXUNUSED(win))
+wxDropSource::wxDropSource(wxWindow* WXUNUSED(win),
+                           const wxIcon & WXUNUSED(go),
+                           const wxIcon & WXUNUSED(stop))

 {
   Init();
 {
   Init();

-  m_pData = NULL;

 }
 
 }
 

-wxDropSource::wxDropSource(wxDataObject& data, wxWindow* WXUNUSED(win))
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow* WXUNUSED(win),
+                           const wxIcon & WXUNUSED(go),
+                           const wxIcon & WXUNUSED(stop))

 {
   Init();
   SetData(data);
 }
 
 {
   Init();
   SetData(data);
 }
 

-void wxDropSource::SetData(wxDataObject& data)
-{
-  m_pData = &data;
-}
-

 wxDropSource::~wxDropSource()
 {
   m_pIDropSource->Release();
 wxDropSource::~wxDropSource()
 {
   m_pIDropSource->Release();


@@ -189,10 +188,10 @@ wxDropSource::~wxDropSource()
 // Notes   : you must call SetData() before if you had used def ctor
 wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
 {
 // Notes   : you must call SetData() before if you had used def ctor
 wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
 {

-  wxCHECK_MSG( m_pData != NULL, wxDragNone, _T("No data in wxDropSource!") );
+  wxCHECK_MSG( m_data != NULL, wxDragNone, wxT("No data in wxDropSource!") );

 
   DWORD dwEffect;
 
   DWORD dwEffect;

-  HRESULT hr = ::DoDragDrop(m_pData->GetInterface(),
+  HRESULT hr = ::DoDragDrop(m_data->GetInterface(),

                             m_pIDropSource,
                             bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE
                                        : DROPEFFECT_COPY,
                             m_pIDropSource,
                             bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE
                                        : DROPEFFECT_COPY,


@@ -221,10 +220,10 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
   else {
     if ( FAILED(hr) ) {
       wxLogApiError("DoDragDrop", hr);
   else {
     if ( FAILED(hr) ) {
       wxLogApiError("DoDragDrop", hr);

-      wxLogError(_T("Drag & drop operation failed."));
+      wxLogError(wxT("Drag & drop operation failed."));

     }
     else {
     }
     else {

-      wxLogDebug(_T("Unexpected success return code %08lx from DoDragDrop."), hr);
+      wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."), hr);

     }
 
     return wxDragError;
     }
 
     return wxDragError;