Use wxString methods for UTF-8 conversions in wxX11 code.

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

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 7589082fc59dd0c57b41752fe2b56740aa608044..d555b2ef616c30d1424f592112a6f94af9269336 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -20,14 +20,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.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
 
 #endif
 

-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/log.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 );


@@ -184,7 +183,7 @@ wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
 
   UnregisterWindow();
 
 
   UnregisterWindow();
 

-  g_blockEventsOnDrag = FALSE;
+  g_blockEventsOnDrag = false;

 
   return m_retValue;
 #endif
 
   return m_retValue;
 #endif