Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index f4cd2992d2f2e8919e45e6963f77c0312deceba0..56fc48de6ab3d7b1825dd1077f1d0e4ad419cec2 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -29,19 +29,23 @@
 class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
 {
 public:
 class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
 {
 public:

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

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

-  // implementation
+    // Can only be called during OnXXX methods.
+    wxDataFormat GetMatchingPair();

 
 

-    GdkAtom GetMatchingPair();
+    // implementation

 
 

-    void RegisterWidget( GtkWidget *widget );
-    void UnregisterWidget( GtkWidget *widget );
+    GdkAtom GTKGetMatchingPair(bool quiet = false);
+    wxDragResult GTKFigureOutSuggestedAction();
+
+    void GtkRegisterWidget( GtkWidget *widget );
+    void GtkUnregisterWidget( GtkWidget *widget );

 
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
 
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;


@@ -49,10 +53,10 @@ public:
     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
 

-    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 GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
+    void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
+    void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
+    void GTKSetDragTime( guint time ) { m_dragTime = time; }

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


@@ -63,7 +67,7 @@ class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase
 {
 public:
     // constructor. set data later with SetData()
 {
 public:
     // constructor. set data later with SetData()

-    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+    wxDropSource( wxWindow *win = NULL,

                   const wxIcon &copy = wxNullIcon,
                   const wxIcon &move = wxNullIcon,
                   const wxIcon &none = wxNullIcon);
                   const wxIcon &copy = wxNullIcon,
                   const wxIcon &move = wxNullIcon,
                   const wxIcon &none = wxNullIcon);


@@ -80,10 +84,6 @@ public:
     // start drag action
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
     // 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;
     void PrepareIcon( int action, GdkDragContext *context );
 
     GtkWidget       *m_widget;


@@ -103,6 +103,11 @@ private:
     void SetIcons(const wxIcon& copy,
                   const wxIcon& move,
                   const wxIcon& none);
     void SetIcons(const wxIcon& copy,
                   const wxIcon& move,
                   const wxIcon& none);

+
+    // GTK implementation
+    void GTKConnectDragSignals();
+    void GTKDisconnectDragSignals();
+

 };
 
 #endif // _WX_GTK_DND_H_
 };
 
 #endif // _WX_GTK_DND_H_