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

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 1607b0f4efacfb7326fe97b89549c8a9434f60ed..be031f75659cfaa2e00eaddeeac7eb986dcc9be7 100644 (file)
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -71,15 +71,9 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
 {
     wxToggleButton *button = wxDynamicCast(control, wxToggleButton);
 
 {
     wxToggleButton *button = wxDynamicCast(control, wxToggleButton);
 

-    wxString label = GetText(wxT("label"));
-

     button->Create(m_parentAsWindow,
                    GetID(),
     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,
                    GetPosition(), GetSize(),
                    GetStyle(),
                    wxDefaultValidator,