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

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

diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h
index 7d952d128c573a88194f6db1a7aa74aac057d365..df688a33611fdbcc6a1b6b2654de2b880da2cc0e 100644 (file)
--- a/include/wx/xrc/xh_combo.h
+++ b/include/wx/xrc/xh_combo.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XML resource handler for wxComboBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Purpose:     XML resource handler for wxComboBox
 // 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
 /////////////////////////////////////////////////////////////////////////////


@@ -13,20 +12,22 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_COMBOBOX
+#if wxUSE_XRC && wxUSE_COMBOBOX

 
 class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
+

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

+

 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_COMBOBOX

 
 #endif // _WX_XH_COMBO_H_
 
 #endif // _WX_XH_COMBO_H_