fix for calculating the header window height (patch 805791)

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

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index ebeba3a8310b58f810e7f73511528e9efbfe7a4d..ea823db9649f2b6292c2bdd9f668d94f69264efd 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

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


@@ -24,6 +24,7 @@
 #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()
 {


@@ -34,6 +35,7 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);
     XRC_ADD_STYLE(wxRESIZE_BOX);
     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_MODAL);
     XRC_ADD_STYLE(wxDIALOG_MODELESS);
 


@@ -41,16 +43,16 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxCLIP_CHILDREN);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxCLIP_CHILDREN);

+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);

 
     AddWindowStyles();
 }
 
 wxObject *wxDialogXmlHandler::DoCreateResource()
 
     AddWindowStyles();
 }
 
 wxObject *wxDialogXmlHandler::DoCreateResource()

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

     dlg->Create(m_parentAsWindow,
                 GetID(),
                 GetText(wxT("title")),
     dlg->Create(m_parentAsWindow,
                 GetID(),
                 GetText(wxT("title")),


@@ -66,10 +68,10 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
     SetupWindow(dlg);
 
     CreateChildren(dlg);
     SetupWindow(dlg);
 
     CreateChildren(dlg);

-    
+

     if (GetBool(wxT("centered"), FALSE))
         dlg->Centre();
     if (GetBool(wxT("centered"), FALSE))
         dlg->Centre();

-    
+

     return dlg;
 }
 
     return dlg;
 }