XRC: ability to create wxStaticBitmap with wxBitmapBundle

docs/doxygen/overviews/xrc_format.h

@@ -2145,10 +2145,14 @@ child and the second one for right/bottom child window.
 
 @subsubsection xrc_wxstaticbitmap wxStaticBitmap
 
+wxStaticBitmap requires @c bitmap or @c bitmaps tag.
+
 @beginTable
 @hdr3col{property, type, description}
 @row3col{bitmap, @ref overview_xrcformat_type_bitmap,
-     Bitmap to display (required).}
+     Bitmap to display. Mutually exclusive with @c bitmaps.}
+@row3col{bitmaps, @ref overview_xrcformat_type_bitmaps,
+     BitmapBundle to display. Mutually exclusive with @c bitmap.}
 @endTable
 
 @subsubsection xrc_wxstaticbox wxStaticBox

misc/schema/xrc_schema.rnc

@@ -1556,7 +1556,10 @@ wxStaticBitmap =
         attribute class { "wxStaticBitmap" } &
         stdObjectNodeAttributes &
         stdWindowProperties &
-        element bitmap {_, t_bitmap }
+        (
+            element bitmap {_, t_bitmap } |
+            element bitmaps  {_, t_bitmaps }
+        )
     }
 
 

src/xrc/xh_stbmp.cpp

@@ -33,7 +33,7 @@ wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
 
     bmp->Create(m_parentAsWindow,
                 GetID(),
-                GetBitmap(wxT("bitmap"), wxART_OTHER, GetSize()),
+                GetBitmapOrBitmaps(wxT("bitmap"), wxT("bitmaps"), wxART_OTHER, GetSize()),
                 GetPosition(), GetSize(),
                 GetStyle(),
                 GetName());