X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/038d59e9793427a96ce816884e51bcae50b21341..e946566e73a57c20de8705732638ee78bfb87a33:/samples/aui/auidemo.cpp diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 37bbdbf11f..0dacca9fc0 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -811,13 +811,18 @@ MyFrame::MyFrame(wxWindow* parent, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW); tb3->SetToolBitmapSize(wxSize(16,16)); wxBitmap tb3_bmp1 = wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16)); - tb3->AddTool(ID_SampleItem+16, wxT("Test2"), tb3_bmp1); - tb3->AddTool(ID_SampleItem+17, wxT("Test"), tb3_bmp1); - tb3->AddTool(ID_SampleItem+18, wxT("Test"), tb3_bmp1); - tb3->AddTool(ID_SampleItem+19, wxT("Test"), tb3_bmp1); + tb3->AddTool(ID_SampleItem+16, wxT("Check 1"), tb3_bmp1, wxT("Check 1"), wxITEM_CHECK); + tb3->AddTool(ID_SampleItem+17, wxT("Check 2"), tb3_bmp1, wxT("Check 2"), wxITEM_CHECK); + tb3->AddTool(ID_SampleItem+18, wxT("Check 3"), tb3_bmp1, wxT("Check 3"), wxITEM_CHECK); + tb3->AddTool(ID_SampleItem+19, wxT("Check 4"), tb3_bmp1, wxT("Check 4"), wxITEM_CHECK); tb3->AddSeparator(); - tb3->AddTool(ID_SampleItem+20, wxT("Test"), tb3_bmp1); - tb3->AddTool(ID_SampleItem+21, wxT("Test"), tb3_bmp1); + tb3->AddTool(ID_SampleItem+20, wxT("Radio 1"), tb3_bmp1, wxT("Radio 1"), wxITEM_RADIO); + tb3->AddTool(ID_SampleItem+21, wxT("Radio 2"), tb3_bmp1, wxT("Radio 2"), wxITEM_RADIO); + tb3->AddTool(ID_SampleItem+22, wxT("Radio 3"), tb3_bmp1, wxT("Radio 3"), wxITEM_RADIO); + tb3->AddSeparator(); + tb3->AddTool(ID_SampleItem+23, wxT("Radio 1 (Group 2)"), tb3_bmp1, wxT("Radio 1 (Group 2)"), wxITEM_RADIO); + tb3->AddTool(ID_SampleItem+24, wxT("Radio 2 (Group 2)"), tb3_bmp1, wxT("Radio 2 (Group 2)"), wxITEM_RADIO); + tb3->AddTool(ID_SampleItem+25, wxT("Radio 3 (Group 2)"), tb3_bmp1, wxT("Radio 3 (Group 2)"), wxITEM_RADIO); tb3->SetCustomOverflowItems(prepend_items, append_items); tb3->Realize(); @@ -1575,7 +1580,7 @@ wxAuiNotebook* MyFrame::CreateNotebook() ctrl->AddPage(CreateHTMLCtrl(ctrl), wxT("Welcome to wxAUI") , false, page_bmp); wxPanel *panel = new wxPanel( ctrl, wxID_ANY ); - wxFlexGridSizer *flex = new wxFlexGridSizer( 2 ); + wxFlexGridSizer *flex = new wxFlexGridSizer( 4, 2, 0, 0 ); flex->AddGrowableRow( 0 ); flex->AddGrowableRow( 3 ); flex->AddGrowableCol( 1 );