1. wxFontMapper almost finished

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index edc321382d78315802601c0259b95b3b435e7fad..380d5c1d6a26bf63cfd70c5d37ae8da19a455268 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -33,7 +33,6 @@ class wxWindow;
 class wxDropTarget;
 class wxTextDropTarget;
 class wxFileDropTarget;
-class wxPrivateDropTarget;
 
 class wxDropSource;
 
@@ -45,16 +44,16 @@ class wxDropTarget: public wxDropTargetBase
 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
-    
-    virtual bool OnEnter(wxCoord x, wxCoord y) ;
-    virtual bool OnMove(wxCoord x, wxCoord y);
+
+    virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);
-    virtual bool OnData(wxCoord x, wxCoord y);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
 
   // implementation
 
     GdkAtom GetMatchingPair();
+
     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );
 
@@ -79,14 +78,12 @@ class wxDropSource: public wxDropSourceBase
 public:
     /* constructor. set data later with SetData() */
     wxDropSource( wxWindow *win,
-                  const wxIcon &go = wxNullIcon,
-                  const wxIcon &stop = wxNullIcon );
+                  const wxIcon &go = wxNullIcon );
 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,
-                  const wxIcon &go = wxNullIcon,
-                  const wxIcon &stop = wxNullIcon );
+                  const wxIcon &go = wxNullIcon );
 
     ~wxDropSource();
 
@@ -97,18 +94,17 @@ public:
     void RegisterWindow();
     void UnregisterWindow();
 
-    GtkWidget     *m_widget;
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataObject  *m_data;
+    void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
 
-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
+    GtkWidget       *m_widget;
+    GtkWidget       *m_iconWindow;
+    GdkDragContext  *m_dragContext;
+    wxWindow        *m_window;
 
-    wxIcon        m_goIcon;
-    wxIcon        m_stopIcon;
+    wxDragResult     m_retValue;
+    wxIcon           m_icon;
 
-    bool          m_waiting;
+    bool             m_waiting;
 };
 
 #endif