wxCalendarCtrl::Destroy() now deletes year spin control and
month combo box; tested in MSW and GTK . git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,6 +60,8 @@ public:
|
|||||||
|
|
||||||
virtual ~wxCalendarCtrl();
|
virtual ~wxCalendarCtrl();
|
||||||
|
|
||||||
|
virtual bool Destroy();
|
||||||
|
|
||||||
// set/get the current date
|
// set/get the current date
|
||||||
// ------------------------
|
// ------------------------
|
||||||
|
|
||||||
|
@@ -253,6 +253,18 @@ wxCalendarCtrl::~wxCalendarCtrl()
|
|||||||
// forward wxWin functions to subcontrols
|
// forward wxWin functions to subcontrols
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
bool wxCalendarCtrl::Destroy()
|
||||||
|
{
|
||||||
|
if( m_staticYear ) m_staticYear->Destroy();
|
||||||
|
if( m_spinYear ) m_spinYear->Destroy();
|
||||||
|
if( m_comboMonth ) m_comboMonth->Destroy();
|
||||||
|
if( m_staticMonth ) m_staticMonth->Destroy();
|
||||||
|
|
||||||
|
m_staticYear = 0; m_spinYear = 0; m_comboMonth = 0; m_staticMonth = 0;
|
||||||
|
|
||||||
|
return wxControl::Destroy();
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCalendarCtrl::Show(bool show)
|
bool wxCalendarCtrl::Show(bool show)
|
||||||
{
|
{
|
||||||
if ( !wxControl::Show(show) )
|
if ( !wxControl::Show(show) )
|
||||||
|
Reference in New Issue
Block a user