Invalid conversion compile error fix (GTK+ 2.12.9)

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

diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index 4b8390db17befba57f00f344f3b39015504a8989..f2bd34de21d536c8baacc13f72c488085ab9285b 100644 (file)
--- a/src/xrc/xh_choicbk.cpp
+++ b/src/xrc/xh_choicbk.cpp
@@ -40,13 +40,11 @@ wxChoicebookXmlHandler::wxChoicebookXmlHandler()
     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(wxCHB_DEFAULT);
     XRC_ADD_STYLE(wxCHB_LEFT);
     XRC_ADD_STYLE(wxCHB_RIGHT);
     XRC_ADD_STYLE(wxCHB_TOP);
     XRC_ADD_STYLE(wxCHB_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);

-#endif

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -84,6 +82,19 @@ 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
             {


@@ -108,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;