wx.aui.AUI_ART_GRADIENT_TYPE --> wx.aui.AUI_DOCKART_GRADIENT_TYPE

[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 42cc3f52b862252aa63917991c2d8d8f9c579b5f..94ee62498df6568a76dd0ef7e96fdbe8ae52456e 100644 (file)
--- a/include/wx/xrc/xh_radbx.h
+++ b/include/wx/xrc/xh_radbx.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_radbx.h
-// Purpose:     XML resource handler for radio box
+// Name:        wx/xrc/xh_radbx.h
+// 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$


@@ -11,25 +11,33 @@
 #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"
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_RADIOBOX
+#if wxUSE_XRC && wxUSE_RADIOBOX

 
 

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

 {
 {

+    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;
 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_XRC && wxUSE_RADIOBOX

 
 #endif // _WX_XH_RADBX_H_
 
 #endif // _WX_XH_RADBX_H_