X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c86f1403c3737c07d58676a203f4707942684a01..9c039d08bfbb59c0abcbc705fb49f9b2cb321edf:/src/gtk1/dnd.cpp

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index c84b714204..458eb72641 100644
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -49,7 +49,7 @@ void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {
   if (!widget) return;
   
-  gtk_widget_dnd_drop_set( widget, FALSE, NULL, 0, FALSE );
+  gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
 }
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
@@ -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 )
@@ -169,8 +169,8 @@ wxDropSource::wxDropSource( wxWindow *win )
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
   
-  m_data = NULL;
-  m_retValue = Cancel;
+  m_data = (wxDataObject *) NULL;
+  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 None;
-  if (gdk_dnd.drag_really) return 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 None;
-  if (m_data->GetDataSize() == 0) return None;
+  if (!m_data) return (wxDragResult) wxDragNone;
+  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
   
   GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
   
@@ -226,7 +226,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
   if (gdk_dnd.drag_startwindows)
   {
     g_free( gdk_dnd.drag_startwindows );
-    gdk_dnd.drag_startwindows = NULL;
+    gdk_dnd.drag_startwindows = (GdkWindow **) NULL;
   }
   gdk_dnd.drag_numwindows = gdk_dnd.drag_really = 0;
   
@@ -255,7 +255,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
   
   int x = 0;
   int y = 0;
-  gdk_window_get_pointer( m_widget->window, &x, &y, NULL );
+  gdk_window_get_pointer( m_widget->window, &x, &y, (GdkModifierType *) NULL );
   
   gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE );
   
@@ -282,7 +282,7 @@ void wxDropSource::RegisterWindow(void)
         formats += "text/plain";
 	break;
       case wxDF_FILENAME:
-        formats += "url:any";
+        formats += "file:ALL";
 	break;
       default:
         break;
@@ -300,7 +300,7 @@ void wxDropSource::UnregisterWindow(void)
 {
   if (!m_widget) return;
   
-  gtk_widget_dnd_drag_set( m_widget, FALSE, NULL, 0 );
+  gtk_widget_dnd_drag_set( m_widget, FALSE, (gchar **) NULL, 0 );
   
   gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this );
 }