X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..acc476c530e1730d9202b404ec0b0b87ae44ced6:/src/xrc/xh_choic.cpp diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index 15f7c6a77c..d739ecafb8 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_choic.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,28 +15,30 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_choic.h" #include "wx/choice.h" #include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) -wxChoiceXmlHandler::wxChoiceXmlHandler() -: wxXmlResourceHandler() , m_insideBox(FALSE) +wxChoiceXmlHandler::wxChoiceXmlHandler() +: wxXmlResourceHandler() , m_insideBox(false) { XRC_ADD_STYLE(wxCB_SORT); AddWindowStyles(); } wxObject *wxChoiceXmlHandler::DoCreateResource() -{ +{ if( m_class == wxT("wxChoice")) { // find the selection long selection = GetLong(wxT("selection"), -1); // need to build the list of strings from children - m_insideBox = TRUE; + m_insideBox = true; CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; if (strList.GetCount() > 0) @@ -69,7 +67,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() if (strings != NULL) delete[] strings; - strList.Clear(); // dump the strings + strList.Clear(); // dump the strings return control; } @@ -77,7 +75,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() { // on the inside now. // handle Label - + // add to the list wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) @@ -93,3 +91,5 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) return (IsOfClass(node, wxT("wxChoice")) || (m_insideBox && node->GetName() == wxT("item"))); } + +#endif // wxUSE_XRC