cleaned up the mess caused by FloodFill patch

[wxWidgets.git] / src / xrc / xh_dlg.cpp

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 9aec62e83599f90c09773c780d04fc5661f6cedb..ebeba3a8310b58f810e7f73511528e9efbfe7a4d 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp

-// Purpose:     XML resource for dialogs
+// Purpose:     XRC resource for dialogs

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$


@@ -27,30 +27,29 @@
 
 wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
 {
 
 wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
 {

-    ADD_STYLE(wxSTAY_ON_TOP);
-    ADD_STYLE(wxCAPTION);
-    ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    ADD_STYLE(wxTHICK_FRAME);
-    ADD_STYLE(wxSYSTEM_MENU);
-    ADD_STYLE(wxRESIZE_BORDER);
-    ADD_STYLE(wxRESIZE_BOX);
-    ADD_STYLE(wxDIALOG_MODAL);
-    ADD_STYLE(wxDIALOG_MODELESS);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxTHICK_FRAME);
+    XRC_ADD_STYLE(wxSYSTEM_MENU);
+    XRC_ADD_STYLE(wxRESIZE_BORDER);
+    XRC_ADD_STYLE(wxRESIZE_BOX);
+    XRC_ADD_STYLE(wxDIALOG_MODAL);
+    XRC_ADD_STYLE(wxDIALOG_MODELESS);
+
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);

 
 

-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 

-
-

 wxObject *wxDialogXmlHandler::DoCreateResource()
 { 
     wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
     
 wxObject *wxDialogXmlHandler::DoCreateResource()
 { 
     wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
     

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

     
     dlg->Create(m_parentAsWindow,
                 GetID(),
     
     dlg->Create(m_parentAsWindow,
                 GetID(),


@@ -58,23 +57,23 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
                 wxDefaultPosition, wxDefaultSize,
                 GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
                 GetName());
                 wxDefaultPosition, wxDefaultSize,
                 GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
                 GetName());

-    dlg->SetClientSize(GetSize());
-    dlg->Move(GetPosition());
+
+    if (HasParam(wxT("size")))
+        dlg->SetClientSize(GetSize());
+    if (HasParam(wxT("pos")))
+        dlg->Move(GetPosition());
+

     SetupWindow(dlg);
 
     CreateChildren(dlg);
     
     SetupWindow(dlg);
 
     CreateChildren(dlg);
     

-    if (GetBool(_("centered"), FALSE))
+    if (GetBool(wxT("centered"), FALSE))

         dlg->Centre();
     
     return dlg;
 }
 
         dlg->Centre();
     
     return dlg;
 }
 

-
-

 bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxDialog"));
 }
 bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxDialog"));
 }

-
-