From: Václav Slavík Date: Wed, 11 Sep 2013 15:20:16 +0000 (+0000) Subject: Fix incorrect XRC format docs for wxMenu(Bar)'s "style" property. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/697c1d39be6c94965672878d6d2a0ddce0928091 Fix incorrect XRC format docs for wxMenu(Bar)'s "style" property. It is not true that no standard properties are allowed, "style" is. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index d92ffe7df3..9301bcd92f 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1214,6 +1214,8 @@ objects. If sizer child is used, it sets @row3col{label, @ref overview_xrcformat_type_text, Menu's label (default: empty, but required for menus other than popup menus).} +@row3col{style, @ref overview_xrcformat_type_style, + Window style for the menu.} @row3col{help, @ref overview_xrcformat_type_text, Help shown in statusbar when the menu is selected (only for submenus of another wxMenu, default: none).} @@ -1223,7 +1225,7 @@ objects. If sizer child is used, it sets @endTable Note that unlike most controls, wxMenu does @em not have -@ref overview_xrcformat_std_props. +@ref overview_xrcformat_std_props, with the exception of @c style. A menu object can have one or more child objects of the wxMenuItem or wxMenu classes or @c break or @c separator pseudo-classes. @@ -1284,8 +1286,14 @@ Example: @subsubsection xrc_wxmenubar wxMenuBar -No properties. Note that unlike most controls, wxMenuBar does @em not have -@ref overview_xrcformat_std_props. +@beginTable +@hdr3col{property, type, description} +@row3col{style, @ref overview_xrcformat_type_style, + Window style for the menu bar.} +@endTable + +Note that unlike most controls, wxMenuBar does @em not have +@ref overview_xrcformat_std_props, with the exception of @c style. A menubar can have one or more child objects of the @ref xrc_wxmenu "wxMenu" class.