wxMSW: return correct value from wxMessageDialog::GetReturnCode().

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

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index 64eec4e746dcb1153b718e24491d5d69dade7adc..c4fb4e4468a9695d4ab974d1ef814f6455973978 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_listc.cpp
 // Purpose:     XRC resource for wxListCtrl
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_listc.cpp
 // Purpose:     XRC resource for wxListCtrl

-// Author:      Brian Gavin
+// Author:      Brian Gavin, Kinaou Hervé, Vadim Zeitlin

 // Created:     2000/09/09
 // Created:     2000/09/09

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Brian Gavin
 // Copyright:   (c) 2000 Brian Gavin

+//              (c) 2009 Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -24,13 +24,37 @@
 #endif
 
 #include "wx/listctrl.h"
 #endif
 
 #include "wx/listctrl.h"

+#include "wx/imaglist.h"
+
+namespace
+{
+
+const char *LISTCTRL_CLASS_NAME = "wxListCtrl";
+const char *LISTITEM_CLASS_NAME = "listitem";
+const char *LISTCOL_CLASS_NAME = "listcol";
+
+} // anonymous namespace

 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
 
 wxListCtrlXmlHandler::wxListCtrlXmlHandler()
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
 
 wxListCtrlXmlHandler::wxListCtrlXmlHandler()

-: wxXmlResourceHandler()
+    : wxXmlResourceHandler()

 {
 {

+    // wxListItem styles
+    XRC_ADD_STYLE(wxLIST_FORMAT_LEFT);
+    XRC_ADD_STYLE(wxLIST_FORMAT_RIGHT);
+    XRC_ADD_STYLE(wxLIST_FORMAT_CENTRE);
+    XRC_ADD_STYLE(wxLIST_MASK_STATE);
+    XRC_ADD_STYLE(wxLIST_MASK_TEXT);
+    XRC_ADD_STYLE(wxLIST_MASK_IMAGE);
+    XRC_ADD_STYLE(wxLIST_MASK_DATA);
+    XRC_ADD_STYLE(wxLIST_MASK_WIDTH);
+    XRC_ADD_STYLE(wxLIST_MASK_FORMAT);
+    XRC_ADD_STYLE(wxLIST_STATE_FOCUSED);
+    XRC_ADD_STYLE(wxLIST_STATE_SELECTED);
+
+    // wxListCtrl styles

     XRC_ADD_STYLE(wxLC_LIST);
     XRC_ADD_STYLE(wxLC_REPORT);
     XRC_ADD_STYLE(wxLC_ICON);
     XRC_ADD_STYLE(wxLC_LIST);
     XRC_ADD_STYLE(wxLC_REPORT);
     XRC_ADD_STYLE(wxLC_ICON);


@@ -52,6 +76,106 @@ wxListCtrlXmlHandler::wxListCtrlXmlHandler()
 }
 
 wxObject *wxListCtrlXmlHandler::DoCreateResource()
 }
 
 wxObject *wxListCtrlXmlHandler::DoCreateResource()

