Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 798af946bd5838f2037284a8a9192a447e9b1578..a3e5e5d320cc3fbe217be8eda553dbfa53296b7f 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -1,23 +1,30 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.cpp
+// Name:        src/x11/dnd.cpp

 // Purpose:     wxDropTarget, wxDropSource classes
 // Author:      Julian Smart
 // Purpose:     wxDropTarget, wxDropSource classes
 // Author:      Julian Smart

-// Id:          $Id$

 // Copyright:   (c) 1998 Julian Smart
 // 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"
 
 #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>
 
 
 #include <X11/Xlib.h>
 


@@ -44,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 );
 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 );
 }
 
 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
 }
 
 size_t wxTextDropTarget::GetFormatCount() const


@@ -77,7 +84,7 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char *
   {
     wxLogDebug( aszFiles[i] );
   }
   {
     wxLogDebug( aszFiles[i] );
   }

-  return TRUE;
+  return true;

 }
 
 bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
 }
 
 bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )


@@ -88,10 +95,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++;
 
   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];
   char **files = new char*[number];

-  
+

   text = (char*) data;
   for ( i = 0; i < number; i++)
   {
   text = (char*) data;
   for ( i = 0; i < number; i++)
   {


@@ -100,10 +107,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
     text += len+1;
   }
 
     text += len+1;
   }
 

-  bool ret = OnDropFiles( x, y, 1, files ); 
-  
+  bool ret = OnDropFiles( x, y, 1, files );
+

   free( files );
   free( files );

-  
+

   return ret;
 }
 
   return ret;
 }
 


@@ -125,7 +132,7 @@ wxDropSource::wxDropSource( wxWindow *win )
 {
 #if 0
   m_window = win;
 {
 #if 0
   m_window = win;

-  m_data = (wxDataObject *) NULL;
+  m_data = NULL;

   m_retValue = wxDragCancel;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_retValue = wxDragCancel;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );


@@ -136,13 +143,13 @@ wxDropSource::wxDropSource( wxWindow *win )
 wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
 {
 #if 0
 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_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_data = &data;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );


@@ -159,7 +166,7 @@ wxDropSource::~wxDropSource(void)
 {
 //  if (m_data) delete m_data;
 }
 {
 //  if (m_data) delete m_data;
 }

-   
+

 wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
 {
   //  wxASSERT_MSG( m_data, "wxDragSource: no data" );
 wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
 {
   //  wxASSERT_MSG( m_data, "wxDragSource: no data" );


@@ -168,15 +175,15 @@ wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
 #if 0
   if (!m_data) return (wxDragResult) wxDragNone;
   if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
 #if 0
   if (!m_data) return (wxDragResult) wxDragNone;
   if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;

-  
+

   RegisterWindow();
   RegisterWindow();

-  
+

   // TODO
   // TODO

-  
+

   UnregisterWindow();
   UnregisterWindow();

-  
-  g_blockEventsOnDrag = FALSE;
-  
+
+  g_blockEventsOnDrag = false;
+

   return m_retValue;
 #endif
 }
   return m_retValue;
 #endif
 }


@@ -187,30 +194,30 @@ void wxDropSource::RegisterWindow(void)
   if (!m_data) return;
 
   wxString formats;
   if (!m_data) return;
 
   wxString formats;

-    
+

   wxDataFormat df = m_data->GetPreferredFormat();
   wxDataFormat df = m_data->GetPreferredFormat();

-  
-    switch (df) 
+
+    switch (df)

     {
     {

-      case wxDF_TEXT: 
+      case wxDF_TEXT:

         formats += "text/plain";
         formats += "text/plain";

-       break;
+        break;

       case wxDF_FILENAME:
         formats += "file:ALL";
       case wxDF_FILENAME:
         formats += "file:ALL";

-       break;
+        break;

       default:
         break;
     }
       default:
         break;
     }

-  
+

   char *str = WXSTRINGCAST formats;
   char *str = WXSTRINGCAST formats;

-  
+

   // TODO
 }
 
 void wxDropSource::UnregisterWindow(void)
 {
   if (!m_widget) return;
   // TODO
 }
 
 void wxDropSource::UnregisterWindow(void)
 {
   if (!m_widget) return;

-  
+

   // TODO
 }
 #endif
   // TODO
 }
 #endif


@@ -219,7 +226,7 @@ wxPrivateDropTarget::wxPrivateDropTarget()
 {
     m_id = wxTheApp->GetAppName();
 }
 {
     m_id = wxTheApp->GetAppName();
 }

-  
+

 size_t wxPrivateDropTarget::GetFormatCount() const
 {
     return 1;
 size_t wxPrivateDropTarget::GetFormatCount() const
 {
     return 1;