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 a05fb8e0bfa2092615296ffd4d55eda3b5f3522e..6110b807e7d36f0bcf0960449fe2ecc173f90f94 100644 (file)
--- a/contrib/src/xml/xh_dlg.cpp
+++ b/contrib/src/xml/xh_dlg.cpp
@@ -40,6 +40,8 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     ADD_STYLE(wxNO_3D);
     ADD_STYLE(wxTAB_TRAVERSAL);
     ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    ADD_STYLE(wxCLIP_CHILDREN);
+    AddWindowStyles();
 }
 
 
@@ -52,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());
@@ -62,6 +64,9 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 
     CreateChildren(dlg);
     
+    if (GetBool(_("centered"), FALSE))
+        dlg->Centre();
+    
     return dlg;
 }
 
@@ -69,7 +74,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 
 bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return node->GetName() == _T("dialog");
+    return IsOfClass(node, wxT("wxDialog"));
 }