Apply patch [ 1548750 ] wxVsnprintf() various fixes

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

diff --git a/include/wx/xrc/xh_radbx.h b/include/wx/xrc/xh_radbx.h
index bd0e8152cb446431aff202bd76da90e3bd5a0566..508883350d1e515897dfaf3c6185a3926bd58d93 100644 (file)
--- a/include/wx/xrc/xh_radbx.h
+++ b/include/wx/xrc/xh_radbx.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -11,15 +11,11 @@
 #ifndef _WX_XH_RADBX_H_
 #define _WX_XH_RADBX_H_
 
 #ifndef _WX_XH_RADBX_H_
 #define _WX_XH_RADBX_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_radbx.h"
-#endif
-

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

-class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler

 {
 DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
 public:


@@ -28,9 +24,18 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 private:
     bool m_insideBox;
     virtual bool CanHandle(wxXmlNode *node);
 private:
     bool m_insideBox;

-    wxArrayString strList;
+
+    // the items labels
+    wxArrayString labels;
+
+    // the items tooltips
+    wxArrayString tooltips;
+
+    // the item help text
+    wxArrayString helptexts;
+    wxArrayInt    helptextSpecified;

 };
 
 };
 

-#endif
+#endif // wxUSE_RADIOBOX

 
 #endif // _WX_XH_RADBX_H_
 
 #endif // _WX_XH_RADBX_H_