Corrected hotkeys for MDI menus.

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 2eccb9c9d66a43e6a323ad34706a4cc6d68395cb..0e76509e1ab09807074a4126f0cdf8dfe57df315 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -17,14 +17,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-//-------------------------------------------------------------------------
-// conditional compilation
-//-------------------------------------------------------------------------
-
-#if (GTK_MINOR_VERSION > 0)
-#define NEW_GTK_DND_CODE
-#endif
-

 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/object.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/object.h"


@@ -53,27 +45,55 @@ class wxDropSource;
 
 class wxDropTarget: public wxObject
 {
 
 class wxDropTarget: public wxObject
 {

-  public:
+public:

 
 

-    wxDropTarget();
-    ~wxDropTarget();
+  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: 
+  /* may be overridden to react to events */
+  virtual void OnEnter();
+  virtual void OnLeave();

   
   

-    virtual size_t GetFormatCount() const = 0;
-    virtual wxDataFormat &GetFormat(size_t n) const;
+  /* 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 );
+    
+  /* 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. 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 );

   
   

-    void RegisterWidget( GtkWidget *widget );
-    void UnregisterWidget( GtkWidget *widget );
-    
-    wxDataFormat  *m_format;
+  /* fill data with data from the dragging source */
+  bool GetData( wxDataObject *data );
+
+// 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; }

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


@@ -82,15 +102,17 @@ class wxDropTarget: public wxObject
 
 class wxTextDropTarget: public wxDropTarget
 {
 
 class wxTextDropTarget: public wxDropTarget
 {

-  public:
+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 );
+  wxTextDropTarget() {}
+
+  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 */
+  virtual bool OnDropText( int x, int y, const wxChar *text ) = 0;

     
     

-  protected:
-  
-    virtual size_t GetFormatCount() const;

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


@@ -101,25 +123,29 @@ class wxPrivateDropTarget: public wxDropTarget
 {
 public:
 
 {
 public:
 

+  /* sets id to "application/myprogram" where "myprogram" is the
+     same as wxApp->GetAppName() */

   wxPrivateDropTarget();
   wxPrivateDropTarget();

+  /* see SetId() below for explanation */
+  wxPrivateDropTarget( const wxString &id );

   
   

-  // 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".
-    
-  void SetId( const wxString& id );
-    
-  wxString GetId()
-      { return m_id; }
-
+  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;
+    
+  /* 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". */
+  void SetId( const wxString& id ) { m_id = id; }
+  wxString GetId() { return m_id; }
+      

 private:
 
 private:
 

-  virtual size_t GetFormatCount() const;
-    
-  wxString   m_id;
+    wxString   m_id;

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


@@ -128,17 +154,17 @@ private:
 
 class wxFileDropTarget: public wxDropTarget
 {
 
 class wxFileDropTarget: public wxDropTarget
 {

-  public:
+public:

     
     

-    wxFileDropTarget();
+  wxFileDropTarget() {}

     
     

-    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:
+  virtual bool OnMove( int x, int y );
+  virtual bool OnDrop( int x, int y );
+  virtual bool OnData( int x, int y );

   
   

-    virtual size_t GetFormatCount() const;
+  /* you have to override OnDropFiles to get at the file names */
+  virtual bool OnDropFiles( int x, int y, size_t nFiles, const wxChar * const aszFiles[] ) = 0;
+

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


@@ -156,35 +182,35 @@ enum wxDragResult
 
 class wxDropSource: public wxObject
 {
 
 class wxDropSource: public wxObject
 {

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

     
     

-    /* set one dataobject */
-    void SetData( wxDataBroker *data );
+  /* constructor for setting one data object */
+  wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );

     
     

-    /* set severa dataobjects via wxDataBroker */
-    void SetData( wxDataObject *data );
+  /* constructor for setting several data objects via wxDataBroker */
+  wxDropSource( wxDataBroker *data, wxWindow *win );
+
+  ~wxDropSource();

     
     

-    /* start drag action */
-    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+  /* 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; }
+  /* override to give feedback */
+  virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }

   
   /* GTK implementation */
       
   
   /* GTK implementation */
       

-    void RegisterWindow(void);
-    void UnregisterWindow(void);
+  void RegisterWindow();
+  void UnregisterWindow();

   
     GtkWidget     *m_widget;
     wxWindow      *m_window;
   
     GtkWidget     *m_widget;
     wxWindow      *m_window;


@@ -196,6 +222,8 @@ class wxDropSource: public wxObject
     
     wxIcon        m_goIcon;
     wxIcon        m_stopIcon;
     
     wxIcon        m_goIcon;
     wxIcon        m_stopIcon;

+    
+    bool          m_waiting;

 };
 
 #endif
 };
 
 #endif