X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86f19f7ce546b37e69a710d3f1140b8a7463239d..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/gtk/dnd.h

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 6f877727bc..08a12ec5ea 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
+    
+    GdkAtom GtkGetMatchingPair();
 
-    void RegisterWidget( GtkWidget *widget );
-    void UnregisterWidget( GtkWidget *widget );
+    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 &copy = wxNullIcon,
                   const wxIcon &move = wxNullIcon,
                   const wxIcon &none = wxNullIcon);