more fixes, printing works quite fine now

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 71a4a2e6ed185c878a11dc81eb54ea80f2c24013..4090bb15ec5685ff0a10a3e5a97925c74b71ad7a 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -2,8 +2,9 @@
 // Name:        dnd.cpp
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
-// Copyright:   Robert Roebling
-// Licence:     wxWindows license
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:    wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -49,7 +50,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 )
@@ -57,7 +58,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
   wxString formats;
   int valid = 0;
   
-  for ( uint i = 0; i < GetFormatCount(); i++ )
+  for ( size_t i = 0; i < GetFormatCount(); i++ )
   {
     wxDataFormat df = GetFormat( i );
     switch (df) 
@@ -69,7 +70,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
        break;
       case wxDF_FILENAME:
        if (i > 0) formats += ";";
-        formats += "url:any";
+        formats += "file:ALL";
        valid++;
        break;
       default:
@@ -150,7 +151,7 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
   
   wxDataObject *data = source->m_data;
   
-  uint size = data->GetDataSize();
+  size_t size = data->GetDataSize();
   char *ptr = new char[size];
   data->GetDataHere( ptr );
   
@@ -158,7 +159,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 +170,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 +184,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 +204,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 +227,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 +256,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 +283,7 @@ void wxDropSource::RegisterWindow(void)
         formats += "text/plain";
        break;
       case wxDF_FILENAME:
-        formats += "url:any";
+        formats += "file:ALL";
        break;
       default:
         break;
@@ -300,7 +301,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 );
 }