Don't assume any particular default size for XRC image lists.

Let the image list deduce its size from the first bitmap in it. This is better
than the old behaviour of using the standard icon size as it allows to omit
the size from the image lists provided they contain the bitmaps of the same
size.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 75ec8c814badd516e54adb493a03803135b3563d..7f966cce6a9b7d3e54d75964b6e3c59e4d33a505 100644 (file)
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -934,7 +934,7 @@ The available properties are:
 @row3col{mask, @ref overview_xrcformat_type_bool,
      If masks should be created for all images (default: true).}
 @row3col{size, @ref overview_xrcformat_type_size,
 @row3col{mask, @ref overview_xrcformat_type_bool,
      If masks should be created for all images (default: true).}
 @row3col{size, @ref overview_xrcformat_type_size,

-     The size of the images in the list (default: system default icon size)).}
+     The size of the images in the list (default: the size of the first bitmap).}

 @endTable
 
 Example:
 @endTable
 
 Example:

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index cd053af857c9c73fde49a6de1bf8be62b53ec814..ba4a986bb39de687449d100378e767fe81adc242 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1493,18 +1493,13 @@ wxImageList *wxXmlResourceHandler::GetImageList(const wxString& param)
     wxXmlNode * const oldnode = m_node;
     m_node = imagelist_node;
 
     wxXmlNode * const oldnode = m_node;
     m_node = imagelist_node;
 

-    // size
+    // Get the size if we have it, otherwise we will use the size of the first
+    // list element.

     wxSize size = GetSize();
     wxSize size = GetSize();

-    size.SetDefaults(wxSize(wxSystemSettings::GetMetric(wxSYS_ICON_X),
-                            wxSystemSettings::GetMetric(wxSYS_ICON_Y)));
-
-    // mask: true by default
-    bool mask = HasParam(wxT("mask")) ? GetBool(wxT("mask"), true) : true;

 
 

-    // now we have everything we need to create the image list
-    wxImageList *imagelist = new wxImageList(size.x, size.y, mask);
-
-    // add images
+    // Start adding images, we'll create the image list when adding the first
+    // one.
+    wxImageList * imagelist = NULL;

     wxString parambitmap = wxT("bitmap");
     if ( HasParam(parambitmap) )
     {
     wxString parambitmap = wxT("bitmap");
     if ( HasParam(parambitmap) )
     {


@@ -1513,8 +1508,21 @@ wxImageList *wxXmlResourceHandler::GetImageList(const wxString& param)
         {
             if (n->GetType() == wxXML_ELEMENT_NODE && n->GetName() == parambitmap)
             {
         {
             if (n->GetType() == wxXML_ELEMENT_NODE && n->GetName() == parambitmap)
             {

+                wxIcon icon = GetIcon(n);
+                if ( !imagelist )
+                {
+                    // We need the real image list size to create it.
+                    if ( size == wxDefaultSize )
+                        size = icon.GetSize();
+
+                    // We use the mask by default.
+                    bool mask = !HasParam(wxS("mask")) || GetBool(wxS("mask"));
+
+                    imagelist = new wxImageList(size.x, size.y, mask);
+                }
+

                 // add icon instead of bitmap to keep the bitmap mask
                 // add icon instead of bitmap to keep the bitmap mask

-                imagelist->Add(GetIcon(n));
+                imagelist->Add(icon);

             }
             n = n->GetNext();
         }
             }
             n = n->GetNext();
         }