fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...

[wxWidgets.git] / src / xrc / xh_bmp.cpp

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 57d7985107d0ea4fdc9f5529ecc61ffe3cfa448f..a91318801b5307ebbd3a1e59abfac9d4cffad85c 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.cpp
+// Name:        src/xrc/xh_bmp.cpp
 // Purpose:     XRC resource for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
@@ -18,17 +18,22 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
 
 wxBitmapXmlHandler::wxBitmapXmlHandler()
-: wxXmlResourceHandler()
+                   :wxXmlResourceHandler()
 {
 }
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {
+    // NB: empty parameter name means "take directly from this node's next
+    //     instead of from subnode with given name"
     return new wxBitmap(GetBitmap(wxEmptyString));
 }
 
@@ -46,6 +51,8 @@ wxIconXmlHandler::wxIconXmlHandler()
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {
+    // NB: empty parameter name means "take directly from this node's next
+    //     instead of from subnode with given name"
     return new wxIcon(GetIcon(wxEmptyString));
 }