added a menu command to switch between clipboard and primary selection

[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 7e719f843e627cac9533216926a137b5a1281f70..d92c31f7d86c2a3dcfa2e9e549c2dbdeb0a77499 100644 (file)
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -12,13 +12,7 @@
 #ifndef   _WX_OLEDROPSRC_H
 #define   _WX_OLEDROPSRC_H
 
 #ifndef   _WX_OLEDROPSRC_H
 #define   _WX_OLEDROPSRC_H
 

-#ifdef __GNUG__
-    #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
 
 // ----------------------------------------------------------------------------
 // forward declarations


@@ -36,7 +30,7 @@ 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(#name)
+#define wxDROP_ICON(name)   wxCursor(_T(#name))

 
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated
 
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated


@@ -76,6 +70,10 @@ protected:
 
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface

+
+    DECLARE_NO_COPY_CLASS(wxDropSource)

 };
 
 };
 

+#endif  //wxUSE_DRAG_AND_DROP
+

 #endif  //_WX_OLEDROPSRC_H
 #endif  //_WX_OLEDROPSRC_H