X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0416c41834f36316a03720c4ed05cdf36964a2f3..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/gtk/dnd.h?ds=sidebyside diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h index f4cd2992d2..ee679af13f 100644 --- a/include/wx/gtk/dnd.h +++ b/include/wx/gtk/dnd.h @@ -29,19 +29,22 @@ 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(); - // 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); + + void GtkRegisterWidget( GtkWidget *widget ); + void GtkUnregisterWidget( GtkWidget *widget ); GdkDragContext *m_dragContext; GtkWidget *m_dragWidget; @@ -49,10 +52,10 @@ public: 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 +66,7 @@ class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase { public: // constructor. set data later with SetData() - wxDropSource( wxWindow *win = (wxWindow *)NULL, + wxDropSource( wxWindow *win = NULL, const wxIcon © = wxNullIcon, const wxIcon &move = wxNullIcon, const wxIcon &none = wxNullIcon); @@ -80,10 +83,6 @@ public: // 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; @@ -103,6 +102,11 @@ private: void SetIcons(const wxIcon& copy, const wxIcon& move, const wxIcon& none); + + // GTK implementation + void GTKConnectDragSignals(); + void GTKDisconnectDragSignals(); + }; #endif // _WX_GTK_DND_H_