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

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

diff --git a/include/wx/xrc/xh_odcombo.h b/include/wx/xrc/xh_odcombo.h
index 7febc5590c7aa710a36136c3ed6a9f2f5974cdde..d639f4108a11b0e9e98d0559f00f9fd9fd14d087 100644 (file)
--- a/include/wx/xrc/xh_odcombo.h
+++ b/include/wx/xrc/xh_odcombo.h
@@ -3,7 +3,6 @@
 // Purpose:     XML resource handler for wxOwnerDrawnComboBox
 // Author:      Alex Bligh - based on wx/xrc/xh_combo.h
 // Created:     2006/06/19
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Alex Bligh
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,20 +12,23 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_ODCOMBOBOX
+#if wxUSE_XRC && wxUSE_ODCOMBOBOX
 
 class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+
 public:
     wxOwnerDrawnComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_ODCOMBOBOX
 
 #endif // _WX_XH_ODCOMBO_H_
+