X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e066e2566a4e5db3510fe6a204d66850eaeceade..00b2a5df9502adfd9a14ce01ab603f7906984995:/contrib/src/xml/xh_radbx.cpp?ds=sidebyside diff --git a/contrib/src/xml/xh_radbx.cpp b/contrib/src/xml/xh_radbx.cpp index 35db103fa2..fcf365a8d7 100644 --- a/contrib/src/xml/xh_radbx.cpp +++ b/contrib/src/xml/xh_radbx.cpp @@ -25,7 +25,7 @@ #if wxUSE_RADIOBOX wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() -: wxXmlResourceHandler() , m_InsideBox(FALSE) +: wxXmlResourceHandler() , m_insideBox(FALSE) { ADD_STYLE(wxRA_SPECIFY_COLS); ADD_STYLE(wxRA_HORIZONTAL); @@ -36,14 +36,14 @@ wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() wxObject *wxRadioBoxXmlHandler::DoCreateResource() { - if( m_Class == _T("wxRadioBox")) + if( m_class == wxT("wxRadioBox")) { // find the selection - long selection = GetLong( _T("selection"), -1 ); + long selection = GetLong( wxT("selection"), -1 ); // need to build the list of strings from children - m_InsideBox = TRUE; - CreateChildrenPrivately( NULL, GetParamNode(_T("content"))); + m_insideBox = TRUE; + CreateChildrenPrivately( NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; if( strList.GetCount() > 0 ) { @@ -54,13 +54,13 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() } - wxRadioBox *control = new wxRadioBox(m_ParentAsWindow, + wxRadioBox *control = new wxRadioBox(m_parentAsWindow, GetID(), - GetText(_T("label")), + GetText(wxT("label")), GetPosition(), GetSize(), strList.GetCount(), strings, - GetLong( _T("dimension"), 1 ), + GetLong( wxT("dimension"), 1 ), GetStyle(), wxDefaultValidator, GetName() @@ -83,7 +83,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() // handle Label // add to the list - strList.Add( GetNodeContent(m_Node) ); + strList.Add( GetNodeContent(m_node) ); return NULL; } @@ -94,8 +94,8 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource() bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node) { - return (IsOfClass(node, _T("wxRadioBox")) || - (m_InsideBox && node->GetName() == _T("item")) + return (IsOfClass(node, wxT("wxRadioBox")) || + (m_insideBox && node->GetName() == wxT("item")) ); }