diff --git a/src/wxmac/src/mac/wx_choic.cc b/src/wxmac/src/mac/wx_choic.cc index 2ebf37dd4e..494b57e77a 100644 --- a/src/wxmac/src/mac/wx_choic.cc +++ b/src/wxmac/src/mac/wx_choic.cc @@ -280,6 +280,9 @@ void wxChoice::OnChar(wxKeyEvent *event) //----------------------------------------------------------------------------- void wxChoice::DoShow(Bool show) { + if (!CanShow(show)) + return; + if (!show && cTitle) cTitle->DoShow(show); if (show) { @@ -287,7 +290,9 @@ void wxChoice::DoShow(Bool show) } else { ::HideControl(cMacControl); } + wxWindow::DoShow(show); + if (show && cTitle) cTitle->DoShow(show); } diff --git a/src/wxmac/src/mac/wx_gbox.cc b/src/wxmac/src/mac/wx_gbox.cc index f8ae9ef5d7..59d9f0d29b 100644 --- a/src/wxmac/src/mac/wx_gbox.cc +++ b/src/wxmac/src/mac/wx_gbox.cc @@ -172,6 +172,8 @@ void wxGroupBox::Paint(void) //----------------------------------------------------------------------------- void wxGroupBox::DoShow(Bool show) { + if (!CanShow(show)) return; + if (show) { ::ShowControl(cMacControl); } else { diff --git a/src/wxmac/src/mac/wx_tabc.cc b/src/wxmac/src/mac/wx_tabc.cc index 28e7d01252..cb79e45c4d 100644 --- a/src/wxmac/src/mac/wx_tabc.cc +++ b/src/wxmac/src/mac/wx_tabc.cc @@ -324,6 +324,8 @@ void wxTabChoice::Paint(void) //----------------------------------------------------------------------------- void wxTabChoice::DoShow(Bool show) { + if (!CanShow(show)) return; + if (show) { ::ShowControl(cMacControl); } else {