X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79132cd30222d8c20c2232a58edc99461f9fe813..a766986f6d443ba1d50e3af25f3306fa56e4518e:/src/xrc/xh_frame.cpp?ds=sidebyside diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp index 467e133472..892a9e38aa 100644 --- 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 @@ -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,18 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_frame.h" -#include "wx/frame.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" // to get wxDEFAULT_DIALOG_STYLE +#endif + +IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler) wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() { @@ -31,22 +34,31 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() 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); +#endif // WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxSYSTEM_MENU); XRC_ADD_STYLE(wxRESIZE_BORDER); +#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxRESIZE_BOX); +#endif // WXWIN_COMPATIBILITY_2_6 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); XRC_ADD_STYLE(wxMINIMIZE_BOX); XRC_ADD_STYLE(wxSTAY_ON_TOP); +#if WXWIN_COMPATIBILITY_2_6 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(wxCLIP_CHILDREN); + XRC_ADD_STYLE(wxFRAME_EX_METAL); + XRC_ADD_STYLE(wxFRAME_EX_CONTEXTHELP); AddWindowStyles(); } @@ -63,15 +75,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 +95,5 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxFrame")); } + +#endif // wxUSE_XRC