Fix wxToggleButtonXmlHandler compilation with wxUniv.
Remove nonsensical code involving operator ?: with wxString and wxBitmap operands. No idea what was the intention behind it but it failed to even compile in wxX11 build so the new version (which does compile) can't be worse. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2d61788423
commit
969641a391
@ -71,15 +71,9 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
|
||||
{
|
||||
wxToggleButton *button = wxDynamicCast(control, wxToggleButton);
|
||||
|
||||
wxString label = GetText(wxT("label"));
|
||||
|
||||
button->Create(m_parentAsWindow,
|
||||
GetID(),
|
||||
#if defined(__WXUNIVERSAL__)
|
||||
!label.empty() ? label : GetBitmap(wxT("bitmap"), wxART_BUTTON),
|
||||
#else
|
||||
label,
|
||||
#endif
|
||||
GetText(wxT("label")),
|
||||
GetPosition(), GetSize(),
|
||||
GetStyle(),
|
||||
wxDefaultValidator,
|
||||
|
Loading…
Reference in New Issue
Block a user