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 d2387781c579325f85c296012dca5433a4b53b2b..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


@@ -11,22 +11,24 @@
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 

-#ifdef __GNUG__
-#pragma interface "xh_choic.h"
-#endif
-

 #include "wx/xrc/xmlres.h"
 
 #include "wx/xrc/xmlres.h"
 

-class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
+#if wxUSE_XRC && wxUSE_CHOICE
+
+class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler

 {
 {

+    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_