X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed2fbeb835854c97d176f8bdfd6f06a84273f5d7..e68b7b364aff19665e2c6ee8c68266b6f3d56355:/src/xrc/xh_listbk.cpp

diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp
index 36138404de..7d4f64ae98 100644
--- 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,14 +82,29 @@ 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
-                wxLogError(wxT("Error in resource."));
+            {
+                ReportError(n, "listbookpage child must be a window");
+            }
             return wnd;
         }
         else
         {
-            wxLogError(wxT("Error in resource: no control within listbook's <page> tag."));
+            ReportError("listbookpage must have a window child");
             return NULL;
         }
     }
@@ -106,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;