Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/xrc/xh_choic.h b/include/wx/xrc/xh_choic.h
index 40de8ea130ff655cbbe82015955964b87ead7de8..da44862fd6a407c99ca763c3c351e1dd38fa194b 100644 (file)
--- a/include/wx/xrc/xh_choic.h
+++ b/include/wx/xrc/xh_choic.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_choic.h
+// Name:        wx/xrc/xh_choic.h

 // Purpose:     XML resource handler for wxChoice
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Purpose:     XML resource handler for wxChoice
 // Author:      Bob Mitchell
 // Created:     2000/03/21


@@ -13,17 +13,22 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

+#if wxUSE_XRC && wxUSE_CHOICE
+

 class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
 {
 class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+

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

+

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

+#endif // wxUSE_XRC && wxUSE_CHOICE

 
 #endif // _WX_XH_CHOIC_H_
 
 #endif // _WX_XH_CHOIC_H_