X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c6ad433beab62c3108b61bbc2b682302607f6bf..9d14de69f4d94666e630a11457258b90fff2d0b3:/src/xrc/xh_frame.cpp

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index daa12424e6..705a3265b6 100644
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_frame.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,11 +15,15 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_frame.h"
 #include "wx/frame.h"
+#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 #include "wx/log.h"
 #include "wx/intl.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 {
@@ -35,8 +35,10 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);
     XRC_ADD_STYLE(wxRESIZE_BOX);
-    XRC_ADD_STYLE(wxCLOSE);
+    XRC_ADD_STYLE(wxCLOSE_BOX);
 
+    XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
+    XRC_ADD_STYLE(wxFRAME_SHAPED);
     XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
     XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
@@ -46,7 +48,8 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxFRAME_EX_METAL);
+    XRC_ADD_STYLE(wxFRAME_EX_CONTEXTHELP);
 
     AddWindowStyles();
 }
@@ -63,15 +66,17 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
                   GetName());
 
     if (HasParam(wxT("size")))
-        frame->SetClientSize(GetSize());
+        frame->SetClientSize(GetSize(wxT("size"), frame));
     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());
+    if (HasParam(wxT("icon")))
+        frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
 
     SetupWindow(frame);
 
     CreateChildren(frame);
 
-    if (GetBool(wxT("centered"), FALSE))
+    if (GetBool(wxT("centered"), false))
         frame->Centre();
 
     return frame;
@@ -81,3 +86,5 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxFrame"));
 }
+
+#endif // wxUSE_XRC