added XRC handler for wxFileCtrl (closes #10785)

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

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 520b265ca6c878d84d1adcc0a02c53a904e2da2b..b575f8bd8bfadce6d3eb0698149917994cedfdff 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,11 +15,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#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)
 


@@ -33,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);


@@ -47,10 +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(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxFRAME_EX_METAL);
+    XRC_ADD_STYLE(wxFRAME_EX_CONTEXTHELP);

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -67,15 +75,17 @@ 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->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));

 
     SetupWindow(frame);
 
     CreateChildren(frame);
 
 
     SetupWindow(frame);
 
     CreateChildren(frame);
 

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

         frame->Centre();
 
     return frame;
         frame->Centre();
 
     return frame;


@@ -85,3 +95,5 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxFrame"));
 }
 {
     return IsOfClass(node, wxT("wxFrame"));
 }

+
+#endif // wxUSE_XRC