+{
+    if ( m_class == LISTITEM_CLASS_NAME )
+    {
+        HandleListItem();
+    }
+    else if ( m_class == LISTCOL_CLASS_NAME )
+    {
+        HandleListCol();
+    }
+    else
+    {
+        wxASSERT_MSG( m_class == LISTCTRL_CLASS_NAME,
+                        "can't handle unknown node" );
+
+        return HandleListCtrl();
+    }
+
+    return m_parentAsWindow;
+}
+
+bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, LISTCTRL_CLASS_NAME) ||
+            IsOfClass(node, LISTITEM_CLASS_NAME) ||
+             IsOfClass(node, LISTCOL_CLASS_NAME);
+}
+
+void wxListCtrlXmlHandler::HandleCommonItemAttrs(wxListItem& item)
+{
+    if (HasParam(wxT("align")))
+        item.SetAlign((wxListColumnFormat)GetStyle(wxT("align")));
+    if (HasParam(wxT("text")))
+        item.SetText(GetText(wxT("text")));
+}
+
+void wxListCtrlXmlHandler::HandleListCol()
+{
+    wxListCtrl * const list = wxDynamicCast(m_parentAsWindow, wxListCtrl);
+    wxCHECK_RET( list, "must have wxListCtrl parent" );
+
+    if ( !list->HasFlag(wxLC_REPORT) )
+    {
+        ReportError("Only report mode list controls can have columns.");
+        return;
+    }
+
+    wxListItem item;
+
+    HandleCommonItemAttrs(item);
+    if (HasParam(wxT("width")))
+        item.SetWidth((int)GetLong(wxT("width")));
+    if (HasParam(wxT("image")))
+        item.SetImage((int)GetLong(wxT("image")));
+
+    list->InsertColumn(list->GetColumnCount(), item);
+}
+
+void wxListCtrlXmlHandler::HandleListItem()
+{
+    wxListCtrl * const list = wxDynamicCast(m_parentAsWindow, wxListCtrl);
+    wxCHECK_RET( list, "must have wxListCtrl parent" );
+
+    wxListItem item;
+
+    HandleCommonItemAttrs(item);
+
+    if (HasParam(wxT("bg")))
+        item.SetBackgroundColour(GetColour(wxT("bg")));
+    if (HasParam(wxT("col")))
+        item.SetColumn((int)GetLong(wxT("col")));
+    if (HasParam(wxT("data")))
+        item.SetData(GetLong(wxT("data")));
+    if (HasParam(wxT("font")))
+        item.SetFont(GetFont(wxT("font"), list));
+    if (HasParam(wxT("state")))
+        item.SetState(GetStyle(wxT("state")));
+    if (HasParam(wxT("textcolour")))
+        item.SetTextColour(GetColour(wxT("textcolour")));
+    if (HasParam(wxT("textcolor")))
+        item.SetTextColour(GetColour(wxT("textcolor")));
+
+    // the list control icon style, may be 0
+    int image;
+    if ( list->HasFlag(wxLC_ICON) )
+        image = GetImageIndex(list, wxIMAGE_LIST_NORMAL);
+    else if ( list->HasFlag(wxLC_SMALL_ICON) || list->HasFlag(wxLC_REPORT) || list->HasFlag(wxLC_LIST) )
+        image = GetImageIndex(list, wxIMAGE_LIST_SMALL);
+    else
+        image = wxNOT_FOUND;
+
+    if ( image != wxNOT_FOUND )
+        item.SetImage(image);
+
+    // append the list item to the control
+    item.SetId(list->GetItemCount());
+
+    list->InsertItem(item);
+}
+
+wxListCtrl *wxListCtrlXmlHandler::HandleListCtrl()

 {
     XRC_MAKE_INSTANCE(list, wxListCtrl)
 
 {
     XRC_MAKE_INSTANCE(list, wxListCtrl)
 


@@ -62,16 +186,80 @@ wxObject *wxListCtrlXmlHandler::DoCreateResource()
                  wxDefaultValidator,
                  GetName());
 
                  wxDefaultValidator,
                  GetName());
 

-    // FIXME: add columns definition
+    // we can optionally have normal and/or small image lists
+    wxImageList *imagelist;
+    imagelist = GetImageList(wxT("imagelist"));
+    if ( imagelist )
+        list->AssignImageList(imagelist, wxIMAGE_LIST_NORMAL);
+    imagelist = GetImageList(wxT("imagelist-small"));
+    if ( imagelist )
+        list->AssignImageList(imagelist, wxIMAGE_LIST_SMALL);

 
 

+    CreateChildrenPrivately(list);

     SetupWindow(list);
 
     return list;
 }
 
     SetupWindow(list);
 
     return list;
 }
 

-bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
+long wxListCtrlXmlHandler::GetImageIndex(wxListCtrl *listctrl, int which)

 {
 {

-    return IsOfClass(node, wxT("wxListCtrl"));
+    // use different tag names depending on whether we need a normal or small
+    // image
+    wxString
+        bmpParam("bitmap"),
+        imgParam("image");
+    switch ( which )
+    {
+        case wxIMAGE_LIST_SMALL:
+            bmpParam += "-small";
+            imgParam += "-small";
+            break;
+
+        case wxIMAGE_LIST_NORMAL:
+            // nothing to do
+            break;
+
+        default:
+            wxFAIL_MSG( "unsupported image list kind" );
+            return wxNOT_FOUND;
+    }
+
+    // look for either bitmap or image tags
+    int imgIndex = wxNOT_FOUND;
+    if ( HasParam(bmpParam) )
+    {
+        // we implicitly construct an image list containing the specified
+        // bitmaps
+        wxBitmap bmp = GetBitmap(bmpParam, wxART_OTHER);
+
+        // create the image list on demand for the first bitmap
+        wxImageList *imgList = listctrl->GetImageList(which);
+        if ( !imgList )
+        {
+            imgList = new wxImageList( bmp.GetWidth(), bmp.GetHeight() );
+            listctrl->AssignImageList( imgList, which );
+        }
+
+        imgIndex = imgList->Add(bmp);
+    }
+
+    if ( HasParam(imgParam) )
+    {
+        if ( imgIndex != wxNOT_FOUND )
+        {
+            // TODO: we should really check that only bitmap or only image tags
+            //       are used across all items of the control, not just in this
+            //       one
+            ReportError(wxString::Format(
+                "listitem %s attribute ignored because %s is also specified",
+                bmpParam, imgParam));
+        }
+
+        // just use the specified index directly
+        imgIndex = GetLong(imgParam);
+    }
+
+    return imgIndex;

 }
 
 #endif // wxUSE_XRC && wxUSE_LISTCTRL
 }
 
 #endif // wxUSE_XRC && wxUSE_LISTCTRL