Version 0.4 of wxPython for MSW.

[wxWidgets.git] / src / gtk1 / dnd.cpp

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index cb081dc8d3dff2ab51a5e37548c136756b6d5d33..458eb72641c80b987c70d1d48034dab000b9ff9a 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -69,7 +69,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
        break;
       case wxDF_FILENAME:
        if (i > 0) formats += ";";
-        formats += "url:any";
+        formats += "file:ALL";
        valid++;
        break;
       default:
@@ -158,7 +158,7 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
   
   delete ptr;
   
-  source->m_retValue = wxDropSource::Copy;
+  source->m_retValue = wxDragCopy;
 }
 
 wxDropSource::wxDropSource( wxWindow *win )
@@ -170,7 +170,7 @@ wxDropSource::wxDropSource( wxWindow *win )
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
   
   m_data = (wxDataObject *) NULL;
-  m_retValue = Cancel;
+  m_retValue = wxDragCancel;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );
@@ -183,7 +183,7 @@ wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
   m_window = win;
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  m_retValue = Cancel;
+  m_retValue = wxDragCancel;
   
   m_data = &data;
 
@@ -203,15 +203,15 @@ wxDropSource::~wxDropSource(void)
   g_blockEventsOnDrag = FALSE;
 }
    
-wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {
-  if (gdk_dnd.dnd_grabbed) return (wxDropSource::DragResult) None;
-  if (gdk_dnd.drag_really) return (wxDropSource::DragResult) None;
+  if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone;
+  if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone;
   
   wxASSERT_MSG( m_data, "wxDragSource: no data" );
   
-  if (!m_data) return (wxDropSource::DragResult) None;
-  if (m_data->GetDataSize() == 0) return (wxDropSource::DragResult) None;
+  if (!m_data) return (wxDragResult) wxDragNone;
+  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
   
   GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
   
@@ -282,7 +282,7 @@ void wxDropSource::RegisterWindow(void)
         formats += "text/plain";
        break;
       case wxDF_FILENAME:
-        formats += "url:any";
+        formats += "file:ALL";
        break;
       default:
         break;