merging back XTI branch part 2

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

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 202c9d2f51cbcdcbc3b6ef7bac87972704bf56c0..cba4d6c9da83df1c0200dffd58367d5fcdaedb02 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -13,12 +13,15 @@
 #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>
 
@@ -126,7 +129,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 );