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

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

diff --git a/include/wx/xrc/xh_bmp.h b/include/wx/xrc/xh_bmp.h
index eb8799aa658e6028c117f0069cdaeeeacfde52f4..ddc8cba440d6a5ce562094db9c037535d25975fc 100644 (file)
--- a/include/wx/xrc/xh_bmp.h
+++ b/include/wx/xrc/xh_bmp.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XML resource handler for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/00
 // Purpose:     XML resource handler for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/00

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,16 +10,14 @@
 #ifndef _WX_XH_BMP_H_
 #define _WX_XH_BMP_H_
 
 #ifndef _WX_XH_BMP_H_
 #define _WX_XH_BMP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xh_bmp.h"
-#endif
-

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

+#if wxUSE_XRC

 
 class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+

 public:
     wxBitmapXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxBitmapXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -29,12 +26,14 @@ public:
 
 class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+

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

+#endif // wxUSE_XRC

 
 #endif // _WX_XH_BMP_H_
 
 #endif // _WX_XH_BMP_H_