X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c86f1403c3737c07d58676a203f4707942684a01..41dee9d0ce93989c03848ebd7fc21fb402d4c247:/src/gtk1/dnd.cpp diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index c84b714204..a9fa2f763a 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/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__ @@ -26,9 +27,14 @@ extern bool g_blockEventsOnDrag; -// ---------------------------------------------------------------------------- -// wxDropTarget -// ---------------------------------------------------------------------------- + +#if (GTK_MINOR_VERSION == 1) +#if (GTK_MICRO_VERSION >= 3) +#define NEW_GTK_DND_CODE +#endif +#endif + +#ifdef NEW_GTK_DND_CODE wxDropTarget::wxDropTarget() { @@ -38,18 +44,239 @@ wxDropTarget::~wxDropTarget() { } -void wxDropTarget::Drop( GdkEvent *event, int x, int y ) +void wxDropTarget::UnregisterWidget( GtkWidget *widget ) +{ + if (!widget) return; + + // TODO +} + +void wxDropTarget::RegisterWidget( GtkWidget *widget ) +{ + if (!widget) return; + + 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; + + // TODO +} + +// ---------------------------------------------------------------------------- +// wxTextDropTarget +// ---------------------------------------------------------------------------- + +bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) +{ + OnDropText( x, y, (const char*)data ); + 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 aszFiles[] ) +{ + printf( "Got %d dropped files.\n", (int)nFiles ); + printf( "At x: %d, y: %d.\n", (int)x, (int)y ); + for (size_t i = 0; i < nFiles; i++) + { + printf( aszFiles[i] ); + printf( "\n" ); + } + return TRUE; +} + +bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) +{ + size_t number = 0; + char *text = (char*) data; + for (size_t i = 0; i < size; i++) + if (text[i] == 0) number++; + + if (number == 0) return TRUE; + + char **files = new char*[number]; + + text = (char*) data; + for (size_t i = 0; i < number; i++) + { + files[i] = text; + int len = strlen( text ); + text += len+1; + } + + bool ret = OnDropFiles( x, y, 1, files ); + + free( files ); + + return ret; +} + +size_t wxFileDropTarget::GetFormatCount() const +{ + return 1; +} + +wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const +{ + return wxDF_FILENAME; +} + +//------------------------------------------------------------------------- +// wxDropSource +//------------------------------------------------------------------------- + +wxDropSource::wxDropSource( wxWindow *win ) +{ + 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 = wxDragCancel; + + 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_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; +} + +wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) { - printf( "Drop data is of type %s.\n", event->dropdataavailable.data_type ); + wxASSERT_MSG( m_data, "wxDragSource: no data" ); + + if (!m_data) return (wxDragResult) wxDragNone; + if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; + + RegisterWindow(); + + // TODO - OnDrop( x, y, (char *)event->dropdataavailable.data); + UnregisterWindow(); + + g_blockEventsOnDrag = FALSE; + + return m_retValue; +} + +void wxDropSource::RegisterWindow(void) +{ + if (!m_data) return; + + wxString formats; + + wxDataFormat df = m_data->GetPreferredFormat(); + + switch (df) + { + case wxDF_TEXT: + formats += "text/plain"; + break; + case wxDF_FILENAME: + formats += "file:ALL"; + break; + default: + break; + } + + char *str = WXSTRINGCAST formats; + + // TODO +} + +void wxDropSource::UnregisterWindow(void) +{ + if (!m_widget) return; + + // TODO +} + +#else + +// ---------------------------------------------------------------------------- +// wxDropTarget +// ---------------------------------------------------------------------------- + +wxDropTarget::wxDropTarget() +{ +} + +wxDropTarget::~wxDropTarget() +{ } 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 +296,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) break; case wxDF_FILENAME: if (i > 0) formats += ";"; - formats += "url:any"; + formats += "file:ALL"; valid++; break; default: @@ -86,9 +313,9 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) // wxTextDropTarget // ---------------------------------------------------------------------------- -bool wxTextDropTarget::OnDrop( long x, long y, const void *pData ) +bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) { - OnDropText( x, y, (const char*)pData ); + OnDropText( x, y, (const char*)data ); return TRUE; } @@ -113,18 +340,42 @@ wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const // wxFileDropTarget // ---------------------------------------------------------------------------- -bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const WXUNUSED(aszFiles)[] ) +bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) { printf( "Got %d dropped files.\n", (int)nFiles ); printf( "At x: %d, y: %d.\n", (int)x, (int)y ); + for (size_t i = 0; i < nFiles; i++) + { + printf( aszFiles[i] ); + printf( "\n" ); + } return TRUE; } -bool wxFileDropTarget::OnDrop(long x, long y, const void *WXUNUSED(pData) ) +bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { - char *str = "/this/is/a/path.txt"; + size_t number = 0; + char *text = (char*) data; + for (size_t i = 0; i < size; i++) + if (text[i] == 0) number++; + + if (number == 0) return TRUE; + + char **files = new char*[number]; + + text = (char*) data; + for (size_t i = 0; i < number; i++) + { + files[i] = text; + int len = strlen( text ); + text += len+1; + } - return OnDropFiles(x, y, 1, &str ); + bool ret = OnDropFiles( x, y, 1, files ); + + free( files ); + + return ret; } size_t wxFileDropTarget::GetFormatCount() const @@ -158,7 +409,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 +420,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 +434,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 +454,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 +477,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 +506,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 +533,7 @@ void wxDropSource::RegisterWindow(void) formats += "text/plain"; break; case wxDF_FILENAME: - formats += "url:any"; + formats += "file:ALL"; break; default: break; @@ -300,7 +551,11 @@ 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 ); } + +#endif + // NEW_GTK_DND_CODE +