Tried to find a non-existing bug in the cursor-code

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 9ba46a6c2c9bc46a89a6788da64067a449f62aa9..dac170064ab127cb12195c9669a229273904839d 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -14,6 +14,7 @@
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"

+#include <wx/intl.h>

 
 #include "gdk/gdkprivate.h"
 
 
 #include "gdk/gdkprivate.h"
 


@@ -31,23 +32,55 @@ extern bool g_blockEventsOnDrag;
 
 wxDropTarget::wxDropTarget()
 {
 
 wxDropTarget::wxDropTarget()
 {

-};
+}

 
 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::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 )
 {
 
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {

-  gtk_widget_dnd_drop_set( widget, FALSE, NULL, 0, FALSE );
-};
+  if (!widget) return;
+  
+  gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
+}
+
+void wxDropTarget::RegisterWidget( GtkWidget *widget )
+{
+  wxString formats;
+  int valid = 0;
+  
+  for ( size_t i = 0; i < GetFormatCount(); i++ )
+  {
+    wxDataFormat df = GetFormat( i );
+    switch (df) 
+    {
+      case wxDF_TEXT:
+       if (i > 0) formats += ";";
+        formats += "text/plain";
+       valid++;
+       break;
+      case wxDF_FILENAME:
+       if (i > 0) formats += ";";
+        formats += "file:ALL";
+       valid++;
+       break;
+      default:
+        break;
+    }
+  }
+  
+  char *str = WXSTRINGCAST formats;
+  
+  gtk_widget_dnd_drop_set( widget, TRUE, &str, valid, FALSE );
+}

 
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
 
 // ----------------------------------------------------------------------------
 // wxTextDropTarget


@@ -57,72 +90,132 @@ bool wxTextDropTarget::OnDrop( long x, long y, const void *pData )
 {
   OnDropText( x, y, (const char*)pData );
   return TRUE;
 {
   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;
 
 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
+{
+  return 1;
+}
+
+wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+{
+  return wxDF_TEXT;
+}
+
+// ----------------------------------------------------------------------------
+// wxFileDropTarget
+// ----------------------------------------------------------------------------
+
+bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const WXUNUSED(aszFiles)[] )
+{
+  printf( "Got %d dropped files.\n", (int)nFiles );
+  printf( "At x: %d, y: %d.\n", (int)x, (int)y );
+  return TRUE;
+}

 
 

-void wxTextDropTarget::RegisterWidget( GtkWidget *widget )
+bool wxFileDropTarget::OnDrop(long x, long y, const void *WXUNUSED(pData) )

 {
 {

-  char *accepted_drop_types[] = { "text/plain" };
-  gtk_widget_dnd_drop_set( widget, TRUE, accepted_drop_types, 1, FALSE );
-};
+  char *str = "/this/is/a/path.txt";
+
+  return OnDropFiles(x, y, 1, &str ); 
+}
+
+size_t wxFileDropTarget::GetFormatCount() const
+{
+  return 1;
+}
+
+wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
+{
+  return wxDF_FILENAME;
+}

 
 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------

-// wxDragSource
+// wxDropSource

 //-------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // drag request
 
 //-------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // drag request
 

-void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDragSource *drag )
+void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source )

 {
 {

-  printf( "OnDragRequest.\n" );
+  printf( "Data requested for dropping.\n" );
+  
+  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;

   
   

-  gtk_widget_dnd_data_set( widget, event, drag->m_data, drag->m_size );
-};
+  source->m_retValue = wxDropSource::Copy;
+}

 
 

-wxDragSource::wxDragSource( wxWindow *win )
+wxDropSource::wxDropSource( wxWindow *win )

 {
   g_blockEventsOnDrag = TRUE;
 {
   g_blockEventsOnDrag = TRUE;

+  
+  m_window = win;
+  m_widget = win->m_widget;
+  if (win->m_wxwindow) m_widget = win->m_wxwindow;
+  
+  m_data = (wxDataObject *) NULL;
+  m_retValue = Cancel;
+
+  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+}

 
 

+wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
+{
+  g_blockEventsOnDrag = TRUE;
+  

   m_window = win;
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
   m_window = win;
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;

- 
-  m_data = NULL;
-  m_size = 0;
+  m_retValue = Cancel;

   
   

+  m_data = &data;
+

   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );

-};
+}

 
 

