more backwards compatibility for printing

[wxWidgets.git] / include / wx / gtk / dnd.h

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index f2f81e8550b14cd5ccd9316051a9284f337a3d86..2eccb9c9d66a43e6a323ad34706a4cc6d68395cb 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -17,22 +17,22 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"
-
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------
 
-#if (GTK_MINOR_VERSION == 1)
-#if (GTK_MICRO_VERSION >= 3)
+#if (GTK_MINOR_VERSION > 0)
 #define NEW_GTK_DND_CODE
 #endif
-#endif
+
+#if wxUSE_DRAG_AND_DROP
+
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/dataobj.h"
+#include "wx/cursor.h"
+#include "wx/icon.h"
+#include "wx/gdicmn.h"
 
 //-------------------------------------------------------------------------
 // classes
@@ -159,10 +159,10 @@ class wxDropSource: public wxObject
   public:
 
     /* constructor. set data later with SetData() */
-    wxDropSource( wxWindow *win );
+    wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
     
     /* constructor for setting one data object */
-    wxDropSource( wxDataObject *data, wxWindow *win );
+    wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
     
     /* constructor for setting several data objects via wxDataBroker */
     wxDropSource( wxDataBroker *data, wxWindow *win );
@@ -193,6 +193,9 @@ class wxDropSource: public wxObject
     
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
+    
+    wxIcon        m_goIcon;
+    wxIcon        m_stopIcon;
 };
 
 #endif