Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[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 1fb1fddc1a968f9ad2a2c5bc5dc92c95ab52e85f..e7115f80273dc978164607c90eef666e2b8dd80d 100644 (file)
--- a/include/wx/xrc/xh_choic.h
+++ b/include/wx/xrc/xh_choic.h
@@ -3,7 +3,6 @@
 // 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

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,19 +10,19 @@
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 

-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"

 
 #if wxUSE_XRC && wxUSE_CHOICE
 
 
 #if wxUSE_XRC && wxUSE_CHOICE
 

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

 class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
 {
 class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+    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;