use WX_ASSERT_STR/SIZET_EQUAL instead of CPPUNIT_ASSERT_EQUAL with casts

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

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 0fefbf70e6439886926de709856c8ce66d77e34d..cd50f4a96cc561c9f646748fa7dbde451b282a85 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_dlg.cpp
+// Name:        src/xrc/xh_dlg.cpp

 // Purpose:     XRC resource for dialogs
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resource for dialogs
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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,10 +15,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

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

-#include "wx/dialog.h"
-#include "wx/log.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/dialog.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 


@@ -31,21 +33,26 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxSTAY_ON_TOP);
     XRC_ADD_STYLE(wxCAPTION);
     XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
     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(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);

-    XRC_ADD_STYLE(wxRESIZE_BOX);

     XRC_ADD_STYLE(wxCLOSE_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(wxDIALOG_NO_PARENT);
 

-    XRC_ADD_STYLE(wxNO_3D);

     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxDIALOG_EX_METAL);

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

+    XRC_ADD_STYLE(wxFRAME_SHAPED);
+    XRC_ADD_STYLE(wxDIALOG_EX_CONTEXTHELP);
+
+#if WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxDIALOG_MODAL);
+    XRC_ADD_STYLE(wxTHICK_FRAME);
+    XRC_ADD_STYLE(wxRESIZE_BOX);
+    XRC_ADD_STYLE(wxDIALOG_MODELESS);
+    XRC_ADD_STYLE(wxNO_3D);
+#endif // WXWIN_COMPATIBILITY_2_6

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -62,15 +69,17 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
                 GetName());
 
     if (HasParam(wxT("size")))
                 GetName());
 
     if (HasParam(wxT("size")))

-        dlg->SetClientSize(GetSize());
+        dlg->SetClientSize(GetSize(wxT("size"), dlg));

     if (HasParam(wxT("pos")))
         dlg->Move(GetPosition());
     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(wxT("centered"), FALSE))
+    if (GetBool(wxT("centered"), false))

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


@@ -80,3 +89,5 @@ bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxDialog"));
 }
 {
     return IsOfClass(node, wxT("wxDialog"));
 }

+
+#endif // wxUSE_XRC