Don't define __STRICT_ANSI__, we should build both with and without it.

[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 e30460546c08857d2efe5ddeb24506294e7e150d..e7115f80273dc978164607c90eef666e2b8dd80d 100644 (file)
--- a/include/wx/xrc/xh_choic.h
+++ b/include/wx/xrc/xh_choic.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_choic.h
+// Name:        wx/xrc/xh_choic.h
 // Purpose:     XML resource handler for wxChoice
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -11,23 +10,24 @@
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_choic.h"
-#endif
-
 #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)
+    DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+
 public:
     wxChoiceXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
+#endif // wxUSE_XRC && wxUSE_CHOICE
 
 #endif // _WX_XH_CHOIC_H_