fix typo in r57455 which totally broke modal dialogs display (close #10291)

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

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 9d93881f0b8c00ae0c6f9282f44c8dfa8efd0bac..892a9e38aa8cc2d98d4b8b16ff258ef762313c25 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_frame.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,13 +15,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC

 
 #include "wx/xrc/xh_frame.h"
 
 #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"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 


@@ -35,10 +34,14 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxCAPTION);
     XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
     XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
     XRC_ADD_STYLE(wxCAPTION);
     XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
     XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxTHICK_FRAME);
     XRC_ADD_STYLE(wxTHICK_FRAME);

+#endif // WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);
     XRC_ADD_STYLE(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxRESIZE_BOX);
     XRC_ADD_STYLE(wxRESIZE_BOX);

+#endif // WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxCLOSE_BOX);
 
     XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
     XRC_ADD_STYLE(wxCLOSE_BOX);
 
     XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);


@@ -49,9 +52,13 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
     XRC_ADD_STYLE(wxSTAY_ON_TOP);
 
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
     XRC_ADD_STYLE(wxSTAY_ON_TOP);
 

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxNO_3D);

+#endif // WXWIN_COMPATIBILITY_2_6

     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(wxFRAME_EX_METAL);
+    XRC_ADD_STYLE(wxFRAME_EX_CONTEXTHELP);

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -68,9 +75,11 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
                   GetName());
 
     if (HasParam(wxT("size")))
                   GetName());
 
     if (HasParam(wxT("size")))

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

     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());
     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());

+    if (HasParam(wxT("icon")))
+        frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));

 
     SetupWindow(frame);
 
 
     SetupWindow(frame);
 


@@ -87,4 +96,4 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxFrame"));
 }
 
     return IsOfClass(node, wxT("wxFrame"));
 }
 

-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC