X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..6a205442c40cd6e22efab15fd7170a0aeab99cae:/contrib/src/xrc/xh_chckl.cpp?ds=sidebyside diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp index 81f06455f0..522612a264 100644 --- a/contrib/src/xrc/xh_chckl.cpp +++ b/contrib/src/xrc/xh_chckl.cpp @@ -19,36 +19,47 @@ #pragma hdrstop #endif +#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__) + #include "wx/xrc/xh_chckl.h" #include "wx/checklst.h" +#include "wx/intl.h" +#include "wx/log.h" + +IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler) -wxCheckListXmlHandler::wxCheckListXmlHandler() +wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() : wxXmlResourceHandler(), m_insideBox(FALSE) { // no styles AddWindowStyles(); } -wxObject *wxCheckListXmlHandler::DoCreateResource() +wxObject *wxCheckListBoxXmlHandler::DoCreateResource() { - if (m_class == wxT("wxCheckList")) + if (m_class == wxT("wxCheckListBox") +#if WXWIN_COMPATIBILITY_2_4 + || m_class == wxT("wxCheckList") +#endif + ) { +#if WXWIN_COMPATIBILITY_2_4 + if (m_class == wxT("wxCheckList")) + wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead.")); +#endif // need to build the list of strings from children m_insideBox = TRUE; CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; - if( strList.GetCount() > 0 ) + if (strList.GetCount() > 0) { strings = new wxString[strList.GetCount()]; int count = strList.GetCount(); - for( int i = 0; i < count; i++ ) - strings[i]=strList[i]; + for(int i = 0; i < count; i++) + strings[i] = strList[i]; } - wxCheckListBox *control = wxStaticCast(m_instance, wxCheckListBox); - - if (!control) - control = new wxCheckListBox; + XRC_MAKE_INSTANCE(control, wxCheckListBox) control->Create(m_parentAsWindow, GetID(), @@ -81,8 +92,8 @@ wxObject *wxCheckListXmlHandler::DoCreateResource() SetupWindow(control); - if( strings != NULL ) - delete [] strings; + if (strings != NULL) + delete[] strings; strList.Clear(); // dump the strings return control; @@ -93,20 +104,22 @@ wxObject *wxCheckListXmlHandler::DoCreateResource() // handle Label // add to the list - strList.Add( GetNodeContent(m_node) ); - + wxString str = GetNodeContent(m_node); + if (m_resource->GetFlags() & wxXRC_USE_LOCALE) + str = wxGetTranslation(str); + strList.Add(str); return NULL; } - } - - -bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) +bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node) { - return (IsOfClass(node, wxT("wxCheckList")) || - (m_insideBox && node->GetName() == wxT("item")) - ); + return (IsOfClass(node, wxT("wxCheckListBox")) || +#if WXWIN_COMPATIBILITY_2_4 + IsOfClass(node, wxT("wxCheckList")) || +#endif + (m_insideBox && node->GetName() == wxT("item"))); } +#endif