No changes, just slightly simplify the tool insertion code.

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

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 01a280ef26fc6b195b49563fbc4fcb4aa6984c39..c683fbc273f1f982bbbad311086f85434e241bfa 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -87,14 +87,29 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
                     int imgIndex = imgList->Add(bmp);
                     m_notebook->SetPageImage(m_notebook->GetPageCount()-1, imgIndex );
                 }
+                else if ( HasParam(wxT("image")) )
+                {
+                    if ( m_notebook->GetImageList() )
+                    {
+                        m_notebook->SetPageImage(m_notebook->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, "notebookpage child must be a window");
+            }
             return wnd;
         }
         else
         {
-            wxLogError(wxT("Error in resource: no control within notebook's <page> tag."));
+            ReportError("notebookpage must have a window child");
             return NULL;
         }
     }
@@ -109,6 +124,10 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
                    GetStyle(wxT("style")),
                    GetName());
 
+        wxImageList *imagelist = GetImageList();
+        if ( imagelist )
+            nb->AssignImageList(imagelist);
+
         SetupWindow(nb);
 
         wxNotebook *old_par = m_notebook;