Fix wxListCtrlXmlHandler so that it accepts icon with wxLC_LIST and wxLC_REPORT style...

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

diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp
index 470be509bac8231e0426b74327f137672774b914..7d4f64ae98ed5ca48c9e33ca8f7c8217bedb7178 100644 (file)
--- a/src/xrc/xh_listbk.cpp
+++ b/src/xrc/xh_listbk.cpp
@@ -40,13 +40,11 @@ wxListbookXmlHandler::wxListbookXmlHandler()
     XRC_ADD_STYLE(wxBK_TOP);
     XRC_ADD_STYLE(wxBK_BOTTOM);
 
-#if WXWIN_COMPATIBILITY_2_6
     XRC_ADD_STYLE(wxLB_DEFAULT);
     XRC_ADD_STYLE(wxLB_LEFT);
     XRC_ADD_STYLE(wxLB_RIGHT);
     XRC_ADD_STYLE(wxLB_TOP);
     XRC_ADD_STYLE(wxLB_BOTTOM);
-#endif
 
     AddWindowStyles();
 }
@@ -84,6 +82,19 @@ wxObject *wxListbookXmlHandler::DoCreateResource()
                     int imgIndex = imgList->Add(bmp);
                     m_listbook->SetPageImage(m_listbook->GetPageCount()-1, imgIndex );
                 }
+                else if ( HasParam(wxT("image")) )
+                {
+                    if ( m_listbook->GetImageList() )
+                    {
+                        m_listbook->SetPageImage(m_listbook->GetPageCount()-1,
+                                                 GetLong(wxT("image")) );
+                    }
+                    else // image without image list?
+                    {
+                        ReportError(n, "image can only be used in conjunction "
+                                       "with imagelist");
+                    }
+                }
             }
             else
             {
@@ -108,6 +119,10 @@ wxObject *wxListbookXmlHandler::DoCreateResource()
                    GetStyle(wxT("style")),
                    GetName());
 
+        wxImageList *imagelist = GetImageList();
+        if ( imagelist )
+            nb->AssignImageList(imagelist);
+
         wxListbook *old_par = m_listbook;
         m_listbook = nb;
         bool old_ins = m_isInside;