fix broken recursive show for choices, tabs, and group boxes
svn: r2287
This commit is contained in:
parent
9b9244c7b6
commit
785753b27e
|
@ -280,6 +280,9 @@ void wxChoice::OnChar(wxKeyEvent *event)
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void wxChoice::DoShow(Bool show)
|
void wxChoice::DoShow(Bool show)
|
||||||
{
|
{
|
||||||
|
if (!CanShow(show))
|
||||||
|
return;
|
||||||
|
|
||||||
if (!show && cTitle)
|
if (!show && cTitle)
|
||||||
cTitle->DoShow(show);
|
cTitle->DoShow(show);
|
||||||
if (show) {
|
if (show) {
|
||||||
|
@ -287,7 +290,9 @@ void wxChoice::DoShow(Bool show)
|
||||||
} else {
|
} else {
|
||||||
::HideControl(cMacControl);
|
::HideControl(cMacControl);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxWindow::DoShow(show);
|
wxWindow::DoShow(show);
|
||||||
|
|
||||||
if (show && cTitle)
|
if (show && cTitle)
|
||||||
cTitle->DoShow(show);
|
cTitle->DoShow(show);
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,6 +172,8 @@ void wxGroupBox::Paint(void)
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void wxGroupBox::DoShow(Bool show)
|
void wxGroupBox::DoShow(Bool show)
|
||||||
{
|
{
|
||||||
|
if (!CanShow(show)) return;
|
||||||
|
|
||||||
if (show) {
|
if (show) {
|
||||||
::ShowControl(cMacControl);
|
::ShowControl(cMacControl);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -324,6 +324,8 @@ void wxTabChoice::Paint(void)
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void wxTabChoice::DoShow(Bool show)
|
void wxTabChoice::DoShow(Bool show)
|
||||||
{
|
{
|
||||||
|
if (!CanShow(show)) return;
|
||||||
|
|
||||||
if (show) {
|
if (show) {
|
||||||
::ShowControl(cMacControl);
|
::ShowControl(cMacControl);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user