oops... conflict removed

[wxWidgets.git] / contrib / src / xml / xh_dlg.cpp

diff --git a/contrib/src/xml/xh_dlg.cpp b/contrib/src/xml/xh_dlg.cpp
index 62b971a4e78abd0f3db112f7626908ee36ba2032..6110b807e7d36f0bcf0960449fe2ecc173f90f94 100644 (file)
--- a/contrib/src/xml/xh_dlg.cpp
+++ b/contrib/src/xml/xh_dlg.cpp
@@ -54,9 +54,9 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
     
     dlg->Create(m_ParentAsWindow,
                 GetID(),
-                GetText(_T("title")),
+                GetText(wxT("title")),
                 wxDefaultPosition, wxDefaultSize,
-                GetStyle(_T("style"), wxDEFAULT_DIALOG_STYLE),
+                GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
                 GetName());
     dlg->SetClientSize(GetSize());
     dlg->Move(GetPosition());
@@ -74,7 +74,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 
 bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return IsOfClass(node, _T("wxDialog"));
+    return IsOfClass(node, wxT("wxDialog"));
 }