RCS left a turd in the previous checkin

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 45bf0cf2f6c34b8331ff2998fa360321a3ec92c3..e6e45f03a866f9014fab17d79e8afc98b1f6e889 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -2,7 +2,7 @@
 // Name:        dnd.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // Name:        dnd.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////


@@ -15,10 +15,14 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
+#if wxUSE_DRAG_AND_DROP
+

 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/object.h"
 #include "wx/string.h"

+#include "wx/dataobj.h"

 #include "wx/cursor.h"
 #include "wx/cursor.h"

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

 
 //-------------------------------------------------------------------------
 // classes
 
 //-------------------------------------------------------------------------
 // classes


@@ -28,89 +32,85 @@ class wxWindow;
 
 class wxDropTarget;
 class wxTextDropTarget;
 
 class wxDropTarget;
 class wxTextDropTarget;

-class wxDragSource;
-class wxTextDragSource;
+class wxFileDropTarget;
+
+class wxDropSource;

 
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 

-class wxDropTarget: wxObject
+class wxDropTarget: public wxDropTargetBase

 {
 {

-  public:
+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();

 
 

-    wxDropTarget();
-    ~wxDropTarget();
-    virtual void OnEnter() { }
-    virtual void OnLeave() { }
-    virtual bool OnDrop( long x, long y, const void *pData ) = 0;
+  // implementation

 
 

-  public:
+    GdkAtom GetMatchingPair();

 
 

-    void Drop( GdkEvent *event, int x, int y );
-    virtual void RegisterWidget( GtkWidget *widget ) = 0;
+    void RegisterWidget( GtkWidget *widget );

     void UnregisterWidget( 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
+// wxDropSource

 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 

-class wxTextDropTarget: public wxDropTarget
+class wxDropSource: public wxDropSourceBase

 {
 {

-  public:
+public:
+    /* constructor. set data later with SetData() */
+    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+                  const wxIcon &go = wxNullIcon );

 
 

-    wxTextDropTarget() {};
-    virtual bool OnDrop( long x, long y, const void *pData );
-    virtual bool OnDropText( long x, long y, const char *psz );
-    virtual void RegisterWidget( GtkWidget *widget );
-};
+    /* constructor for setting one data object */
+    wxDropSource( wxDataObject& data,
+                  wxWindow *win,
+                  const wxIcon &go = wxNullIcon );

 
 

-//-------------------------------------------------------------------------
-// wxDragSource
-//-------------------------------------------------------------------------
+    ~wxDropSource();

 
 

-class wxDragSource: public wxObject
-{
-  public:
-
-    wxDragSource( wxWindow *win );
-    ~wxDragSource(void);
-    void SetData( char *data, const long size );
-    void Start( int x, int y );
-
-  public:
-
-    void ConnectWindow(void);
-    void UnconnectWindow(void);
-    virtual void RegisterWindow(void) = 0;
-    void UnregisterWindow(void);
-  
-    GtkWidget   *m_widget;
-    wxWindow    *m_window;
-    char        *m_data;
-    long         m_size;
-    wxCursor     m_defaultCursor;
-    wxCursor     m_goaheadCursor;
-};
+    /* start drag action */
+    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );

 
 

-//-------------------------------------------------------------------------
-// wxTextDragSource
-//-------------------------------------------------------------------------
+    /* GTK implementation */
+    void RegisterWindow();
+    void UnregisterWindow();

 
 

-class wxTextDragSource: public wxDragSource
-{
-  public:
-
-    wxTextDragSource( wxWindow *win ) : wxDragSource(win) {};
-    void SetTextData( const wxString &text );
-    void RegisterWindow(void);
-    
-  private:
-  
-    wxString m_tmp;
+    void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
+
+    GtkWidget       *m_widget;
+    GtkWidget       *m_iconWindow;
+    GdkDragContext  *m_dragContext;
+    wxWindow        *m_window;
+
+    wxDragResult     m_retValue;
+    wxIcon           m_icon;
+
+    bool             m_waiting;

 };
 
 };
 

-#endif  
+#endif
+
+   // wxUSE_DRAG_AND_DROP
+
+#endif

        //__GTKDNDH__
 
        //__GTKDNDH__