AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow returning NULL windows from GetCompositeWindowParts().

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2011-08-27 12:13:18 +00:00
parent 97f851007c
commit 162e221f76
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/compositewin.h
View File

@ -110,7 +110,11 @@ private:
{ {
wxWindow * const child = *i; 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);
} }
} }

6
src/generic/datectlg.cpp
View File

@ -385,10 +385,8 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
{ {
wxWindowList parts; wxWindowList parts;
if (m_combo) parts.push_back(m_combo);
parts.push_back(m_combo); parts.push_back(m_popup);
if (m_popup)
parts.push_back(m_popup);
return parts; return parts;
} }