From fb91e8d098a80754a04833636c5c2c2677148601 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jan 2008 22:32:30 +0000 Subject: [PATCH] document LoadObject() (patch 1873045) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/xmlres.tex | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/latex/wx/xmlres.tex b/docs/latex/wx/xmlres.tex index 352864ade0..9a5488d2e7 100644 --- a/docs/latex/wx/xmlres.tex +++ b/docs/latex/wx/xmlres.tex @@ -96,7 +96,7 @@ allocated on the heap, since it will be delete by \membersection{wxXmlResource::AttachUnknownControl}\label{wxxmlresourceattachunknowncontrol} -\func{bool}{AttachUnknownControl}{\param{const wxString\& }{name}, \param{wxWindow* }{control}, \param{wxWindow* }{parent = NULL}} +\func{bool}{AttachUnknownControl}{\param{const wxString\& }{name}, \param{wxWindow* }{control}, \param{wxWindow* }{parent = \NULL}} Attaches an unknown control to the given panel/window/dialog. Unknown controls are used in conjunction with . @@ -214,18 +214,30 @@ Loads an icon resource from a file. \func{wxMenu*}{LoadMenu}{\param{const wxString\& }{name}} -Loads menu from resource. Returns NULL on failure. +Loads menu from resource. Returns \NULL on failure. \membersection{wxXmlResource::LoadMenuBar}\label{wxxmlresourceloadmenubar} \func{wxMenuBar*}{LoadMenuBar}{\param{wxWindow* }{parent}, \param{const wxString\& }{name}} -Loads a menubar from resource. Returns NULL on failure. - \func{wxMenuBar*}{LoadMenuBar}{\param{const wxString\& }{name}} -Loads a menubar from resource. Returns NULL on failure. +Loads a menubar from resource. Returns \NULL on failure. + + +\membersection{wxXmlResource::LoadObject}\label{wxxmlresourceloadobject} + +\func{wxObject*}{LoadObject}{\param{wxWindow* }{parent}, \param{const wxString\& }{name}, \param{const wxString\& }{classname}} + +\func{bool}{LoadObject}{\param{wxObject* }{instance}, \param{wxWindow* }{parent}, \param{const wxString\& }{name}, \param{const wxString\& }{classname}} + +Load an object from the resource specifying both the resource name and the +class name. + +The first overload lets you load nonstandard container windows and returns \NULL +on failure. The second one lets you finish the creation of an existing +instance and returns \false on failure. \membersection{wxXmlResource::LoadPanel}\label{wxxmlresourceloadpanel} @@ -251,7 +263,7 @@ Loads a toolbar. \func{wxXmlResource*}{Set}{\param{wxXmlResource* }{res}} -Sets the global resources object and returns a pointer to the previous one (may be NULL). +Sets the global resources object and returns a pointer to the previous one (may be \NULL). \membersection{wxXmlResource::SetFlags}\label{wxxmlresourcesetflags} -- 2.45.2