X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30dea05497c1f00d72d7dbf7f2f4818dfaa0e500..b926666447f1ceef18873cdd80966402a3ece222:/src/gtk1/dnd.cpp diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 2498e7c423..4090bb15ec 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__ @@ -32,32 +33,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) @@ -69,18 +70,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 @@ -90,14 +91,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 { @@ -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,8 +159,8 @@ 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,12 +170,12 @@ 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 ); -}; +} wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) { @@ -183,35 +184,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 = Cancel; + 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( data, "wxDragSource: no data" ); + 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,8 +227,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; @@ -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 ); @@ -266,7 +267,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) g_blockEventsOnDrag = FALSE; return m_retValue; -}; +} void wxDropSource::RegisterWindow(void) { @@ -282,7 +283,7 @@ void wxDropSource::RegisterWindow(void) formats += "text/plain"; break; case wxDF_FILENAME: - formats += "url:any"; + formats += "file:ALL"; break; default: break; @@ -294,13 +295,13 @@ void wxDropSource::RegisterWindow(void) gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event", 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)this ); -}; +}