X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..88932ec82d048d006cdc81bd309f5e59aee799ac:/src/x11/dnd.cpp diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp index 798af946bd..d555b2ef61 100644 --- a/src/x11/dnd.cpp +++ b/src/x11/dnd.cpp @@ -1,23 +1,31 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/x11/dnd.cpp // Purpose: wxDropTarget, wxDropSource classes // Author: Julian Smart // Id: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) + #pragma hdrstop +#endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -#include "wx/window.h" -#include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/intl.h" -#include "wx/utils.h" -#include "wx/log.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/gdicmn.h" +#endif #include <X11/Xlib.h> @@ -44,14 +52,14 @@ wxDropTarget::~wxDropTarget() bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) { OnDropText( x, y, (const char*)data ); - return TRUE; + return true; } bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) { wxLogDebug( "Got dropped text: %s.", psz ); wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y ); - return TRUE; + return true; } size_t wxTextDropTarget::GetFormatCount() const @@ -77,7 +85,7 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * { wxLogDebug( aszFiles[i] ); } - return TRUE; + return true; } bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) @@ -88,10 +96,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) for (i = 0; i < size; i++) if (text[i] == 0) number++; - if (number == 0) return TRUE; - + if (number == 0) return true; + char **files = new char*[number]; - + text = (char*) data; for ( i = 0; i < number; i++) { @@ -100,10 +108,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) text += len+1; } - bool ret = OnDropFiles( x, y, 1, files ); - + bool ret = OnDropFiles( x, y, 1, files ); + free( files ); - + return ret; } @@ -125,7 +133,7 @@ wxDropSource::wxDropSource( wxWindow *win ) { #if 0 m_window = win; - m_data = (wxDataObject *) NULL; + m_data = NULL; m_retValue = wxDragCancel; m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); @@ -136,13 +144,13 @@ wxDropSource::wxDropSource( wxWindow *win ) wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) { #if 0 - g_blockEventsOnDrag = TRUE; - + 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 ); @@ -159,7 +167,7 @@ wxDropSource::~wxDropSource(void) { // if (m_data) delete m_data; } - + wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) ) { // wxASSERT_MSG( m_data, "wxDragSource: no data" ); @@ -168,15 +176,15 @@ wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) ) #if 0 if (!m_data) return (wxDragResult) wxDragNone; if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; - + RegisterWindow(); - + // TODO - + UnregisterWindow(); - - g_blockEventsOnDrag = FALSE; - + + g_blockEventsOnDrag = false; + return m_retValue; #endif } @@ -187,30 +195,30 @@ void wxDropSource::RegisterWindow(void) if (!m_data) return; wxString formats; - + wxDataFormat df = m_data->GetPreferredFormat(); - - switch (df) + + switch (df) { - case wxDF_TEXT: + case wxDF_TEXT: formats += "text/plain"; - break; + break; case wxDF_FILENAME: formats += "file:ALL"; - break; + break; default: break; } - + char *str = WXSTRINGCAST formats; - + // TODO } void wxDropSource::UnregisterWindow(void) { if (!m_widget) return; - + // TODO } #endif @@ -219,7 +227,7 @@ wxPrivateDropTarget::wxPrivateDropTarget() { m_id = wxTheApp->GetAppName(); } - + size_t wxPrivateDropTarget::GetFormatCount() const { return 1;