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 1697027afd9d209a522638e04aabba31300830c7..a3e5e5d320cc3fbe217be8eda553dbfa53296b7f 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -2,7 +2,6 @@
 // Name:        src/x11/dnd.cpp
 // Purpose:     wxDropTarget, wxDropSource classes
 // Author:      Julian Smart
-// Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,11 +22,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/window.h"
-#include "wx/gdicmn.h"
-
 #include <X11/Xlib.h>
 
 // ----------------------------------------------------------------------------
@@ -134,7 +132,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 );