X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f4cead9d14d84f4e6e96c73dae90a7f252d432..567e5e47ee9af2f6e7343cb94bd890a3a6104f1e:/src/xrc/xh_collpane.cpp diff --git a/src/xrc/xh_collpane.cpp b/src/xrc/xh_collpane.cpp index c8b489b3bc..70b50113fa 100644 --- a/src/xrc/xh_collpane.cpp +++ b/src/xrc/xh_collpane.cpp @@ -17,12 +17,17 @@ #if wxUSE_XRC && wxUSE_COLLPANE +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif + +#include "wx/collpane.h" #include "wx/xrc/xh_collpane.h" -#include "wx/log.h" IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler) -wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler() : wxXmlResourceHandler() +wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler() +: wxXmlResourceHandler(), m_isInside(false) { XRC_ADD_STYLE(wxCP_NO_TLW_RESIZE); XRC_ADD_STYLE(wxCP_DEFAULT_STYLE); @@ -49,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; } } @@ -60,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; } @@ -68,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;