From 03cf4aa61da039f4331bfc788cc07850a50a0df5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Sep 2007 16:29:05 +0000 Subject: [PATCH] apply XRCID() automatically to XRCSIZERITEM() argument (patch 1798697) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/txrc.tex | 2 +- include/wx/xrc/xmlres.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/latex/wx/txrc.tex b/docs/latex/wx/txrc.tex index e77cfd21f5..3a11b955d7 100644 --- a/docs/latex/wx/txrc.tex +++ b/docs/latex/wx/txrc.tex @@ -520,7 +520,7 @@ The code can then access the sizer item by using {\tt XRCSIZERITEM} and {\tt XRCID} together. \begin{verbatim} -wxSizerItem* item = XRCSIZERITEM(*this, XRCID("area")); +wxSizerItem* item = XRCSIZERITEM(*this, "area"); \end{verbatim} \subsection{Adding new resource handlers}\label{newresourcehandlers} diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index efaba14f72..877dc1237d 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -326,10 +326,10 @@ private: // 400, 300 // // -// wxSizerItem* item = XRCSIZERITEM(*this, wxT("area")) +// wxSizerItem* item = XRCSIZERITEM(*this, "area") #define XRCSIZERITEM(window, id) \ - ((window).GetSizer() ? (window).GetSizer()->GetItemById(id) : NULL) + ((window).GetSizer() ? (window).GetSizer()->GetItemById(XRCID(id)) : NULL) // wxXmlResourceHandler is an abstract base class for resource handlers // capable of creating a control from an XML node. -- 2.45.2