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

Improve UI of the "Button" page of the widgets sample

Browse Source 
Allow only permitted combinations of text, bitmap and command link.

Also avoid null pointer crash when combining "Bitmap only" with "Use command link button".
This commit is contained in:
Cătălin Răceanu 2016-12-07 02:32:10 +02:00 committed by VZ
parent 2c24ee9216
commit fc2cc74530
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
samples/widgets/button.cpp
View File

@ -446,13 +446,11 @@ void ButtonWidgetsPage::CreateButton()
break;
}
#if wxUSE_COMMANDLINKBUTTON
m_sizerNote->Show(m_chkCommandLink->GetValue());
#endif
bool showsBitmap = false;
if ( m_chkBitmapOnly->GetValue() )
{
m_chkCommandLink->SetValue(false); // wxCommandLinkButton cannot be "Bitmap only"
showsBitmap = true;
wxButton *bbtn;
@ -503,6 +501,10 @@ void ButtonWidgetsPage::CreateButton()
}
}
#if wxUSE_COMMANDLINKBUTTON
m_sizerNote->Show(m_chkCommandLink->GetValue());
#endif
if ( !showsBitmap && m_chkTextAndBitmap->GetValue() )
{
showsBitmap = true;
@ -525,6 +527,9 @@ void ButtonWidgetsPage::CreateButton()
m_button->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_BUTTON));
}
m_chkTextAndBitmap->Enable(!m_chkBitmapOnly->IsChecked());
m_chkBitmapOnly->Enable(!m_chkTextAndBitmap->IsChecked());
m_chkCommandLink->Enable(!m_chkBitmapOnly->IsChecked());
m_chkUseBitmapClass->Enable(showsBitmap);
m_chkUsePressed->Enable(showsBitmap);