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 bd392388ce4cd80965e5955d0884d55ddf6015ba..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/icon.h"
+#include "wx/gdicmn.h"
 
 //-------------------------------------------------------------------------
 // conditional compilation
@@ -43,6 +45,7 @@ class wxWindow;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;
+class wxPrivateDropTarget;
 
 class wxDropSource;
 
@@ -59,17 +62,20 @@ class wxDropTarget: public wxObject
     
     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 size_t GetFormatCount() const = 0;
-    virtual wxDataFormat GetFormat(size_t n) const = 0;
+    virtual wxDataFormat &GetFormat(size_t n) const;
   
   // implementation
   
     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );
+    
+    wxDataFormat  *m_format;
 };
 
 //-------------------------------------------------------------------------
@@ -80,25 +86,53 @@ class wxTextDropTarget: public wxDropTarget
 {
   public:
 
-    wxTextDropTarget() {};
+    wxTextDropTarget();
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
     
   protected:
   
     virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
 };
 
-// ----------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+// wxPrivateDropTarget
+//-------------------------------------------------------------------------
+
+class wxPrivateDropTarget: public wxDropTarget
+{
+public:
+
+  wxPrivateDropTarget();
+  
+  // you have to override OnDrop to get at the data
+    
+  // the string ID identifies the format of clipboard or DnD data. a word
+  // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
+  // to the clipboard - the latter with the Id "application/wxword" or
+  // "image/png".
+    
+  void SetId( const wxString& id );
+    
+  wxString GetId()
+      { return m_id; }
+
+private:
+
+  virtual size_t GetFormatCount() const;
+    
+  wxString   m_id;
+};
+
+//----------------------------------------------------------------------------
 // A drop target which accepts files (dragged from File Manager or Explorer)
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
 class wxFileDropTarget: public wxDropTarget
 {
   public:
     
-    wxFileDropTarget() {};
+    wxFileDropTarget();
     
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropFiles( long x, long y, 
@@ -107,7 +141,6 @@ class wxFileDropTarget: public wxDropTarget
   protected:
   
     virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
 };
 
 //-------------------------------------------------------------------------
@@ -119,7 +152,7 @@ enum wxDragResult
   wxDragError,    // error prevented the d&d operation from completing
   wxDragNone,     // drag target didn't accept the data
   wxDragCopy,     // the data was successfully copied
-  wxDragMove,     // the data was successfully moved
+  wxDragMove,     // the data was successfully moved (MSW only)
   wxDragCancel    // the operation was cancelled by user (not an error)
 };
 
@@ -127,17 +160,30 @@ class wxDropSource: public wxObject
 {
   public:
 
-    wxDropSource( wxWindow *win );
-    wxDropSource( wxDataObject &data, wxWindow *win );
+    /* constructor. set data later with SetData() */
+    wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
+    
+    /* constructor for setting one data object */
+    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 );
     
     ~wxDropSource(void);
     
-    void SetData( wxDataObject &data  );
+    /* set one dataobject */
+    void SetData( wxDataBroker *data );
+    
+    /* set severa dataobjects via wxDataBroker */
+    void SetData( wxDataObject *data );
+    
+    /* start drag action */
     wxDragResult DoDragDrop( bool bAllowMove = FALSE );
     
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
+    /* override to give feedback */
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
   
-  // implementation
+  /* GTK implementation */
       
     void RegisterWindow(void);
     void UnregisterWindow(void);
@@ -145,10 +191,13 @@ class wxDropSource: public wxObject
     GtkWidget     *m_widget;
     wxWindow      *m_window;
     wxDragResult   m_retValue;
-    wxDataObject  *m_data;
+    wxDataBroker  *m_data;
     
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
+    
+    wxIcon        m_goIcon;
+    wxIcon        m_stopIcon;
 };
 
 #endif