-wxDragSource::~wxDragSource(void)
+void wxDropSource::SetData( wxDataObject &data )

 {
 {

-  g_blockEventsOnDrag = FALSE;
-};
-   
-void wxDragSource::SetData( char *data, long size )
+  m_data = &data;  
+}
+
+wxDropSource::~wxDropSource(void)

 {
 {

-  m_size = size;
-  m_data = data;
-};
+//  if (m_data) delete m_data;

 
 

-void wxDragSource::Start( int x, int y )
+  g_blockEventsOnDrag = FALSE;
+}
+   
+wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )

 {
 {

-  if (gdk_dnd.dnd_grabbed) return;
-  if (gdk_dnd.drag_really) return;
-  if (m_size == 0) return;
-  if (!m_data) return;
+  if (gdk_dnd.dnd_grabbed) return (wxDropSource::DragResult) None;
+  if (gdk_dnd.drag_really) return (wxDropSource::DragResult) None;
+  
+  wxASSERT_MSG( m_data, "wxDragSource: no data" );
+  
+  if (!m_data) return (wxDropSource::DragResult) None;
+  if (m_data->GetDataSize() == 0) return (wxDropSource::DragResult) None;

   
   GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
   
   RegisterWindow();
   
   GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
   
   RegisterWindow();

-  ConnectWindow();

   
   gdk_dnd.drag_perhaps = TRUE;
 
   
   gdk_dnd.drag_perhaps = TRUE;
 


@@ -133,8 +226,8 @@ void wxDragSource::Start( int x, int y )
   if (gdk_dnd.drag_startwindows)
   {
     g_free( gdk_dnd.drag_startwindows );
   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;
   gdk_dnd.drag_numwindows = gdk_dnd.drag_really = 0;
   
   XWindowAttributes dnd_winattr;


@@ -159,49 +252,55 @@ void wxDragSource::Start( int x, int y )
   
   gdk_dnd.dnd_grabbed = TRUE;
   gdk_dnd.drag_really = 1;
   
   gdk_dnd.dnd_grabbed = TRUE;
   gdk_dnd.drag_really = 1;

+  
+  int x = 0;
+  int y = 0;
+  gdk_window_get_pointer( m_widget->window, &x, &y, (GdkModifierType *) NULL );
+  

   gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE );
   
   while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield();
   
   gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE );
   
   while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield();
   

-  UnconnectWindow();

   UnregisterWindow();
   UnregisterWindow();

-};
+  
+  g_blockEventsOnDrag = FALSE;
+  
+  return m_retValue;
+}

 
 

-void wxDragSource::ConnectWindow(void)
+void wxDropSource::RegisterWindow(void)

 {
 {

-  gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-    GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
-};
+  if (!m_data) return;

 
 

-void wxDragSource::UnconnectWindow(void)
-{
-  if (!m_widget) return;
+  wxString formats;
+    
+  wxDataFormat df = m_data->GetPreferredFormat();

   
   

-  gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this );
-};
-
-void wxDragSource::UnregisterWindow(void)
-{
-  if (!m_widget) return;
+    switch (df) 
+    {
+      case wxDF_TEXT: 
+        formats += "text/plain";
+       break;
+      case wxDF_FILENAME:
+        formats += "file:ALL";
+       break;
+      default:
+        break;
+    }

   
   

-  gtk_widget_dnd_drag_set( m_widget, FALSE, NULL, 0 );
-};
+  char *str = WXSTRINGCAST formats;

   
   

-//-------------------------------------------------------------------------
-// wxTextDragSource
-//-------------------------------------------------------------------------
+  gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );

 
 

-void wxTextDragSource::SetTextData( const wxString &text )
-{
-  m_tmp = text;
-  SetData( WXSTRINGCAST(m_tmp), m_tmp.Length()+1 );
-};
+  gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
+    GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
+}

 
 

-void wxTextDragSource::RegisterWindow(void)
+void wxDropSource::UnregisterWindow(void)

 {
   if (!m_widget) return;
   
 {
   if (!m_widget) return;
   

-  char *accepted_drop_types[] = { "text/plain" };
-  gtk_widget_dnd_drag_set( m_widget, TRUE, accepted_drop_types, 1 );
-};
-
+  gtk_widget_dnd_drag_set( m_widget, FALSE, (gchar **) NULL, 0 );
+  
+  gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this );
+}