some conflicts resolved

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 498fbedec9e832ea37f97f938d1b0b4cde19dd8f..edef8624d8970995f894f2b34e0d30135c607dea 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -719,7 +719,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
     }
 
     wxASSERT_MSG( m_cursor.Ok(),
-                  T("cursor must be valid after call to the base version"));
+                  wxT("cursor must be valid after call to the base version"));
 
     WXDisplay *dpy = GetXDisplay();
     WXCursor x_cursor = m_cursor.GetXCursor(dpy);