Reworked the undef stuff a little

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 659c6a3004dec810eb28f260403f7bd3f8141f6e..0e76509e1ab09807074a4126f0cdf8dfe57df315 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -39,68 +39,6 @@ class wxPrivateDropTarget;
 
 class wxDropSource;
 
 
 class 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
-{
-public:
-
-  /* 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();
-    
-  /* set several dataobjects via wxDataBroker */
-  void SetData( wxDataBroker *data );
-
-  /* set one dataobject */
-  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 UnregisterWindow();
-  
-    GtkWidget     *m_widget;
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataBroker  *m_data;
-    
-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
-    
-    wxIcon        m_goIcon;
-    wxIcon        m_stopIcon;
-    
-    bool          m_waiting;
-};
-
-#include "gtk/gtk.h"
-#if (GTK_MINOR_VERSION > 0)
-

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


@@ -117,12 +55,23 @@ public:
   virtual void OnLeave();
   
   /* may be overridden to reject certain formats or drops
   virtual void OnLeave();
   
   /* may be overridden to reject certain formats or drops

-     on certain areas */
+     on certain areas. always returns TRUE by default
+     indicating that you'd accept the data from the drag. */

   virtual bool OnMove( int x, int y );
     
   virtual bool OnMove( int x, int y );
     

-  /* has to be overridden to accept drop. call GetData() to
-     indicate the format you request and get the data. */
+  /* 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( int x, int y );
   virtual bool OnDrop( int x, int y );

+  
+  /* this gets called once the data has actually arrived. get
+     it with GetData(). this has to be overridden. */
+  virtual bool OnData( int x, int 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 );
 
   /* called to query what formats are available */
   bool IsSupported( wxDataFormat format );


@@ -137,14 +86,13 @@ public:
     
   GdkDragContext     *m_dragContext;
   GtkWidget          *m_dragWidget;
     
   GdkDragContext     *m_dragContext;
   GtkWidget          *m_dragWidget;

+  GtkSelectionData   *m_dragData;

   guint               m_dragTime;
   bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */
   guint               m_dragTime;
   bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */

-  bool                m_waiting;         /* asynchronous process */
-  bool                m_dataRetrieveSuccess;
-  wxDataObject       *m_currentDataObject;

     
   void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
   void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
     
   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; }
 };
 
   void SetDragTime( guint time ) { m_dragTime = time; }
 };
 


@@ -160,9 +108,10 @@ public:
 
   virtual bool OnMove( int x, int y );
   virtual bool OnDrop( int x, int y );
 
   virtual bool OnMove( int x, int y );
   virtual bool OnDrop( int x, int y );

+  virtual bool OnData( int x, int y );

     
   /* you have to override OnDropData to get at the text */
     
   /* you have to override OnDropData to get at the text */

-  virtual bool OnDropText( int x, int y, const char *text ) = 0;
+  virtual bool OnDropText( int x, int y, const wxChar *text ) = 0;

     
 };
 
     
 };
 


@@ -182,6 +131,7 @@ public:
   
   virtual bool OnMove( int x, int y );
   virtual bool OnDrop( int x, int y );
   
   virtual bool OnMove( int x, int y );
   virtual bool OnDrop( int x, int y );

+  virtual bool OnData( int x, int y );

   
   /* you have to override OnDropData to get at the data */
   virtual bool OnDropData( int x, int y, void *data, size_t size ) = 0;
   
   /* you have to override OnDropData to get at the data */
   virtual bool OnDropData( int x, int y, void *data, size_t size ) = 0;


@@ -210,112 +160,72 @@ public:
     
   virtual bool OnMove( int x, int y );
   virtual bool OnDrop( int x, int y );
     
   virtual bool OnMove( int x, int y );
   virtual bool OnDrop( int x, int y );

-  virtual void OnData( int x, int y );
+  virtual bool OnData( int x, int y );

   
   /* you have to override OnDropFiles to get at the file names */
   
   /* you have to override OnDropFiles to get at the file names */

-  virtual bool OnDropFiles( int x, int y, size_t nFiles, const char * const aszFiles[] ) = 0;
-
-};
-
-#else
-
-//-------------------------------------------------------------------------
-// wxDropTarget
-//-------------------------------------------------------------------------
-
-class wxDropTarget: public wxObject
-{
-  public:
+  virtual bool OnDropFiles( int x, int y, size_t nFiles, const wxChar * const aszFiles[] ) = 0;

 
 

-    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;
-  
-  // implementation
-  
-    void RegisterWidget( GtkWidget *widget );
-    void UnregisterWidget( GtkWidget *widget );
-    
-    wxDataFormat  *m_format;

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

-// wxTextDropTarget
+// wxDropSource

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

-class wxTextDropTarget: public wxDropTarget
+enum wxDragResult

 {
 {

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

 };
 
 };
 

-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
-
-class wxPrivateDropTarget: public wxDropTarget
+class wxDropSource: public wxObject

 {
 public:
 
 {
 public:
 

-  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".
+  /* constructor. set data later with SetData() */
+  wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );

     
     

-  void SetId( const wxString& id );
+  /* constructor for setting one data object */
+  wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );

     
     

-  wxString GetId()
-      { return m_id; }
-
-private:
+  /* constructor for setting several data objects via wxDataBroker */
+  wxDropSource( wxDataBroker *data, wxWindow *win );

 
 

-  virtual size_t GetFormatCount() const;
+  ~wxDropSource();

     
     

-  wxString   m_id;
-};
+  /* set several dataobjects via wxDataBroker */
+  void SetData( wxDataBroker *data );

 
 

-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
+  /* set one dataobject */
+  void SetData( wxDataObject *data );

 
 

-class wxFileDropTarget: public wxDropTarget
-{
-  public:
-    
-    wxFileDropTarget();
+  /* start drag action */
+  wxDragResult DoDragDrop( bool bAllowMove = FALSE );

     
     

-    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:
+  /* override to give feedback */
+  virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
+  
+  /* GTK implementation */
+      
+  void RegisterWindow();
+  void UnregisterWindow();

   
   

-    virtual size_t GetFormatCount() const;
+    GtkWidget     *m_widget;
+    wxWindow      *m_window;
+    wxDragResult   m_retValue;
+    wxDataBroker  *m_data;
+    
+    wxCursor      m_defaultCursor;
+    wxCursor      m_goaheadCursor;
+    
+    wxIcon        m_goIcon;
+    wxIcon        m_stopIcon;
+    
+    bool          m_waiting;

 };
 
 };
 

-#endif
-
-

 #endif
 
    // wxUSE_DRAG_AND_DROP
 #endif
 
    // wxUSE_DRAG_AND_DROP