Merge branches 'auidemo' and 'auibarmsw' of mimi89999/wxWidgets

Improve appearance of disabled AUI buttons

Use wxSYS_COLOUR_GRAYTEXT for the disabled buttons, it works better in
non-default themes.

Also show how a disabled button looks like in the aui sample.

See https://github.com/wxWidgets/wxWidgets/pull/1801

See https://github.com/wxWidgets/wxWidgets/pull/1803
This commit is contained in:
Vadim Zeitlin
2020-04-17 23:53:41 +02:00
2 changed files with 8 additions and 11 deletions

View File

@@ -847,7 +847,8 @@ MyFrame::MyFrame(wxWindow* parent,
tb4->AddTool(ID_DropDownToolbarItem, "Item 1", tb4_bmp1);
tb4->AddTool(ID_SampleItem+23, "Item 2", tb4_bmp1);
tb4->SetToolSticky(ID_SampleItem+23, true);
tb4->AddTool(ID_SampleItem+24, "Item 3", tb4_bmp1);
tb4->AddTool(ID_SampleItem+24, "Disabled", tb4_bmp1);
tb4->EnableTool(ID_SampleItem+24, false); // Just to show disabled items look
tb4->AddTool(ID_SampleItem+25, "Item 4", tb4_bmp1);
tb4->AddSeparator();
tb4->AddTool(ID_SampleItem+26, "Item 5", tb4_bmp1);