Fixed OS/2 compilation problems.

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index c437f0b3b13fae417177c1839e97131c15bf46a7..52199517b47c017dae7450e935b909d1174f9862 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -36,6 +36,16 @@ class wxFileDropTarget;
 
 class wxDropSource;
 
 
 class wxDropSource;
 

+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// this macro may be used instead for wxDropSource ctor arguments: it will use
+// the icon 'name' from an XPM file under GTK, but will expand to something
+// else under MSW. If you don't use it, you will have to use #ifdef in the
+// application code.
+#define wxDROP_ICON(name)   wxICON(name)
+

 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------


@@ -44,10 +54,10 @@ class wxDropTarget: public wxDropTargetBase
 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );

-    
+

     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(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
     virtual bool GetData();
 
   // implementation


@@ -69,37 +79,6 @@ public:
     void SetDragTime( guint time ) { m_dragTime = time; }
 };
 
     void SetDragTime( guint time ) { m_dragTime = time; }
 };
 

-// ----------------------------------------------------------------------------
-// A simple wxDropTarget derived class for text data: you only need to
-// override OnDropText() to get something working
-// ----------------------------------------------------------------------------
-
-class wxTextDropTarget : public wxDropTarget
-{
-public:
-    wxTextDropTarget();
-
-    virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
-
-    virtual bool OnData(wxCoord x, wxCoord y);
-};
-
-// ----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-// ----------------------------------------------------------------------------
-
-class wxFileDropTarget : public wxDropTarget
-{
-public:
-    wxFileDropTarget();
-
-    // parameters are the number of files and the array of file names
-    virtual bool OnDropFiles(wxCoord x, wxCoord y,
-                             const wxArrayString& filenames) = 0;
-
-    virtual bool OnData(wxCoord x, wxCoord y);
-};
-

 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------


@@ -108,13 +87,17 @@ class wxDropSource: public wxDropSourceBase
 {
 public:
     /* constructor. set data later with SetData() */
 {
 public:
     /* constructor. set data later with SetData() */

-    wxDropSource( wxWindow *win,
-                  const wxIcon &go = wxNullIcon );
+    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);

 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,
 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,

-                  const wxIcon &go = wxNullIcon );
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);

 
     ~wxDropSource();
 
 
     ~wxDropSource();
 


@@ -125,17 +108,25 @@ public:
     void RegisterWindow();
     void UnregisterWindow();
 
     void RegisterWindow();
     void UnregisterWindow();
 

-    void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
-    
+    void PrepareIcon( int action, GdkDragContext *context );
+

     GtkWidget       *m_widget;
     GtkWidget       *m_iconWindow;
     GdkDragContext  *m_dragContext;
     wxWindow        *m_window;
     GtkWidget       *m_widget;
     GtkWidget       *m_iconWindow;
     GdkDragContext  *m_dragContext;
     wxWindow        *m_window;

-    
+

     wxDragResult     m_retValue;
     wxDragResult     m_retValue;

-    wxIcon           m_icon;
-    
+    wxIcon           m_iconCopy,
+                     m_iconMove,
+                     m_iconNone;
+

     bool             m_waiting;
     bool             m_waiting;

+
+private:
+    // common part of both ctors
+    void SetIcons(const wxIcon& copy,
+                  const wxIcon& move,
+                  const wxIcon& none);

 };
 
 #endif
 };
 
 #endif