Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / xrc / xh_listb.h

diff --git a/include/wx/xrc/xh_listb.h b/include/wx/xrc/xh_listb.h
index 3b366967ddce773e268cd7fafbf3e3e9d13fa51c..43cfcb54ce14ca28b9a6a5fd6e1a8ae1e4632eaa 100644 (file)
--- a/include/wx/xrc/xh_listb.h
+++ b/include/wx/xrc/xh_listb.h
@@ -13,20 +13,22 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_LISTBOX
+#if wxUSE_XRC && wxUSE_LISTBOX

 
 class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
+

 public:
     wxListBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 public:
     wxListBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);

+

 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_LISTBOX

 
 #endif // _WX_XH_LISTB_H_
 
 #endif // _WX_XH_LISTB_H_