uint to unsigned int

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 896763a93c327f7c5c89340bff179bd7b51ed8b3..458eb72641c80b987c70d1d48034dab000b9ff9a 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -14,6 +14,7 @@
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
+#include <wx/intl.h>
 
 #include "gdk/gdkprivate.h"
 
@@ -31,32 +32,32 @@ extern bool g_blockEventsOnDrag;
 
 wxDropTarget::wxDropTarget()
 {
-};
+}
 
 wxDropTarget::~wxDropTarget()
 {
-};
+}
 
 void wxDropTarget::Drop( GdkEvent *event, int x, int y )
 {
   printf( "Drop data is of type %s.\n", event->dropdataavailable.data_type );
   
   OnDrop( x, y, (char *)event->dropdataavailable.data);
-};
+}
 
 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 )
 {
   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) 
@@ -68,18 +69,18 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
        break;
       case wxDF_FILENAME:
        if (i > 0) formats += ";";
-        formats += "url:any";
+        formats += "file:ALL";
        valid++;
        break;
       default:
         break;
-    };
+    }
   }
   
   char *str = WXSTRINGCAST formats;
   
   gtk_widget_dnd_drop_set( widget, TRUE, &str, valid, FALSE );
-};
+}
 
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
@@ -89,14 +90,14 @@ bool wxTextDropTarget::OnDrop( long x, long y, const void *pData )
 {
   OnDropText( x, y, (const char*)pData );
   return TRUE;
-};
+}
 
 bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
 {
   printf( "Got dropped text: %s.\n", psz );
   printf( "At x: %d, y: %d.\n", (int)x, (int)y );
   return TRUE;
-};
+}
 
 size_t wxTextDropTarget::GetFormatCount() const
 {
@@ -143,18 +144,22 @@ wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
 //-----------------------------------------------------------------------------
 // drag request
 
-void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDataObject *data )
+void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source )
 {
   printf( "Data requested for dropping.\n" );
   
-  uint size = data->GetDataSize();
+  wxDataObject *data = source->m_data;
+  
+  size_t size = data->GetDataSize();
   char *ptr = new char[size];
   data->GetDataHere( ptr );
   
   gtk_widget_dnd_data_set( widget, event, ptr, size );
   
   delete ptr;
-};
+  
+  source->m_retValue = wxDragCopy;
+}
 
 wxDropSource::wxDropSource( wxWindow *win )
 {
@@ -164,11 +169,12 @@ wxDropSource::wxDropSource( wxWindow *win )
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
   
-  m_data = NULL;  
+  m_data = (wxDataObject *) NULL;
+  m_retValue = wxDragCancel;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-};
+}
 
 wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
 {
@@ -177,32 +183,35 @@ 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 = wxDragCancel;
   
   m_data = &data;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-};
+}
 
 void wxDropSource::SetData( wxDataObject &data )
 {
   m_data = &data;  
-};
+}
 
 wxDropSource::~wxDropSource(void)
 {
 //  if (m_data) delete m_data;
 
   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;
   
@@ -217,8 +226,8 @@ 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;
   
   XWindowAttributes dnd_winattr;
@@ -246,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 );
   
@@ -254,8 +263,10 @@ wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
   
   UnregisterWindow();
   
-  return Copy;
-};
+  g_blockEventsOnDrag = FALSE;
+  
+  return m_retValue;
+}
 
 void wxDropSource::RegisterWindow(void)
 {
@@ -271,7 +282,7 @@ void wxDropSource::RegisterWindow(void)
         formats += "text/plain";
        break;
       case wxDF_FILENAME:
-        formats += "url:any";
+        formats += "file:ALL";
        break;
       default:
         break;
@@ -282,14 +293,14 @@ void wxDropSource::RegisterWindow(void)
   gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );
 
   gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-    GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)m_data );
-};
+    GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
+}
 
 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)m_data );
-};
+  gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this );
+}