another compilation fix after wxCmdLineEntryDesc changes

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

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 5a3941afb6cdcf0b38dd7d997bf03eaf18fed85b..2a408c438fe65aee47aa45d7e0798ffbd1a698bf 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -1,22 +1,29 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.cpp
-// Purpose:     wxDropTarget, wxDropSource, wxDataObject implementation
+// Name:        src/motif/dnd.cpp
+// Purpose:     wxDropTarget, wxDropSource classes

 // Author:      Julian Smart
 // Author:      Julian Smart

-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dnd.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DRAG_AND_DROP

 
 #include "wx/dnd.h"
 
 #include "wx/dnd.h"

-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.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>

 
 // ----------------------------------------------------------------------------
 // global
 
 // ----------------------------------------------------------------------------
 // global


@@ -28,28 +35,28 @@
 
 wxDropTarget::wxDropTarget()
 {
 
 wxDropTarget::wxDropTarget()
 {

-};
+}

 
 wxDropTarget::~wxDropTarget()
 {
 
 wxDropTarget::~wxDropTarget()
 {

-};
+}

 
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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 );
-  return TRUE;
-};
+  OnDropText( x, y, (const char*)data );
+  return true;
+}

 
 bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
 {
 
 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;
-};
+  wxLogDebug( "Got dropped text: %s.", psz );
+  wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y );
+  return true;
+}

 
 size_t wxTextDropTarget::GetFormatCount() const
 {
 
 size_t wxTextDropTarget::GetFormatCount() const
 {


@@ -65,18 +72,43 @@ wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
 // wxFileDropTarget
 // ----------------------------------------------------------------------------
 
 // 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 );
-  return TRUE;
+  wxLogDebug( "Got %d dropped files.", (int)nFiles );
+  wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y );
+  size_t i;
+  for (i = 0; i < nFiles; i++)
+  {
+    wxLogDebug( aszFiles[i] );
+  }
+  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;
+  size_t i;
+  for (i = 0; i < size; i++)
+    if (text[i] == 0) number++;
+
+  if (number == 0) return true;
+
+  char **files = new char*[number];
+
+  text = (char*) data;
+  for ( 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 OnDropFiles(x, y, 1, &str ); 
+  return ret;

 }
 
 size_t wxFileDropTarget::GetFormatCount() const
 }
 
 size_t wxFileDropTarget::GetFormatCount() const


@@ -93,41 +125,114 @@ wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
 // wxDropSource
 //-------------------------------------------------------------------------
 
 // wxDropSource
 //-------------------------------------------------------------------------
 

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

 wxDropSource::wxDropSource( wxWindow *win )
 {
 wxDropSource::wxDropSource( wxWindow *win )
 {

-    // TODO
-  //    m_window = win;
-    m_data = NULL;
+#if 0
+  m_window = win;
+  m_data = (wxDataObject *) NULL;
+  m_retValue = wxDragCancel;

 
 

-    //    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    //    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-};
+  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+#endif
+}

 
 wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
 {
 
 wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
 {

-    // TODO
-  //    m_window = win;
-    m_data = &data;
+#if 0
+  g_blockEventsOnDrag = true;
+
+  m_window = win;
+  m_widget = win->m_widget;
+  if (win->m_wxwindow) m_widget = win->m_wxwindow;
+  m_retValue = wxDragCancel;

 
 

-    //    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    //    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-};
+  m_data = &data;
+
+  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+#endif
+}

 
 void wxDropSource::SetData( wxDataObject &data )
 {
 
 void wxDropSource::SetData( wxDataObject &data )
 {

-    m_data = &data;
-};
+//  m_data = &data;
+}

 
 wxDropSource::~wxDropSource(void)
 {
 
 wxDropSource::~wxDropSource(void)
 {

-};
-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+//  if (m_data) delete m_data;
+}
+
+wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )

 {
 {

-    // TODO
-    return wxDragError;
-};
+  //  wxASSERT_MSG( m_data, "wxDragSource: no data" );
+
+  return wxDragNone;
+#if 0
+  if (!m_data) return (wxDragResult) wxDragNone;
+  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
+
+  RegisterWindow();
+
+  // TODO
+
+  UnregisterWindow();

 
 

+  g_blockEventsOnDrag = false;
+
+  return m_retValue;
+#endif
+}
+
+#if 0
+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
+}
+#endif
+
+wxPrivateDropTarget::wxPrivateDropTarget()
+{
+    m_id = wxTheApp->GetAppName();
+}
+
+size_t wxPrivateDropTarget::GetFormatCount() const
+{
+    return 1;
+}
+
+wxDataFormat wxPrivateDropTarget::GetFormat(size_t n) const
+{
+    return wxDF_INVALID;
+}
+
+#endif
+      // wxUSE_DRAG_AND_DROP