revert togglable tools to previous state if the change was vetoed by OnLeftClick()

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

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 618c3e46f3aec351c2f6535603a689ae8943df35..2f98fd0500e7610daf85fcc86d089310d7b3bcc8 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -7,10 +7,13 @@
 // Licence:    wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dnd.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/setup.h"
 
 #if wxUSE_DRAG_AND_DROP
@@ -48,14 +51,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
@@ -76,26 +79,28 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char *
 {
   wxLogDebug( "Got %d dropped files.", (int)nFiles );
   wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y );
-  for (size_t i = 0; i < nFiles; i++)
+  size_t i;
+  for (i = 0; i < nFiles; i++)
   {
     wxLogDebug( aszFiles[i] );
   }
-  return TRUE;
+  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++)
+  size_t i;
+  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 (size_t i = 0; i < number; i++)
+  for ( i = 0; i < number; i++)
   {
     files[i] = text;
     int len = strlen( text );
@@ -138,7 +143,7 @@ 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;
@@ -162,7 +167,7 @@ wxDropSource::~wxDropSource(void)
 //  if (m_data) delete m_data;
 }
    
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
 {
   //  wxASSERT_MSG( m_data, "wxDragSource: no data" );
 
@@ -177,7 +182,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
   
   UnregisterWindow();
   
-  g_blockEventsOnDrag = FALSE;
+  g_blockEventsOnDrag = false;
   
   return m_retValue;
 #endif
@@ -217,6 +222,20 @@ void wxDropSource::UnregisterWindow(void)
 }
 #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