Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX...

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

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 9aec62e83599f90c09773c780d04fc5661f6cedb..6ebcbaec641229b4381372bb4faea0c51a31e9cf 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
-#pragma implementation "xh_dlg.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,62 +15,73 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"
 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"

+#include "wx/frame.h"

 #include "wx/log.h"
 #include "wx/intl.h"
 
 #include "wx/log.h"
 #include "wx/intl.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)

 
 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);
-
-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);
-    AddWindowStyles();
-}
+    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(wxCLOSE_BOX);
+    XRC_ADD_STYLE(wxDIALOG_MODAL);
+    XRC_ADD_STYLE(wxDIALOG_MODELESS);
+    XRC_ADD_STYLE(wxDIALOG_NO_PARENT);

 
 

+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxDIALOG_EX_METAL);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxFRAME_SHAPED);
+    XRC_ADD_STYLE(wxDIALOG_EX_CONTEXTHELP);

 
 

+    AddWindowStyles();
+}

 
 wxObject *wxDialogXmlHandler::DoCreateResource()
 
 wxObject *wxDialogXmlHandler::DoCreateResource()

-{ 
-    wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
-    
-    wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance."));
-    
+{
+    XRC_MAKE_INSTANCE(dlg, wxDialog);
+

     dlg->Create(m_parentAsWindow,
                 GetID(),
                 GetText(wxT("title")),
                 wxDefaultPosition, wxDefaultSize,
                 GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
                 GetName());
     dlg->Create(m_parentAsWindow,
                 GetID(),
                 GetText(wxT("title")),
                 wxDefaultPosition, wxDefaultSize,
                 GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
                 GetName());

-    dlg->SetClientSize(GetSize());
-    dlg->Move(GetPosition());
+
+    if (HasParam(wxT("size")))
+        dlg->SetClientSize(GetSize(wxT("size"), dlg));
+    if (HasParam(wxT("pos")))
+        dlg->Move(GetPosition());
+    if (HasParam(wxT("icon")))
+        dlg->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
+

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

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

         dlg->Centre();
         dlg->Centre();

-    
+

     return dlg;
 }
 
     return dlg;
 }
 

-
-

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

-
+#endif // wxUSE_XRC