Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 1697027afd9d209a522638e04aabba31300830c7..d555b2ef616c30d1424f592112a6f94af9269336 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -23,11 +23,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-#include "wx/gdicmn.h"
-

 #include <X11/Xlib.h>
 
 // ----------------------------------------------------------------------------
 #include <X11/Xlib.h>
 
 // ----------------------------------------------------------------------------


@@ -134,7 +133,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 );