Applied rowspan patch #15276 (dghart)

[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 508883350d1e515897dfaf3c6185a3926bd58d93..53638089f4b6e7bf2e3536e4124b1a0dc7cd973a 100644 (file)
--- a/include/wx/xrc/xh_radbx.h
+++ b/include/wx/xrc/xh_radbx.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_radbx.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_radbx.h

-// Purpose:     XML resource handler for radio box
+// Purpose:     XML resource handler for wxRadioBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -13,29 +13,38 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_RADIOBOX
+#if wxUSE_XRC && wxUSE_RADIOBOX

 
 class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
+

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

+

 private:
     bool m_insideBox;
 
     // the items labels
 private:
     bool m_insideBox;
 
     // the items labels

-    wxArrayString labels;
+    wxArrayString m_labels;

 
 

+#if wxUSE_TOOLTIPS

     // the items tooltips
     // the items tooltips

-    wxArrayString tooltips;
+    wxArrayString m_tooltips;
+#endif // wxUSE_TOOLTIPS

 
     // the item help text
 
     // the item help text

-    wxArrayString helptexts;
-    wxArrayInt    helptextSpecified;
+    wxArrayString m_helptexts;
+    wxArrayInt    m_helptextSpecified;
+
+    // if the corresponding array element is 1, the radiobox item is
+    // disabled/hidden
+    wxArrayInt m_isEnabled,
+               m_isShown;

 };
 
 };
 

-#endif // wxUSE_RADIOBOX
+#endif // wxUSE_XRC && wxUSE_RADIOBOX

 
 #endif // _WX_XH_RADBX_H_
 
 #endif // _WX_XH_RADBX_H_