Ensure there is valid context for DrawRectangle

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

diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp
index c0d9742a6a77219811d034251871afe79babf43a..7d4f64ae98ed5ca48c9e33ca8f7c8217bedb7178 100644 (file)
--- a/src/xrc/xh_listbk.cpp
+++ b/src/xrc/xh_listbk.cpp
@@ -19,15 +19,20 @@
 
 #include "wx/xrc/xh_listbk.h"
 
 
 #include "wx/xrc/xh_listbk.h"
 

-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/sizer.h"
+#endif
+

 #include "wx/listbook.h"
 #include "wx/imaglist.h"
 #include "wx/listbook.h"
 #include "wx/imaglist.h"

-#include "wx/sizer.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler)
 
 wxListbookXmlHandler::wxListbookXmlHandler()
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler)
 
 wxListbookXmlHandler::wxListbookXmlHandler()

-: wxXmlResourceHandler(), m_isInside(false), m_listbook(NULL)
+                     :wxXmlResourceHandler(),
+                      m_isInside(false),
+                      m_listbook(NULL)

 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_LEFT);
 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_LEFT);


@@ -35,13 +40,11 @@ wxListbookXmlHandler::wxListbookXmlHandler()
     XRC_ADD_STYLE(wxBK_TOP);
     XRC_ADD_STYLE(wxBK_BOTTOM);
 
     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);
     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();
 }
 
     AddWindowStyles();
 }


@@ -79,14 +82,29 @@ wxObject *wxListbookXmlHandler::DoCreateResource()
                     int imgIndex = imgList->Add(bmp);
                     m_listbook->SetPageImage(m_listbook->GetPageCount()-1, imgIndex );
                 }
                     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
             }
             else

-                wxLogError(wxT("Error in resource."));
+            {
+                ReportError(n, "listbookpage child must be a window");
+            }

             return wnd;
         }
         else
         {
             return wnd;
         }
         else
         {

-            wxLogError(wxT("Error in resource: no control within listbook's <page> tag."));
+            ReportError("listbookpage must have a window child");

             return NULL;
         }
     }
             return NULL;
         }
     }


@@ -101,6 +119,10 @@ wxObject *wxListbookXmlHandler::DoCreateResource()
                    GetStyle(wxT("style")),
                    GetName());
 
                    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;
         wxListbook *old_par = m_listbook;
         m_listbook = nb;
         bool old_ins = m_isInside;