From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 12 Jul 2010 22:50:09 +0000 (+0000)
Subject: Fix wxToggleButtonXmlHandler compilation with wxUniv.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/969641a3915da2643272d279bb8cbdd113b21f86?hp=2d61788423790686d1193a0d74b1562013246084

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 1607b0f4ef..be031f7565 100644
--- 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);
 
-    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,