Merge in from trunk r64802 - r68625

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index ade45b2cfc8885cd15b4d25498151051e7267a9e..42b4bc790b06821ec323a20a4c2010579261cf4a 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -49,7 +49,7 @@ static long gs_flagsForDrag = 0;
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
 // (there are quite a few of them, so don't enable this by default)
-#define TRACE_DND _T("dnd")
+#define TRACE_DND wxT("dnd")
 
 // global variables because GTK+ DnD want to have the
 // mouse event that caused it
@@ -358,7 +358,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111
-        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );
+        wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") );
 
 /*
         GdkDragAction action = GDK_ACTION_MOVE;
@@ -777,11 +777,11 @@ void wxDropSource::SetIcons(const wxIcon &iconCopy,
     m_iconMove = iconMove;
     m_iconNone = iconNone;
 
-    if ( !m_iconCopy.Ok() )
+    if ( !m_iconCopy.IsOk() )
         m_iconCopy = wxIcon(page_xpm);
-    if ( !m_iconMove.Ok() )
+    if ( !m_iconMove.IsOk() )
         m_iconMove = m_iconCopy;
-    if ( !m_iconNone.Ok() )
+    if ( !m_iconNone.IsOk() )
         m_iconNone = m_iconCopy;
 }
 
@@ -848,7 +848,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     // don't start dragging if no button is down
     if (g_lastButtonNumber == 0)
         return wxDragNone;
-        
+
     // we can only start a drag after a mouse event
     if (g_lastMouseEvent == NULL)
         return wxDragNone;