argh... yet another compilation fix

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index c67cb053e8ef1339ccceceb660ed4b058a79471e..52199517b47c017dae7450e935b909d1174f9862 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -33,155 +33,71 @@ class wxWindow;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;

-class wxPrivateDropTarget;

 
 class wxDropSource;
 
 
 class wxDropSource;
 

-//-------------------------------------------------------------------------
-// wxDropTarget
-//-------------------------------------------------------------------------
-
-class wxDropTarget: public wxObject
-{
-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 );
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-  /* called from within OnDrop() to request a certain format
-     from the drop event. */
-  bool RequestData( wxDataFormat format );
+// this macro may be used instead for wxDropSource ctor arguments: it will use
+// the icon 'name' from an XPM file under GTK, but will expand to something
+// else under MSW. If you don't use it, you will have to use #ifdef in the
+// application code.
+#define wxDROP_ICON(name)   wxICON(name)

 
 

-  /* 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; }
-};
-
-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
+// wxDropTarget

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

-/*
-class wxPrivateDropTarget: public wxDropTarget
+class wxDropTarget: public wxDropTargetBase

 {
 public:
 {
 public:

+    wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );

 
 

-  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 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();

 
 

-  virtual bool OnDropData( long x, long y, void *data, size_t size ) = 0;
+  // implementation

 
 

-  void SetId( const wxString& id ) { m_id = id; }
-  wxString GetId() { return m_id; }
+    GdkAtom GetMatchingPair();

 
 

-private:
-
-    wxString   m_id;
-};
-*/
-
-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
-
-class wxFileDropTarget: public wxDropTarget
-{
-public:
-
-  wxFileDropTarget() {}
+    void RegisterWidget( GtkWidget *widget );
+    void UnregisterWidget( GtkWidget *widget );

 
 

-  virtual bool OnData( long x, long y );
+    GdkDragContext     *m_dragContext;
+    GtkWidget          *m_dragWidget;
+    GtkSelectionData   *m_dragData;
+    guint               m_dragTime;
+    bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */

 
 

-  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; }
+    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; }

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

-class wxDropSource: public wxObject
+class wxDropSource: public wxDropSourceBase

 {
 public:
     /* constructor. set data later with SetData() */
 {
 public:
     /* constructor. set data later with SetData() */

-    wxDropSource( wxWindow *win,
-                  const wxIcon &go = wxNullIcon,
-                  const wxIcon &stop = wxNullIcon );
+    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);

 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,
 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,

-                  const wxIcon &go = wxNullIcon,
-                  const wxIcon &stop = wxNullIcon );
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);

 
     ~wxDropSource();
 
 
     ~wxDropSource();
 


@@ -192,18 +108,25 @@ public:
     void RegisterWindow();
     void UnregisterWindow();
 
     void RegisterWindow();
     void UnregisterWindow();
 

-    GtkWidget     *m_widget;
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataObject  *m_data;
+    void PrepareIcon( int action, GdkDragContext *context );

 
 

-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
+    GtkWidget       *m_widget;
+    GtkWidget       *m_iconWindow;
+    GdkDragContext  *m_dragContext;
+    wxWindow        *m_window;

 
 

-    wxIcon        m_goIcon;
-    wxIcon        m_stopIcon;
+    wxDragResult     m_retValue;
+    wxIcon           m_iconCopy,
+                     m_iconMove,
+                     m_iconNone;

 
 

-    bool          m_waiting;
+    bool             m_waiting;
+
+private:
+    // common part of both ctors
+    void SetIcons(const wxIcon& copy,
+                  const wxIcon& move,
+                  const wxIcon& none);

 };
 
 #endif
 };
 
 #endif