X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b34993daa0cef2a4c2b5a49236c3dcd70737c26..9c112555198f51fcec71106530cddba95a17f3dc:/src/xrc/xh_dlg.cpp diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp index b377eab61c..4cab711187 100644 --- a/src/xrc/xh_dlg.cpp +++ b/src/xrc/xh_dlg.cpp @@ -8,7 +8,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_dlg.h" #endif @@ -23,6 +23,7 @@ #include "wx/xrc/xh_dlg.h" #include "wx/dialog.h" +#include "wx/frame.h" #include "wx/log.h" #include "wx/intl.h" @@ -45,8 +46,10 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler() XRC_ADD_STYLE(wxNO_3D); XRC_ADD_STYLE(wxTAB_TRAVERSAL); XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); + XRC_ADD_STYLE(wxDIALOG_EX_METAL); XRC_ADD_STYLE(wxMAXIMIZE_BOX); XRC_ADD_STYLE(wxMINIMIZE_BOX); + XRC_ADD_STYLE(wxFRAME_SHAPED); AddWindowStyles(); } @@ -63,7 +66,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource() GetName()); if (HasParam(wxT("size"))) - dlg->SetClientSize(GetSize()); + dlg->SetClientSize(GetSize(wxT("size"), dlg)); if (HasParam(wxT("pos"))) dlg->Move(GetPosition()); if (HasParam(wxT("icon")))