wxGTK fixes for the yesterday's addition of m_isWindow flag

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 998f656c5945ef2dd15b91c83ddfea1f1eddd51c..dc0a2d850dda8bd2aa7fe4624304eaffa63ac5d7 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -23,6 +23,8 @@
 #include "wx/string.h"
 #include "wx/dataobj.h"
 #include "wx/cursor.h"
 #include "wx/string.h"
 #include "wx/dataobj.h"
 #include "wx/cursor.h"

+#include "wx/icon.h"
+#include "wx/gdicmn.h"

 
 //-------------------------------------------------------------------------
 // conditional compilation
 
 //-------------------------------------------------------------------------
 // conditional compilation


@@ -60,6 +62,7 @@ class wxDropTarget: public wxObject
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }

+    virtual void OnMouseMove( long WXUNUSED(x), long WXUNUSED(y) ) { }

     virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;
 
     // Override these to indicate what kind of data you support: 
     virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;
 
     // Override these to indicate what kind of data you support: 


@@ -158,10 +161,10 @@ class wxDropSource: public wxObject
   public:
 
     /* constructor. set data later with SetData() */
   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 */
     
     /* 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 );
     
     /* constructor for setting several data objects via wxDataBroker */
     wxDropSource( wxDataBroker *data, wxWindow *win );


@@ -192,6 +195,9 @@ class wxDropSource: public wxObject
     
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
     
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;

+    
+    wxIcon        m_goIcon;
+    wxIcon        m_stopIcon;

 };
 
 #endif
 };
 
 #endif