From 5dff4e24c2d117cf23cbc6563675428cc346490a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 24 Mar 2002 00:23:59 +0000 Subject: [PATCH] fixed sizers-inside-wxFrame git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_sizer.cpp | 3 ++- src/xrc/xh_sizer.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp index 09a1bbc43a..2420ff04eb 100644 --- a/contrib/src/xrc/xh_sizer.cpp +++ b/contrib/src/xrc/xh_sizer.cpp @@ -137,9 +137,10 @@ wxObject *wxSizerXmlHandler::DoCreateResource() wxCHECK_MSG(m_parentSizer != NULL || ((IsOfClass(parentNode, wxT("wxPanel")) || + IsOfClass(parentNode, wxT("wxFrame")) || IsOfClass(parentNode, wxT("wxDialog"))) && parentNode->GetType() == wxXML_ELEMENT_NODE), NULL, - wxT("Incorrect use of sizer: parent is not 'wxDialog' or 'wxPanel'.")); + wxT("Incorrect use of sizer: parent is not 'wxDialog', 'wxFrame' or 'wxPanel'.")); if (m_class == wxT("wxBoxSizer")) sizer = new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL)); diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index 09a1bbc43a..2420ff04eb 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -137,9 +137,10 @@ wxObject *wxSizerXmlHandler::DoCreateResource() wxCHECK_MSG(m_parentSizer != NULL || ((IsOfClass(parentNode, wxT("wxPanel")) || + IsOfClass(parentNode, wxT("wxFrame")) || IsOfClass(parentNode, wxT("wxDialog"))) && parentNode->GetType() == wxXML_ELEMENT_NODE), NULL, - wxT("Incorrect use of sizer: parent is not 'wxDialog' or 'wxPanel'.")); + wxT("Incorrect use of sizer: parent is not 'wxDialog', 'wxFrame' or 'wxPanel'.")); if (m_class == wxT("wxBoxSizer")) sizer = new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL)); -- 2.50.0