X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e2896e5c8944c5f5227fa080e1b781c4a6f2600..51d7e4e762372c09d5f2f4bbdee5bf3daa21ee5c:/include/wx/gtk1/dnd.h?ds=sidebyside

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index c67cb053e8..aa45735342 100644
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -33,7 +33,6 @@ class wxWindow;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;
-class wxPrivateDropTarget;
 
 class wxDropSource;
 
@@ -41,135 +40,71 @@ class wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
-class wxDropTarget: public wxObject
+class wxDropTarget: public wxDropTargetBase
 {
 public:
-
-  wxDropTarget();
-  ~wxDropTarget();
-
-  /* may be overridden to react to events */
-  virtual void OnEnter();
-  virtual void OnLeave();
-
-  /* may be overridden to reject certain formats or drops
-     on certain areas. always returns TRUE by default
-     indicating that you'd accept the data from the drag. */
-  virtual bool OnMove( long x, long y );
-
-  /* has to be overridden to accept a drop event. call
-     IsSupported() to ask which formats are available
-     and then call RequestData() to indicate the format
-     you request. */
-  virtual bool OnDrop( long x, long y );
-
-  /* this gets called once the data has actually arrived. get
-     it with GetData(). this has to be overridden. */
-  virtual bool OnData( long x, long y );
-
-  /* called from within OnDrop() to request a certain format
-     from the drop event. */
-  bool RequestData( wxDataFormat format );
-
-  /* called to query what formats are available */
-  bool IsSupported( wxDataFormat format );
-
-  /* fill data with data from the dragging source */
-  bool GetData( wxDataObject *data );
-
-  virtual size_t GetFormatCount() const = 0;
-  virtual wxDataFormat GetFormat(size_t n) const = 0;
-  
-// implementation
-
-  void RegisterWidget( GtkWidget *widget );
-  void UnregisterWidget( GtkWidget *widget );
-
-  GdkDragContext     *m_dragContext;
-  GtkWidget          *m_dragWidget;
-  GtkSelectionData   *m_dragData;
-  guint               m_dragTime;
-  bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */
-
-  void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
-  void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
-  void SetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
-  void SetDragTime( guint time ) { m_dragTime = time; }
-};
-
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-class wxTextDropTarget: public wxDropTarget
-{
-public:
-
-  wxTextDropTarget() {}
-
-  virtual bool OnData( long x, long y );
-
-  /* you have to override OnDropData to get at the text */
-  virtual bool OnDropText( long x, long y, const wxChar *text ) = 0;
-
-  virtual size_t GetFormatCount() const
-    { return 1; }
-  virtual wxDataFormat GetFormat(size_t n) const
-    { return wxDF_TEXT; }
+    wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
+    
+    virtual bool OnEnter(wxCoord x, wxCoord y) ;
+    virtual bool OnMove(wxCoord x, wxCoord y);
+    virtual bool OnDrop(wxCoord x, wxCoord y);
+    virtual bool OnData(wxCoord x, wxCoord y);
+    virtual bool GetData();
+
+  // implementation
+
+    GdkAtom GetMatchingPair();
+    void RegisterWidget( GtkWidget *widget );
+    void UnregisterWidget( GtkWidget *widget );
+
+    GdkDragContext     *m_dragContext;
+    GtkWidget          *m_dragWidget;
+    GtkSelectionData   *m_dragData;
+    guint               m_dragTime;
+    bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */
+
+    void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
+    void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
+    void SetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
+    void SetDragTime( guint time ) { m_dragTime = time; }
 };
 
-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// A simple wxDropTarget derived class for text data: you only need to
+// override OnDropText() to get something working
+// ----------------------------------------------------------------------------
 
-/*
-class wxPrivateDropTarget: public wxDropTarget
+class wxTextDropTarget : public wxDropTarget
 {
 public:
+    wxTextDropTarget();
 
-  wxPrivateDropTarget();
-  wxPrivateDropTarget( const wxString &id );
-
-  virtual bool OnMove( long x, long y );
-  virtual bool OnDrop( long x, long y );
-  virtual bool OnData( long x, long y );
-
-  virtual bool OnDropData( long x, long y, void *data, size_t size ) = 0;
+    virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
 
-  void SetId( const wxString& id ) { m_id = id; }
-  wxString GetId() { return m_id; }
-
-private:
-
-    wxString   m_id;
+    virtual bool OnData(wxCoord x, wxCoord y);
 };
-*/
 
-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxFileDropTarget: public wxDropTarget
+class wxFileDropTarget : public wxDropTarget
 {
 public:
+    wxFileDropTarget();
 
-  wxFileDropTarget() {}
-
-  virtual bool OnData( long x, long y );
+    // parameters are the number of files and the array of file names
+    virtual bool OnDropFiles(wxCoord x, wxCoord y,
+                             const wxArrayString& filenames) = 0;
 
-  virtual bool OnDropFiles( long x, long y, size_t nFiles, const wxChar * const aszFiles[] ) = 0;
-  
-  virtual size_t GetFormatCount() const
-    { return 1; }
-  virtual wxDataFormat GetFormat(size_t n) const
-    { return wxDF_FILENAME; }
+    virtual bool OnData(wxCoord x, wxCoord y);
 };
 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 
-class wxDropSource: public wxObject
+class wxDropSource: public wxDropSourceBase
 {
 public:
     /* constructor. set data later with SetData() */
@@ -195,7 +130,6 @@ public:
     GtkWidget     *m_widget;
     wxWindow      *m_window;
     wxDragResult   m_retValue;
-    wxDataObject  *m_data;
 
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;