Fix typo in last commit

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

diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index c828b233c901f98dc62978fda078d7856676f943..f2bd34de21d536c8baacc13f72c488085ab9285b 100644 (file)
--- a/src/xrc/xh_choicbk.cpp
+++ b/src/xrc/xh_choicbk.cpp
@@ -1,16 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_choicbk.cpp
+// Name:        src/xrc/xh_choicbk.cpp

 // Purpose:     XRC resource for wxChoicebook
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // Purpose:     XRC resource for wxChoicebook
 // Author:      Vaclav Slavik
 // Created:     2000/03/21

+// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_choicbk.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,21 +19,32 @@
 
 #include "wx/xrc/xh_choicbk.h"
 
 
 #include "wx/xrc/xh_choicbk.h"
 

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

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

-#include "wx/sizer.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler)
 
 wxChoicebookXmlHandler::wxChoicebookXmlHandler()
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler)
 
 wxChoicebookXmlHandler::wxChoicebookXmlHandler()

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

 {
 {

-    XRC_ADD_STYLE(wxCB_DEFAULT);
-    XRC_ADD_STYLE(wxCB_LEFT);
-    XRC_ADD_STYLE(wxCB_RIGHT);
-    XRC_ADD_STYLE(wxCB_TOP);
-    XRC_ADD_STYLE(wxCB_BOTTOM);
+    XRC_ADD_STYLE(wxBK_DEFAULT);
+    XRC_ADD_STYLE(wxBK_LEFT);
+    XRC_ADD_STYLE(wxBK_RIGHT);
+    XRC_ADD_STYLE(wxBK_TOP);
+    XRC_ADD_STYLE(wxBK_BOTTOM);
+
+    XRC_ADD_STYLE(wxCHB_DEFAULT);
+    XRC_ADD_STYLE(wxCHB_LEFT);
+    XRC_ADD_STYLE(wxCHB_RIGHT);
+    XRC_ADD_STYLE(wxCHB_TOP);
+    XRC_ADD_STYLE(wxCHB_BOTTOM);

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -74,14 +82,29 @@ wxObject *wxChoicebookXmlHandler::DoCreateResource()
                     int imgIndex = imgList->Add(bmp);
                     m_choicebook->SetPageImage(m_choicebook->GetPageCount()-1, imgIndex );
                 }
                     int imgIndex = imgList->Add(bmp);
                     m_choicebook->SetPageImage(m_choicebook->GetPageCount()-1, imgIndex );
                 }

+                else if ( HasParam(wxT("image")) )
+                {
+                    if ( m_choicebook->GetImageList() )
+                    {
+                        m_choicebook->SetPageImage(m_choicebook->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, "choicebookpage child must be a window");
+            }

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

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

             return NULL;
         }
     }
             return NULL;
         }
     }


@@ -96,6 +119,10 @@ wxObject *wxChoicebookXmlHandler::DoCreateResource()
                    GetStyle(wxT("style")),
                    GetName());
 
                    GetStyle(wxT("style")),
                    GetName());
 

+        wxImageList *imagelist = GetImageList();
+        if ( imagelist )
+            nb->AssignImageList(imagelist);
+

         wxChoicebook *old_par = m_choicebook;
         m_choicebook = nb;
         bool old_ins = m_isInside;
         wxChoicebook *old_par = m_choicebook;
         m_choicebook = nb;
         bool old_ins = m_isInside;