From edb60cfcda0c3dce1510c012cb6def91829b1308 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Tue, 20 Jun 2017 08:31:16 +0200
Subject: [PATCH] Correct bitmap_in_button code for wxUniversal, wxMOTIF and
 wxGTK1

---
 src/xrc/xh_tglbtn.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 2bac11a264..9b33a47471 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -16,6 +16,10 @@
 
 #if wxUSE_XRC && wxUSE_TOGGLEBTN
 
+# if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
+#  define wxHAVE_BITMAPS_IN_BUTTON 1
+# endif
+
 #include "wx/xrc/xh_tglbtn.h"
 #include "wx/tglbtn.h"
 #include "wx/button.h" // solely for wxBU_EXACTFIT
@@ -35,7 +39,7 @@ wxObject *wxToggleButtonXmlHandler::DoCreateResource()
 
    wxObject *control = m_instance;
 
-#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
+#ifdef wxHAVE_BITMAPS_IN_BUTTON
 
     if (m_class == wxT("wxBitmapToggleButton"))
     {
@@ -78,16 +82,18 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
                    wxDefaultValidator,
                    GetName());
 
+#ifdef wxHAVE_BITMAPS_IN_BUTTON
     if ( GetParamNode("bitmap") )
     {
         button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON),
                           GetDirection("bitmapposition"));
     }
-
+#endi
+   
     button->SetValue(GetBool( wxT("checked")));
 }
 
-#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
+#ifdef wxHAVE_BITMAPS_IN_BUTTON
 void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
 {
     wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton);