X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..b4a5e7b6f19bcef7449c87d46ab46af1b4aaec6b:/src/xrc/xh_listb.cpp diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp index 68caf3c1b8..a94406affb 100644 --- a/src/xrc/xh_listb.cpp +++ b/src/xrc/xh_listb.cpp @@ -7,8 +7,8 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_listb.h" #endif @@ -19,14 +19,16 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_listb.h" #include "wx/listbox.h" #include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler) -wxListBoxXmlHandler::wxListBoxXmlHandler() -: wxXmlResourceHandler() , m_insideBox(FALSE) +wxListBoxXmlHandler::wxListBoxXmlHandler() +: wxXmlResourceHandler() , m_insideBox(false) { XRC_ADD_STYLE(wxLB_SINGLE); XRC_ADD_STYLE(wxLB_MULTIPLE); @@ -39,14 +41,14 @@ wxListBoxXmlHandler::wxListBoxXmlHandler() } wxObject *wxListBoxXmlHandler::DoCreateResource() -{ +{ if( m_class == wxT("wxListBox")) { // 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) @@ -75,7 +77,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() if (strings != NULL) delete[] strings; - strList.Clear(); // dump the strings + strList.Clear(); // dump the strings return control; } @@ -83,7 +85,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() { // on the inside now. // handle Label - + // add to the list wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) @@ -99,3 +101,5 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node) return (IsOfClass(node, wxT("wxListBox")) || (m_insideBox && node->GetName() == wxT("item"))); } + +#endif // wxUSE_XRC