]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a89970)
check for m_parentAsWindow!=NULL
authorVáclav Slavík <vslavik@fastmail.fm>
Wed, 10 Sep 2003 19:19:01 +0000 (19:19 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Wed, 10 Sep 2003 19:19:01 +0000 (19:19 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/src/xrc/xh_sizer.cpp patch | blob | blame | history
src/xrc/xh_sizer.cpp patch | blob | blame | history

diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp
index f26bac9e7ad3004e6575bbe348c9b533a4253b74..eaeec961c29237c780a498936d1e5ba01eb35f2b 100644 (file)
--- a/contrib/src/xrc/xh_sizer.cpp
+++ b/contrib/src/xrc/xh_sizer.cpp
@@ -142,6 +142,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource()
 
         wxCHECK_MSG(m_parentSizer != NULL ||
                 (parentNode->GetType() == wxXML_ELEMENT_NODE &&
+                    m_parentAsWindow != NULL &&
                     (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
                      m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
                      m_parentAsWindow->IsKindOf(CLASSINFO(wxDialog)))
diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index f26bac9e7ad3004e6575bbe348c9b533a4253b74..eaeec961c29237c780a498936d1e5ba01eb35f2b 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -142,6 +142,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource()
 
         wxCHECK_MSG(m_parentSizer != NULL ||
                 (parentNode->GetType() == wxXML_ELEMENT_NODE &&
+                    m_parentAsWindow != NULL &&
                     (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
                      m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
                      m_parentAsWindow->IsKindOf(CLASSINFO(wxDialog)))
wxWidgets (Impactor)