wxCALLBACK added, wxCOMPFUNC_CONV moved to defs.h

[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 518a39cd5c5b07408daf913bf88d17007beeda16..d623116b315e251f3de1afcccbb9ff3068951e49 100644 (file)
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -6,21 +6,21 @@
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // prolog
 // ============================================================================
-#ifndef   _OLEDROPTGT_H
-#define   _OLEDROPTGT_H
+#ifndef   _WX_OLEDROPTGT_H
+#define   _WX_OLEDROPTGT_H
 
 #ifdef __GNUG__
 #pragma interface "droptgt.h"
 #endif
 
-#if !USE_DRAG_AND_DROP
-  #error  "You should #define USE_DRAG_AND_DROP to 1 to compile this file!"
+#if !wxUSE_DRAG_AND_DROP
+  #error  "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
 #endif  //WX_DRAG_DROP
 
 // ----------------------------------------------------------------------------
@@ -29,8 +29,6 @@
 class  wxIDropTarget;
 struct IDataObject;
 
-typedef unsigned short wxDataFormat;
-
 // ----------------------------------------------------------------------------
 // An instance of the class wxDropTarget may be associated with any wxWindow
 // derived object via SetDropTarget() function. If this is done, the virtual
@@ -85,7 +83,7 @@ class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
 {
 public:
   virtual bool OnDrop(long x, long y, const void *pData);
-  virtual bool OnDropText(long x, long y, const char *psz) = 0;
+  virtual bool OnDropText(long x, long y, const wxChar *psz) = 0;
 
 protected:
   virtual size_t GetFormatCount() const;
@@ -102,7 +100,7 @@ public:
 
   // params: the number of files and the array of file names
   virtual bool OnDropFiles(long x, long y, 
-                           size_t nFiles, const char * const aszFiles[]) = 0;
+                           size_t nFiles, const wxChar * const aszFiles[]) = 0;
 
 protected:
   virtual size_t GetFormatCount() const;
@@ -110,4 +108,4 @@ protected:
 };
 
 // ============================================================================
-#endif  //_OLEDROPTGT_H
\ No newline at end of file
+#endif  //_WX_OLEDROPTGT_H