X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0766faa34e0e00b5537970c6802c2583d4d44aa0..e946566e73a57c20de8705732638ee78bfb87a33:/samples/aui/auidemo.cpp diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index e3dae64d42..0dacca9fc0 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -84,6 +84,7 @@ class MyFrame : public wxFrame ID_NoGradient, ID_VerticalGradient, ID_HorizontalGradient, + ID_LiveUpdate, ID_Settings, ID_CustomizeToolbar, ID_DropDownToolbarItem, @@ -101,9 +102,9 @@ class MyFrame : public wxFrame ID_NotebookArtSimple, ID_NotebookAlignTop, ID_NotebookAlignBottom, - + ID_SampleItem, - + ID_FirstPerspective = ID_CreatePerspective+1000 }; @@ -591,6 +592,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_HintFade, MyFrame::OnManagerFlag) EVT_MENU(ID_NoVenetianFade, MyFrame::OnManagerFlag) EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag) + EVT_MENU(ID_LiveUpdate, MyFrame::OnManagerFlag) EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag) EVT_MENU(ID_NotebookTabFixedWidth, MyFrame::OnNotebookFlag) EVT_MENU(ID_NotebookNoCloseButton, MyFrame::OnNotebookFlag) @@ -637,6 +639,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(ID_HintFade, MyFrame::OnUpdateUI) EVT_UPDATE_UI(ID_NoVenetianFade, MyFrame::OnUpdateUI) EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI) + EVT_UPDATE_UI(ID_LiveUpdate, MyFrame::OnUpdateUI) EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI) EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI) EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI) @@ -671,7 +674,7 @@ MyFrame::MyFrame(wxWindow* parent, wxMenuBar* mb = new wxMenuBar; wxMenu* file_menu = new wxMenu; - file_menu->Append(wxID_EXIT, _("Exit")); + file_menu->Append(wxID_EXIT); wxMenu* view_menu = new wxMenu; view_menu->Append(ID_CreateText, _("Create Text Control")); @@ -699,6 +702,7 @@ MyFrame::MyFrame(wxWindow* parent, options_menu->AppendCheckItem(ID_NoVenetianFade, _("Disable Venetian Blinds Hint Fade-in")); options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag")); options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane")); + options_menu->AppendCheckItem(ID_LiveUpdate, _("Live Resize Update")); options_menu->AppendSeparator(); options_menu->AppendRadioItem(ID_NoGradient, _("No Caption Gradient")); options_menu->AppendRadioItem(ID_VerticalGradient, _("Vertical Caption Gradient")); @@ -733,14 +737,14 @@ MyFrame::MyFrame(wxWindow* parent, m_perspectives_menu->Append(ID_FirstPerspective+1, _("All Panes")); wxMenu* help_menu = new wxMenu; - help_menu->Append(wxID_ABOUT, _("About...")); + help_menu->Append(wxID_ABOUT); - mb->Append(file_menu, _("File")); - mb->Append(view_menu, _("View")); - mb->Append(m_perspectives_menu, _("Perspectives")); - mb->Append(options_menu, _("Options")); - mb->Append(notebook_menu, _("Notebook")); - mb->Append(help_menu, _("Help")); + mb->Append(file_menu, _("&File")); + mb->Append(view_menu, _("&View")); + mb->Append(m_perspectives_menu, _("&Perspectives")); + mb->Append(options_menu, _("&Options")); + mb->Append(notebook_menu, _("&Notebook")); + mb->Append(help_menu, _("&Help")); SetMenuBar(mb); @@ -756,7 +760,7 @@ MyFrame::MyFrame(wxWindow* parent, // prepare a few custom overflow elements for the toolbars' overflow buttons - + wxAuiToolBarItemArray prepend_items; wxAuiToolBarItemArray append_items; wxAuiToolBarItem item; @@ -807,19 +811,24 @@ 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("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+20, wxT("Test"), tb3_bmp1); - tb3->AddTool(ID_SampleItem+21, wxT("Test"), tb3_bmp1); + 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(); wxAuiToolBar* tb4 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxAUI_TB_DEFAULT_STYLE | + wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_TEXT | wxAUI_TB_HORZ_TEXT); @@ -1078,6 +1087,7 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event) case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break; case ID_VenetianBlindsHint: flag = wxAUI_MGR_VENETIAN_BLINDS_HINT; break; case ID_RectangleHint: flag = wxAUI_MGR_RECTANGLE_HINT; break; + case ID_LiveUpdate: flag = wxAUI_MGR_LIVE_RESIZE; break; } if (flag) @@ -1191,6 +1201,9 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event) case ID_TransparentHint: event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT) != 0); break; + case ID_LiveUpdate: + event.Check((flags & wxAUI_MGR_LIVE_RESIZE) != 0); + break; case ID_VenetianBlindsHint: event.Check((flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0); break; @@ -1397,35 +1410,35 @@ void MyFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& evt) if (evt.IsDropDownClicked()) { wxAuiToolBar* tb = static_cast(evt.GetEventObject()); - + tb->SetToolSticky(evt.GetId(), true); - + // create the popup menu wxMenu menuPopup; - + wxBitmap bmp = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16)); - + wxMenuItem* m1 = new wxMenuItem(&menuPopup, 10001, _("Drop Down Item 1")); m1->SetBitmap(bmp); menuPopup.Append(m1); - + wxMenuItem* m2 = new wxMenuItem(&menuPopup, 10002, _("Drop Down Item 2")); m2->SetBitmap(bmp); menuPopup.Append(m2); - + wxMenuItem* m3 = new wxMenuItem(&menuPopup, 10003, _("Drop Down Item 3")); m3->SetBitmap(bmp); menuPopup.Append(m3); - + wxMenuItem* m4 = new wxMenuItem(&menuPopup, 10004, _("Drop Down Item 4")); m4->SetBitmap(bmp); menuPopup.Append(m4); - + // line up our menu with the button wxRect rect = tb->GetToolRect(evt.GetId()); wxPoint pt = tb->ClientToScreen(rect.GetBottomLeft()); pt = ScreenToClient(pt); - + PopupMenu(&menuPopup, pt); @@ -1567,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 );