Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h
index bdc972b7327a5f17df495c75d871e08aad851bb9..7004d82f7fa296e10ce8a20c6751a95e491ea89e 100644 (file)
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     declaration of the wxDropSource class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     declaration of the wxDropSource class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,21 +12,15 @@
 #ifndef   _WX_OLEDROPSRC_H
 #define   _WX_OLEDROPSRC_H
 
 #ifndef   _WX_OLEDROPSRC_H
 #define   _WX_OLEDROPSRC_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface
-#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
 // ----------------------------------------------------------------------------
 
 class wxIDropSource;
 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 class wxIDropSource;

-class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

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


@@ -36,14 +30,14 @@ class WXDLLEXPORT wxWindow;
 // the cursor 'name' from the resources under MSW, but will expand to
 // something else under GTK. If you don't use it, you will have to use #ifdef
 // in the application code.
 // the cursor 'name' from the resources under MSW, but will expand to
 // something else under GTK. If you don't use it, you will have to use #ifdef
 // in the application code.

-#define wxDROP_ICON(name)   wxCursor(_T(#name))
+#define wxDROP_ICON(name)   wxCursor(wxT(#name))

 
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDropSource : public wxDropSourceBase
+class WXDLLIMPEXP_CORE wxDropSource : public wxDropSourceBase

 {
 public:
     // ctors: if you use default ctor you must call SetData() later!
 {
 public:
     // ctors: if you use default ctor you must call SetData() later!


@@ -77,7 +71,9 @@ protected:
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 

-    DECLARE_NO_COPY_CLASS(wxDropSource)
+    wxDECLARE_NO_COPY_CLASS(wxDropSource);

 };
 
 };
 

+#endif  //wxUSE_DRAG_AND_DROP
+

 #endif  //_WX_OLEDROPSRC_H
 #endif  //_WX_OLEDROPSRC_H