Don't cache incorrect length in wxString::DoUngetWriteBuf().

[wxWidgets.git] / include / wx / msw / ole / droptgt.h

diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h
index 6c08553cd000a156ca141b97cbeb4e3485ea5bff..659bf397132ac7c2b6ffc9811fc50f6dfaecd355 100644 (file)
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -1,24 +1,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        ole/droptgt.h
+// Name:        wx/msw/ole/droptgt.h

 // Purpose:     declaration of the wxDropTarget class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_OLEDROPTGT_H
 #define   _WX_OLEDROPTGT_H
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_OLEDROPTGT_H
 #define   _WX_OLEDROPTGT_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "droptgt.h"
-#endif
-
-#if !wxUSE_DRAG_AND_DROP
-    #error  "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
-#endif  //WX_DRAG_DROP
+#if wxUSE_DRAG_AND_DROP

 
 // ----------------------------------------------------------------------------
 // forward declarations
 
 // ----------------------------------------------------------------------------
 // forward declarations


@@ -37,7 +31,7 @@ struct IDataObject;
 // (all of them, including protected ones which are called by the class itself)
 // ----------------------------------------------------------------------------
 
 // (all of them, including protected ones which are called by the class itself)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDropTarget : public wxDropTargetBase
+class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase

 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor


@@ -53,24 +47,29 @@ public:
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual bool GetData();
 
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual bool GetData();
 

+    // Can only be called during OnXXX methods.
+    wxDataFormat GetMatchingPair();
+

     // implementation only from now on
     // -------------------------------
 
     // do we accept this kind of data?
     // implementation only from now on
     // -------------------------------
 
     // do we accept this kind of data?

-    bool IsAcceptedData(IDataObject *pIDataSource) const;
+    bool MSWIsAcceptedData(IDataObject *pIDataSource) const;

 
     // give us the data source from IDropTarget::Drop() - this is later used by
     // GetData() when it's called from inside OnData()
 
     // give us the data source from IDropTarget::Drop() - this is later used by
     // GetData() when it's called from inside OnData()

-    void SetDataSource(IDataObject *pIDataSource);
+    void MSWSetDataSource(IDataObject *pIDataSource);

 
 private:
     // helper used by IsAcceptedData() and GetData()
 
 private:
     // helper used by IsAcceptedData() and GetData()

-    wxDataFormat GetSupportedFormat(IDataObject *pIDataSource) const;
+    wxDataFormat MSWGetSupportedFormat(IDataObject *pIDataSource) const;

 
     wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface
     IDataObject   *m_pIDataSource; // the pointer to the source data object
 
 
     wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface
     IDataObject   *m_pIDataSource; // the pointer to the source data object
 

-    DECLARE_NO_COPY_CLASS(wxDropTarget)
+    wxDECLARE_NO_COPY_CLASS(wxDropTarget);

 };
 
 };
 

+#endif  //wxUSE_DRAG_AND_DROP
+

 #endif  //_WX_OLEDROPTGT_H
 #endif  //_WX_OLEDROPTGT_H