1. corrected some owner-drawn buttons bugs

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

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index 52a4c8550b09910794cd91dce8fcbb6e66f12e49..380d5c1d6a26bf63cfd70c5d37ae8da19a455268 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"


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

-class wxPrivateDropTarget;

 
 class wxDropSource;
 
 
 class wxDropSource;
 


@@ -43,178 +40,71 @@ class wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
 // wxDropTarget
 //-------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

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

 
 

-  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 );
-
-  /* called from within OnDrop() to request a certain format
-     from the drop event. */
-  bool RequestData( wxDataFormat format );
+    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();

 
 

-  /* called to query what formats are available */
-  bool IsSupported( wxDataFormat format );
+  // implementation

 
 

-  /* fill data with data from the dragging source */
-  bool GetData( wxDataObject *data );
+    GdkAtom GetMatchingPair();

 
 

-  virtual size_t GetFormatCount() const = 0;
-  virtual wxDataFormat GetFormat(size_t n) const = 0;
-  
-// implementation
+    void RegisterWidget( GtkWidget *widget );
+    void UnregisterWidget( GtkWidget *widget );

 
 

-  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 */

 
 

-  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
-//-------------------------------------------------------------------------
-
-/*
-class wxPrivateDropTarget: public wxDropTarget
-{
-public:
-
-  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 bool OnDropData( long x, long y, void *data, size_t size ) = 0;
-
-  void SetId( const wxString& id ) { m_id = id; }
-  wxString GetId() { return m_id; }
-
-private:
-
-    wxString   m_id;
-};
-*/
-
-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
-
-class wxFileDropTarget: public wxDropTarget
-{
-public:
-
-  wxFileDropTarget() {}
-
-  virtual bool OnData( long x, long y );
-
-  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
 //-------------------------------------------------------------------------
 

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

 
 

-  /* constructor. set data later with SetData() */
-  wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
-
-  wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
-  ~wxDropSource();
-
-  void SetData( wxDataObject& data );
-
-  /* start drag action */
-  wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+    /* constructor for setting one data object */
+    wxDropSource( wxDataObject& data,
+                  wxWindow *win,
+                  const wxIcon &go = wxNullIcon );

 
 

-  /* override to give feedback */
-  virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
+    ~wxDropSource();

 
 

-  /* GTK implementation */
+    /* start drag action */
+    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );

 
 

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

 
 

-    GtkWidget     *m_widget;
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataObject  *m_data;
+    void PrepareIcon( int hot_x, int hot_y, 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_icon;

 
 

-    bool          m_waiting;
+    bool             m_waiting;

 };
 
 #endif
 };
 
 #endif