solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'toolbar-docs'

Browse source 
Improve wxToolBar documentation.

See #23427.
This commit is contained in:
Vadim Zeitlin 2023-04-08 16:35:51 +02:00
commit d0e892ac09
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
interface/wx/toolbar.h
View file

@ -171,10 +171,8 @@ public:
the menu bar in a wxFrame. the menu bar in a wxFrame.
You may create a toolbar that is managed by a frame calling You may create a toolbar that is managed by a frame calling
wxFrame::CreateToolBar(). Under Pocket PC, you should always use this wxFrame::CreateToolBar(). Where you manage your own toolbars,
function for creating the toolbar to be managed by the frame, so that create wxToolBar as usual.
wxWidgets can use a combined menubar and toolbar. Where you manage your
own toolbars, create wxToolBar as usual.
There are several different types of tools you can add to a toolbar. There are several different types of tools you can add to a toolbar.
These types are controlled by the ::wxItemKind enumeration. These types are controlled by the ::wxItemKind enumeration.
@ -354,7 +352,7 @@ public:
@remarks @remarks
wxMac: labels are only displayed if wxWidgets is built with @c wxMac: labels are only displayed if wxWidgets is built with @c
wxMAC_USE_NATIVE_TOOLBAR set to 1 wxOSX_USE_NATIVE_TOOLBAR set to 1 (which is the default).
*/ */
virtual wxToolBarToolBase* AddControl(wxControl* control, virtual wxToolBarToolBase* AddControl(wxControl* control,
const wxString& label = wxEmptyString); const wxString& label = wxEmptyString);
@ -843,7 +841,7 @@ public:
/** /**
Sets the dropdown menu for the tool given by its @e id. The tool itself Sets the dropdown menu for the tool given by its @e id. The tool itself
will delete the menu when it's no longer needed. Only supported under will delete the menu when it's no longer needed. Only supported under
GTK+ und MSW. GTK+ and MSW.
If you define a EVT_TOOL_DROPDOWN() handler in your program, you must If you define a EVT_TOOL_DROPDOWN() handler in your program, you must
call wxEvent::Skip() from it or the menu won't be displayed. call wxEvent::Skip() from it or the menu won't be displayed.