X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4677d31b48a236201176de5edfd5f950e1e3848..af07f1749c51e4c94032466776fa5a8dc6322635:/include/wx/gtk1/dnd.h

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index dc0a2d850d..380d5c1d6a 100644
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -15,8 +15,6 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/object.h"
@@ -26,16 +24,6 @@
 #include "wx/icon.h"
 #include "wx/gdicmn.h"
 
-//-------------------------------------------------------------------------
-// conditional compilation
-//-------------------------------------------------------------------------
-
-#if (GTK_MINOR_VERSION == 1)
-#if (GTK_MICRO_VERSION >= 3)
-#define NEW_GTK_DND_CODE
-#endif
-#endif
-
 //-------------------------------------------------------------------------
 // classes
 //-------------------------------------------------------------------------
@@ -45,7 +33,6 @@ class wxWindow;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;
-class wxPrivateDropTarget;
 
 class wxDropSource;
 
@@ -53,157 +40,77 @@ class wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
-class wxDropTarget: public wxObject
+class wxDropTarget: public wxDropTargetBase
 {
-  public:
-
-    wxDropTarget();
-    ~wxDropTarget();
-    
-    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;
-  
+public:
+    wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
+
+    virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
+    virtual bool OnDrop(wxCoord x, wxCoord y);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+    virtual bool GetData();
+
   // implementation
-  
+
+    GdkAtom GetMatchingPair();
+
     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );
-    
-    wxDataFormat  *m_format;
-};
 
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
+    GdkDragContext     *m_dragContext;
+    GtkWidget          *m_dragWidget;
+    GtkSelectionData   *m_dragData;
+    guint               m_dragTime;
+    bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */
 
-class wxTextDropTarget: public wxDropTarget
-{
-  public:
-
-    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;
+    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
+// wxDropSource
 //-------------------------------------------------------------------------
 
-class wxPrivateDropTarget: public wxDropTarget
+class wxDropSource: public wxDropSourceBase
 {
 public:
+    /* constructor. set data later with SetData() */
+    wxDropSource( wxWindow *win,
+                  const wxIcon &go = wxNullIcon );
 
-  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;
-};
+    /* constructor for setting one data object */
+    wxDropSource( wxDataObject& data,
+                  wxWindow *win,
+                  const wxIcon &go = wxNullIcon );
 
-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
+    ~wxDropSource();
 
-class wxFileDropTarget: public wxDropTarget
-{
-  public:
-    
-    wxFileDropTarget();
-    
-    virtual bool OnDrop( long x, long y, const void *data, size_t size );
-    virtual bool OnDropFiles( long x, long y, 
-                              size_t nFiles, const char * const aszFiles[] );
-
-  protected:
-  
-    virtual size_t GetFormatCount() const;
-};
+    /* start drag action */
+    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );
 
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+    /* GTK implementation */
+    void RegisterWindow();
+    void UnregisterWindow();
 
-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 (MSW only)
-  wxDragCancel    // the operation was cancelled by user (not an error)
-};
+    void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
 
-class wxDropSource: public wxObject
-{
-  public:
+    GtkWidget       *m_widget;
+    GtkWidget       *m_iconWindow;
+    GdkDragContext  *m_dragContext;
+    wxWindow        *m_window;
 
-    /* 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);
-    
-    /* set one dataobject */
-    void SetData( wxDataBroker *data );
-    
-    /* set severa dataobjects via wxDataBroker */
-    void SetData( wxDataObject *data );
-    
-    /* start drag action */
-    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
-    
-    /* override to give feedback */
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
-  
-  /* GTK implementation */
-      
-    void RegisterWindow(void);
-    void UnregisterWindow(void);
-  
-    GtkWidget     *m_widget;
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataBroker  *m_data;
-    
-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
-    
-    wxIcon        m_goIcon;
-    wxIcon        m_stopIcon;
+    wxDragResult     m_retValue;
+    wxIcon           m_icon;
+
+    bool             m_waiting;
 };
 
 #endif
 
    // wxUSE_DRAG_AND_DROP
 
-#endif  
+#endif
        //__GTKDNDH__