added 'name' to wxEditableListBox ctor

[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 0347787f08eaa537de4158bfa6a495c027f933f9..045093f8995b180185c3941aa8064af1c5cae8e6 100644 (file)
--- a/contrib/src/xml/xh_dlg.cpp
+++ b/contrib/src/xml/xh_dlg.cpp
@@ -40,21 +40,23 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     ADD_STYLE(wxNO_3D);
     ADD_STYLE(wxTAB_TRAVERSAL);
     ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     ADD_STYLE(wxNO_3D);
     ADD_STYLE(wxTAB_TRAVERSAL);
     ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

+    ADD_STYLE(wxCLIP_CHILDREN);
+    AddWindowStyles();

 }
 
 
 
 wxObject *wxDialogXmlHandler::DoCreateResource()
 { 
 }
 
 
 
 wxObject *wxDialogXmlHandler::DoCreateResource()
 { 

-    wxDialog *dlg = wxDynamicCast(m_Instance, wxDialog);
+    wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);

     
     wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance."));
     
     
     wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance."));
     

-    dlg->Create(m_ParentAsWindow,
+    dlg->Create(m_parentAsWindow,

                 GetID(),
                 GetID(),

-                GetText(_T("title")),
+                GetText(wxT("title")),

                 wxDefaultPosition, wxDefaultSize,
                 wxDefaultPosition, wxDefaultSize,

-                GetStyle(_T("style"), wxDEFAULT_DIALOG_STYLE),
+                GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),

                 GetName());
     dlg->SetClientSize(GetSize());
     dlg->Move(GetPosition());
                 GetName());
     dlg->SetClientSize(GetSize());
     dlg->Move(GetPosition());


@@ -72,7 +74,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 
 bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return node->GetName() == _T("dialog");
+    return IsOfClass(node, wxT("wxDialog"));

 }
 
 
 }