Applied #9076 (scrolling bars grow box fix)

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

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index c43eeca35b9488b6397e351b4640c191faf1fb76..01187d8a4749e293a1efb9fb6880295e9a63169a 100644 (file)
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -1,22 +1,15 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.h
+// Name:        wx/gtk1/dnd.h

 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKDNDH__
 #define __GTKDNDH__
 
 #ifndef __GTKDNDH__
 #define __GTKDNDH__
 

-#ifdef __GNUG__
-#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"


@@ -30,61 +23,50 @@
 // classes
 //-------------------------------------------------------------------------
 
 // classes
 //-------------------------------------------------------------------------
 

-class wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

-class wxDropTarget;
-class wxTextDropTarget;
-class wxFileDropTarget;
-class wxPrivateDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;

 
 

-class wxDropSource;
+class WXDLLIMPEXP_FWD_CORE wxDropSource;
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// 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)

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

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

 {
 public:
 {
 public:

-    wxDropTarget( wxDataObject *data );
-    ~wxDropTarget();
-
-    /* may be overridden to react to events */
-    virtual bool OnEnter( int x, int y );
-  
-    virtual void OnLeave();
+    wxDropTarget(wxDataObject *dataObject = NULL );

 
 

-    /* 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( int x, int 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();

 
 

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

 
 

-    /* this gets called once the data has actually arrived.
-       it will call GetData() to fill up its wxDataObject */
-    virtual bool OnData( int x, int y );
-
-    /* fill data with data from the dragging source */
-    bool GetData();
-
-// implementation
-
-    GdkAtom GetMatchingPair();
+    GdkAtom GetMatchingPair(bool quiet = false);

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

-    wxDataObject       *m_data;

     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
     GtkSelectionData   *m_dragData;
     guint               m_dragTime;
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
     GtkSelectionData   *m_dragData;
     guint               m_dragTime;

-    bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */
+    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 SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
     void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }


@@ -96,56 +78,53 @@ public:
 // 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 WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase

 {
 public:
 {
 public:

-
-  /* 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 );
-
-  /* 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;
-    wxDataObject  *m_data;
-
-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
-
-    wxIcon        m_goIcon;
-    wxIcon        m_stopIcon;
-
-    bool          m_waiting;
+    // constructor. set data later with SetData()
+    wxDropSource( wxWindow *win = NULL,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
+
+    // constructor for setting one data object
+    wxDropSource( wxDataObject& data,
+                  wxWindow *win,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
+
+    virtual ~wxDropSource();
+
+    // start drag action
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
+
+    // GTK implementation
+    void RegisterWindow();
+    void UnregisterWindow();
+
+    void PrepareIcon( int action, GdkDragContext *context );
+
+    GtkWidget       *m_widget;
+    GtkWidget       *m_iconWindow;
+    GdkDragContext  *m_dragContext;
+    wxWindow        *m_window;
+
+    wxDragResult     m_retValue;
+    wxIcon           m_iconCopy,
+                     m_iconMove,
+                     m_iconNone;
+
+    bool             m_waiting;
+
+private:
+    // common part of both ctors
+    void SetIcons(const wxIcon& copy,
+                  const wxIcon& move,
+                  const wxIcon& none);

 };
 
 };
 

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

 
 

-#endif
-       //__GTKDNDH__
+#endif //__GTKDNDH__