X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d196c1d4df0fe74958b21f8ec203db432e782c..e1efca652844273c3e8d32c7e5f442b87e455ca7:/samples/aui/auidemo.cpp?ds=sidebyside diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 2b6dcfa069..08d5d136d9 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -84,6 +84,8 @@ class MyFrame : public wxFrame ID_NoGradient, ID_VerticalGradient, ID_HorizontalGradient, + ID_LiveUpdate, + ID_AllowToolbarResizing, ID_Settings, ID_CustomizeToolbar, ID_DropDownToolbarItem, @@ -101,9 +103,9 @@ class MyFrame : public wxFrame ID_NotebookArtSimple, ID_NotebookAlignTop, ID_NotebookAlignBottom, - + ID_SampleItem, - + ID_FirstPerspective = ID_CreatePerspective+1000 }; @@ -151,11 +153,13 @@ private: void OnCustomizeToolbar(wxCommandEvent& evt); void OnAllowNotebookDnD(wxAuiNotebookEvent& evt); void OnNotebookPageClose(wxAuiNotebookEvent& evt); + void OnNotebookPageClosed(wxAuiNotebookEvent& evt); void OnExit(wxCommandEvent& evt); void OnAbout(wxCommandEvent& evt); void OnTabAlignment(wxCommandEvent &evt); void OnGradient(wxCommandEvent& evt); + void OnToolbarResizing(wxCommandEvent& evt); void OnManagerFlag(wxCommandEvent& evt); void OnNotebookFlag(wxCommandEvent& evt); void OnUpdateUI(wxUpdateUIEvent& evt); @@ -566,7 +570,6 @@ bool MyApp::OnInit() wxT("wxAUI Sample Application"), wxDefaultPosition, wxSize(800, 600)); - SetTopWindow(frame); frame->Show(); return true; @@ -591,6 +594,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) @@ -609,6 +613,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_NoGradient, MyFrame::OnGradient) EVT_MENU(ID_VerticalGradient, MyFrame::OnGradient) EVT_MENU(ID_HorizontalGradient, MyFrame::OnGradient) + EVT_MENU(ID_AllowToolbarResizing, MyFrame::OnToolbarResizing) EVT_MENU(ID_Settings, MyFrame::OnSettings) EVT_MENU(ID_CustomizeToolbar, MyFrame::OnCustomizeToolbar) EVT_MENU(ID_GridContent, MyFrame::OnChangeContentPane) @@ -637,15 +642,18 @@ 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) + EVT_UPDATE_UI(ID_AllowToolbarResizing, MyFrame::OnUpdateUI) EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000, MyFrame::OnRestorePerspective) EVT_AUITOOLBAR_TOOL_DROPDOWN(ID_DropDownToolbarItem, MyFrame::OnDropDownToolbarItem) EVT_AUI_PANE_CLOSE(MyFrame::OnPaneClose) EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD) EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose) + EVT_AUINOTEBOOK_PAGE_CLOSED(wxID_ANY, MyFrame::OnNotebookPageClosed) END_EVENT_TABLE() @@ -671,7 +679,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,11 +707,14 @@ 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")); options_menu->AppendRadioItem(ID_HorizontalGradient, _("Horizontal Caption Gradient")); options_menu->AppendSeparator(); + options_menu->AppendCheckItem(ID_AllowToolbarResizing, _("Allow Toolbar Resizing")); + options_menu->AppendSeparator(); options_menu->Append(ID_Settings, _("Settings Pane")); wxMenu* notebook_menu = new wxMenu; @@ -733,14 +744,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,15 +767,15 @@ MyFrame::MyFrame(wxWindow* parent, // prepare a few custom overflow elements for the toolbars' overflow buttons - + wxAuiToolBarItemArray prepend_items; wxAuiToolBarItemArray append_items; wxAuiToolBarItem item; - item.kind = wxITEM_SEPARATOR; + item.SetKind(wxITEM_SEPARATOR); append_items.Add(item); - item.kind = wxITEM_NORMAL; - item.id = ID_CustomizeToolbar; - item.label = _("Customize..."); + item.SetKind(wxITEM_NORMAL); + item.SetId(ID_CustomizeToolbar); + item.SetLabel(_("Customize...")); append_items.Add(item); @@ -783,11 +794,11 @@ MyFrame::MyFrame(wxWindow* parent, wxAuiToolBar* tb2 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW); + wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_HORIZONTAL); tb2->SetToolBitmapSize(wxSize(16,16)); wxBitmap tb2_bmp1 = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16)); - tb2->AddTool(ID_SampleItem+6, wxT("Test"), tb2_bmp1); + tb2->AddTool(ID_SampleItem+6, wxT("Disabled"), tb2_bmp1); tb2->AddTool(ID_SampleItem+7, wxT("Test"), tb2_bmp1); tb2->AddTool(ID_SampleItem+8, wxT("Test"), tb2_bmp1); tb2->AddTool(ID_SampleItem+9, wxT("Test"), tb2_bmp1); @@ -800,6 +811,7 @@ MyFrame::MyFrame(wxWindow* parent, tb2->AddTool(ID_SampleItem+14, wxT("Test"), tb2_bmp1); tb2->AddTool(ID_SampleItem+15, wxT("Test"), tb2_bmp1); tb2->SetCustomOverflowItems(prepend_items, append_items); + tb2->EnableTool(ID_SampleItem+6, false); tb2->Realize(); @@ -807,19 +819,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); @@ -836,6 +853,10 @@ MyFrame::MyFrame(wxWindow* parent, tb4->AddTool(ID_SampleItem+29, wxT("Item 8"), tb4_bmp1); tb4->SetToolDropDown(ID_DropDownToolbarItem, true); tb4->SetCustomOverflowItems(prepend_items, append_items); + wxChoice* choice = new wxChoice(tb4, ID_SampleItem+35); + choice->AppendString(wxT("One choice")); + choice->AppendString(wxT("Another choice")); + tb4->AddControl(choice); tb4->Realize(); @@ -896,9 +917,19 @@ MyFrame::MyFrame(wxWindow* parent, CloseButton(true).MaximizeButton(true)); wxWindow* wnd10 = CreateTextCtrl(wxT("This pane will prompt the user before hiding.")); + + // Give this pane an icon, too, just for testing. + int iconSize = m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); + + // Make it even to use 16 pixel icons with default 17 caption height. + iconSize &= ~1; + m_mgr.AddPane(wnd10, wxAuiPaneInfo(). Name(wxT("test10")).Caption(wxT("Text Pane with Hide Prompt")). - Bottom().Layer(1).Position(1)); + Bottom().Layer(1).Position(1). + Icon(wxArtProvider::GetBitmap(wxART_WARNING, + wxART_OTHER, + wxSize(iconSize, iconSize)))); m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo(). Name(wxT("test11")).Caption(wxT("Fixed Pane")). @@ -932,29 +963,24 @@ MyFrame::MyFrame(wxWindow* parent, // add the toolbars to the manager m_mgr.AddPane(tb1, wxAuiPaneInfo(). Name(wxT("tb1")).Caption(wxT("Big Toolbar")). - ToolbarPane().Top(). - LeftDockable(false).RightDockable(false)); + ToolbarPane().Top()); m_mgr.AddPane(tb2, wxAuiPaneInfo(). - Name(wxT("tb2")).Caption(wxT("Toolbar 2")). - ToolbarPane().Top().Row(1). - LeftDockable(false).RightDockable(false)); + Name(wxT("tb2")).Caption(wxT("Toolbar 2 (Horizontal)")). + ToolbarPane().Top().Row(1)); m_mgr.AddPane(tb3, wxAuiPaneInfo(). Name(wxT("tb3")).Caption(wxT("Toolbar 3")). - ToolbarPane().Top().Row(1).Position(1). - LeftDockable(false).RightDockable(false)); + ToolbarPane().Top().Row(1).Position(1)); m_mgr.AddPane(tb4, wxAuiPaneInfo(). Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")). - ToolbarPane().Top().Row(2). - LeftDockable(false).RightDockable(false)); + ToolbarPane().Top().Row(2)); m_mgr.AddPane(tb5, wxAuiPaneInfo(). Name(wxT("tb5")).Caption(wxT("Sample Vertical Toolbar")). ToolbarPane().Left(). - GripperTop(). - TopDockable(false).BottomDockable(false)); + GripperTop()); m_mgr.AddPane(new wxButton(this, wxID_ANY, _("Test Button")), wxAuiPaneInfo().Name(wxT("tb6")). @@ -1040,6 +1066,22 @@ void MyFrame::OnGradient(wxCommandEvent& event) m_mgr.Update(); } +void MyFrame::OnToolbarResizing(wxCommandEvent& WXUNUSED(evt)) +{ + wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); + const size_t count = all_panes.GetCount(); + for (size_t i = 0; i < count; ++i) + { + wxAuiToolBar* toolbar = wxDynamicCast(all_panes[i].window, wxAuiToolBar); + if (toolbar) + { + all_panes[i].Resizable(!all_panes[i].IsResizable()); + } + } + + m_mgr.Update(); +} + void MyFrame::OnManagerFlag(wxCommandEvent& event) { unsigned int flag = 0; @@ -1078,6 +1120,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) @@ -1182,6 +1225,21 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event) case ID_HorizontalGradient: event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL); break; + case ID_AllowToolbarResizing: + { + wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); + const size_t count = all_panes.GetCount(); + for (size_t i = 0; i < count; ++i) + { + wxAuiToolBar* toolbar = wxDynamicCast(all_panes[i].window, wxAuiToolBar); + if (toolbar) + { + event.Check(all_panes[i].IsResizable()); + break; + } + } + break; + } case ID_AllowFloating: event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0); break; @@ -1191,6 +1249,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; @@ -1312,6 +1373,19 @@ void MyFrame::OnNotebookPageClose(wxAuiNotebookEvent& evt) } } +void MyFrame::OnNotebookPageClosed(wxAuiNotebookEvent& evt) +{ + wxAuiNotebook* ctrl = (wxAuiNotebook*)evt.GetEventObject(); + + // selection should always be a valid index + wxASSERT_MSG( ctrl->GetSelection() < (int)ctrl->GetPageCount(), + wxString::Format("Invalid selection %d, only %d pages left", + ctrl->GetSelection(), + (int)ctrl->GetPageCount()) ); + + evt.Skip(); +} + void MyFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& evt) { // for the purpose of this test application, explicitly @@ -1397,35 +1471,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); @@ -1438,7 +1512,7 @@ void MyFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& evt) void MyFrame::OnTabAlignment(wxCommandEvent &evt) { - size_t i, count; + size_t i, count; wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); for (i = 0, count = all_panes.GetCount(); i < count; ++i) { @@ -1447,10 +1521,14 @@ void MyFrame::OnTabAlignment(wxCommandEvent &evt) { wxAuiNotebook* nb = (wxAuiNotebook*)pane.window; + long style = nb->GetWindowStyleFlag(); + style &= ~(wxAUI_NB_TOP | wxAUI_NB_BOTTOM); if (evt.GetId() == ID_NotebookAlignTop) - nb->SetWindowStyleFlag(nb->GetWindowStyleFlag()^wxAUI_NB_BOTTOM|wxAUI_NB_TOP); - else if (evt.GetId() == ID_NotebookAlignBottom) - nb->SetWindowStyleFlag(nb->GetWindowStyleFlag()^wxAUI_NB_TOP|wxAUI_NB_BOTTOM); + style |= wxAUI_NB_TOP; + else if (evt.GetId() == ID_NotebookAlignBottom) + style |= wxAUI_NB_BOTTOM; + nb->SetWindowStyleFlag(style); + nb->Refresh(); } } @@ -1471,7 +1549,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl(const wxString& ctrl_text) static int n = 0; wxString text; - if (ctrl_text.Length() > 0) + if ( !ctrl_text.empty() ) text = ctrl_text; else text.Printf(wxT("This is text box %d"), ++n); @@ -1561,13 +1639,14 @@ wxAuiNotebook* MyFrame::CreateNotebook() wxPoint(client_size.x, client_size.y), wxSize(430,200), m_notebook_style); + ctrl->Freeze(); wxBitmap page_bmp = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)); 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 ); @@ -1607,6 +1686,7 @@ wxAuiNotebook* MyFrame::CreateNotebook() ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 8") ); + ctrl->Thaw(); return ctrl; } @@ -1625,7 +1705,7 @@ wxString MyFrame::GetIntroText() "
  • Native, dockable floating frames
    • " "
  • Perspective saving and loading
    • " "
  • Native toolbars incorporating real-time, "spring-loaded" dragging
    • " - "
  • Customizable floating/docking behavior
    • " + "
  • Customizable floating/docking behaviour
    • " "
  • Completely customizable look-and-feel
    • " "
  • Optional transparent window effects (while dragging or docking)
    • " "
  • Splittable notebook control
    • "