X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68d89837ca67e18c1a10f3581cd965d114794bce..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/xrc/xh_collpane.cpp?ds=sidebyside diff --git a/src/xrc/xh_collpane.cpp b/src/xrc/xh_collpane.cpp index bad9bcd9df..70b50113fa 100644 --- a/src/xrc/xh_collpane.cpp +++ b/src/xrc/xh_collpane.cpp @@ -26,7 +26,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler) -wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler() +wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler() : wxXmlResourceHandler(), m_isInside(false) { XRC_ADD_STYLE(wxCP_NO_TLW_RESIZE); @@ -54,7 +54,7 @@ wxObject *wxCollapsiblePaneXmlHandler::DoCreateResource() } else { - wxLogError(wxT("Error in resource: no control within collapsible pane's tag.")); + ReportError("no control within panewindow"); return NULL; } } @@ -65,7 +65,7 @@ wxObject *wxCollapsiblePaneXmlHandler::DoCreateResource() wxString label = GetParamValue(wxT("label")); if (label.empty()) { - wxLogError(wxT("Error in resource: empty label for wxCollapsiblePane")); + ReportParamError("label", "label cannot be empty"); return NULL; } @@ -73,11 +73,11 @@ wxObject *wxCollapsiblePaneXmlHandler::DoCreateResource() GetID(), label, GetPosition(), GetSize(), - GetStyle(_T("style"), wxCP_DEFAULT_STYLE), + GetStyle(wxT("style"), wxCP_DEFAULT_STYLE), wxDefaultValidator, GetName()); - ctrl->Collapse(GetBool(_T("collapsed"))); + ctrl->Collapse(GetBool(wxT("collapsed"))); SetupWindow(ctrl); wxCollapsiblePane *old_par = m_collpane;