Support different for Visualage Versions

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

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index dc0a2d850dda8bd2aa7fe4624304eaffa63ac5d7..aa45735342373687be73ceb7db91971e578018a0 100644 (file)
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -15,8 +15,6 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/object.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/object.h"


@@ -26,16 +24,6 @@
 #include "wx/icon.h"
 #include "wx/gdicmn.h"
 
 #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
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // classes
 //-------------------------------------------------------------------------


@@ -45,7 +33,6 @@ class wxWindow;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;

-class wxPrivateDropTarget;

 
 class wxDropSource;
 
 
 class wxDropSource;
 


@@ -53,157 +40,110 @@ class wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
 // wxDropTarget
 //-------------------------------------------------------------------------
 

-class wxDropTarget: public wxObject
+class wxDropTarget: public wxDropTargetBase

 {
 {

-  public:
-
-    wxDropTarget();
-    ~wxDropTarget();
+public:
+    wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );

     
     

-    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;
-  
+    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
   // implementation

-  
+
+    GdkAtom GetMatchingPair();

     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );
     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );

-    
-    wxDataFormat  *m_format;
-};

 
 

-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-class wxTextDropTarget: public wxDropTarget
-{
-  public:
+    GdkDragContext     *m_dragContext;
+    GtkWidget          *m_dragWidget;
+    GtkSelectionData   *m_dragData;
+    guint               m_dragTime;
+    bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */

 
 

-    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
-//-------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 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:
 {
 public:

+    wxTextDropTarget();

 
 

-  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 bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;

 
 

-  virtual size_t GetFormatCount() const;
-    
-  wxString   m_id;
+    virtual bool OnData(wxCoord x, wxCoord y);

 };
 
 };
 

-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // A drop target which accepts files (dragged from File Manager or Explorer)
 // A drop target which accepts files (dragged from File Manager or Explorer)

-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxFileDropTarget: public wxDropTarget
+class wxFileDropTarget : public wxDropTarget

 {
 {

-  public:
-    
+public:

     wxFileDropTarget();
     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;
+    // 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 OnData(wxCoord x, wxCoord y);

 };
 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 
 };
 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 

-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)
-};
-
-class wxDropSource: public wxObject
+class wxDropSource: public wxDropSourceBase

 {
 {

-  public:
-
+public:

     /* constructor. set data later with SetData() */
     /* constructor. set data later with SetData() */

-    wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
-    
+    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, 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 );
-    
+    wxDropSource( wxDataObject& data,
+                  wxWindow *win,
+                  const wxIcon &go = wxNullIcon,
+                  const wxIcon &stop = wxNullIcon );
+
+    ~wxDropSource();
+

     /* start drag action */
     /* 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);
-  
+    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+
+    /* GTK implementation */
+    void RegisterWindow();
+    void UnregisterWindow();
+

     GtkWidget     *m_widget;
     wxWindow      *m_window;
     wxDragResult   m_retValue;
     GtkWidget     *m_widget;
     wxWindow      *m_window;
     wxDragResult   m_retValue;

-    wxDataBroker  *m_data;
-    
+

     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;

-    
+

     wxIcon        m_goIcon;
     wxIcon        m_stopIcon;
     wxIcon        m_goIcon;
     wxIcon        m_stopIcon;

+
+    bool          m_waiting;

 };
 
 #endif
 
    // wxUSE_DRAG_AND_DROP
 
 };
 
 #endif
 
    // wxUSE_DRAG_AND_DROP
 

-#endif  
+#endif

        //__GTKDNDH__
 
        //__GTKDNDH__