From 162e221f7625c366ad064dd5e3a0fc1bfb138a8b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Aug 2011 12:13:18 +0000 Subject: [PATCH] Allow returning NULL windows from GetCompositeWindowParts(). wxCompositeWindow::GetCompositeWindowParts() becomes simpler to implement in the derived classes with optionally shown elements if NULL windows are allowed (and ignored) in the list returned by it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/compositewin.h | 6 +++++- src/generic/datectlg.cpp | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h index 9e7b5fd6a1..9ac62639c2 100644 --- a/include/wx/compositewin.h +++ b/include/wx/compositewin.h @@ -110,7 +110,11 @@ private: { wxWindow * const child = *i; - (child->*func)(arg); + // Allow NULL elements in the list, this makes the code of derived + // composite controls which may have optionally shown children + // simpler and it doesn't cost us much here. + if ( child ) + (child->*func)(arg); } } diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index f45dba82ab..7ee0b66c88 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -385,10 +385,8 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const { wxWindowList parts; - if (m_combo) - parts.push_back(m_combo); - if (m_popup) - parts.push_back(m_popup); + parts.push_back(m_combo); + parts.push_back(m_popup); return parts; } -- 2.45.2