X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5edb3cb52d3f483929a06bb0f69c12947259930c..814028444d682b23af3809227cd485f4bebc1286:/samples/aui/auidemo.cpp diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 0e5dc39501..9654e9ae49 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -84,7 +84,11 @@ class MyFrame : public wxFrame ID_NoGradient, ID_VerticalGradient, ID_HorizontalGradient, + ID_LiveUpdate, + ID_AllowToolbarResizing, ID_Settings, + ID_CustomizeToolbar, + ID_DropDownToolbarItem, ID_NotebookNoCloseButton, ID_NotebookCloseButton, ID_NotebookCloseButtonAll, @@ -97,6 +101,11 @@ class MyFrame : public wxFrame ID_NotebookTabFixedWidth, ID_NotebookArtGloss, ID_NotebookArtSimple, + ID_NotebookAlignTop, + ID_NotebookAlignBottom, + + ID_SampleItem, + ID_FirstPerspective = ID_CreatePerspective+1000 }; @@ -136,22 +145,27 @@ private: void OnCreateText(wxCommandEvent& evt); void OnCreateSizeReport(wxCommandEvent& evt); void OnChangeContentPane(wxCommandEvent& evt); + void OnDropDownToolbarItem(wxAuiToolBarEvent& evt); void OnCreatePerspective(wxCommandEvent& evt); void OnCopyPerspectiveCode(wxCommandEvent& evt); void OnRestorePerspective(wxCommandEvent& evt); void OnSettings(wxCommandEvent& evt); + 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); void OnPaneClose(wxAuiManagerEvent& evt); - + private: wxAuiManager m_mgr; @@ -556,7 +570,6 @@ bool MyApp::OnInit() wxT("wxAUI Sample Application"), wxDefaultPosition, wxSize(800, 600)); - SetTopWindow(frame); frame->Show(); return true; @@ -581,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) @@ -594,10 +608,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_NotebookWindowList, MyFrame::OnNotebookFlag) EVT_MENU(ID_NotebookArtGloss, MyFrame::OnNotebookFlag) EVT_MENU(ID_NotebookArtSimple, MyFrame::OnNotebookFlag) + EVT_MENU(ID_NotebookAlignTop, MyFrame::OnTabAlignment) + EVT_MENU(ID_NotebookAlignBottom, MyFrame::OnTabAlignment) 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) EVT_MENU(ID_TreeContent, MyFrame::OnChangeContentPane) EVT_MENU(ID_TextContent, MyFrame::OnChangeContentPane) @@ -624,14 +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() @@ -652,12 +674,12 @@ MyFrame::MyFrame(wxWindow* parent, // set up default notebook style m_notebook_style = wxAUI_NB_DEFAULT_STYLE | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; m_notebook_theme = 0; - + // create menu 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")); @@ -685,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; @@ -701,6 +726,9 @@ MyFrame::MyFrame(wxWindow* parent, notebook_menu->AppendRadioItem(ID_NotebookCloseButtonAll, _("Close Button on All Tabs")); notebook_menu->AppendRadioItem(ID_NotebookCloseButtonActive, _("Close Button on Active Tab")); notebook_menu->AppendSeparator(); + notebook_menu->AppendRadioItem(ID_NotebookAlignTop, _("Tab Top Alignment")); + notebook_menu->AppendRadioItem(ID_NotebookAlignBottom, _("Tab Bottom Alignment")); + notebook_menu->AppendSeparator(); notebook_menu->AppendCheckItem(ID_NotebookAllowTabMove, _("Allow Tab Move")); notebook_menu->AppendCheckItem(ID_NotebookAllowTabExternalMove, _("Allow External Tab Move")); notebook_menu->AppendCheckItem(ID_NotebookAllowTabSplit, _("Allow Notebook Split")); @@ -716,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); @@ -736,78 +764,112 @@ MyFrame::MyFrame(wxWindow* parent, // code. For now, just hard code a frame minimum size SetMinSize(wxSize(400,300)); + + + // prepare a few custom overflow elements for the toolbars' overflow buttons + + wxAuiToolBarItemArray prepend_items; + wxAuiToolBarItemArray append_items; + wxAuiToolBarItem item; + item.SetKind(wxITEM_SEPARATOR); + append_items.Add(item); + item.SetKind(wxITEM_NORMAL); + item.SetId(ID_CustomizeToolbar); + item.SetLabel(_("Customize...")); + append_items.Add(item); + + // create some toolbars - wxToolBar* tb1 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTB_FLAT | wxTB_NODIVIDER); + wxAuiToolBar* tb1 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW); tb1->SetToolBitmapSize(wxSize(48,48)); - tb1->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR)); + tb1->AddTool(ID_SampleItem+1, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR)); tb1->AddSeparator(); - tb1->AddTool(102, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION)); - tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION)); - tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING)); - tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); + tb1->AddTool(ID_SampleItem+2, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION)); + tb1->AddTool(ID_SampleItem+3, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION)); + tb1->AddTool(ID_SampleItem+4, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING)); + tb1->AddTool(ID_SampleItem+5, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); + tb1->SetCustomOverflowItems(prepend_items, append_items); tb1->Realize(); - wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTB_FLAT | wxTB_NODIVIDER); + wxAuiToolBar* tb2 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + 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(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, 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); tb2->AddSeparator(); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); + tb2->AddTool(ID_SampleItem+10, wxT("Test"), tb2_bmp1); + tb2->AddTool(ID_SampleItem+11, wxT("Test"), tb2_bmp1); tb2->AddSeparator(); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); - tb2->AddTool(101, wxT("Test"), tb2_bmp1); + tb2->AddTool(ID_SampleItem+12, wxT("Test"), tb2_bmp1); + tb2->AddTool(ID_SampleItem+13, wxT("Test"), tb2_bmp1); + 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(); - wxToolBar* tb3 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTB_FLAT | wxTB_NODIVIDER); + wxAuiToolBar* tb3 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + 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(101, wxT("Test"), tb3_bmp1); - tb3->AddTool(101, wxT("Test"), tb3_bmp1); - tb3->AddTool(101, wxT("Test"), tb3_bmp1); - tb3->AddTool(101, 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(101, wxT("Test"), tb3_bmp1); - tb3->AddTool(101, 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(); - wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT); + wxAuiToolBar* tb4 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxAUI_TB_DEFAULT_STYLE | + wxAUI_TB_OVERFLOW | + wxAUI_TB_TEXT | + wxAUI_TB_HORZ_TEXT); tb4->SetToolBitmapSize(wxSize(16,16)); wxBitmap tb4_bmp1 = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)); - tb4->AddTool(101, wxT("Item 1"), tb4_bmp1); - tb4->AddTool(101, wxT("Item 2"), tb4_bmp1); - tb4->AddTool(101, wxT("Item 3"), tb4_bmp1); - tb4->AddTool(101, wxT("Item 4"), tb4_bmp1); + tb4->AddTool(ID_DropDownToolbarItem, wxT("Item 1"), tb4_bmp1); + tb4->AddTool(ID_SampleItem+23, wxT("Item 2"), tb4_bmp1); + tb4->AddTool(ID_SampleItem+24, wxT("Item 3"), tb4_bmp1); + tb4->AddTool(ID_SampleItem+25, wxT("Item 4"), tb4_bmp1); tb4->AddSeparator(); - tb4->AddTool(101, wxT("Item 5"), tb4_bmp1); - tb4->AddTool(101, wxT("Item 6"), tb4_bmp1); - tb4->AddTool(101, wxT("Item 7"), tb4_bmp1); - tb4->AddTool(101, wxT("Item 8"), tb4_bmp1); + tb4->AddTool(ID_SampleItem+26, wxT("Item 5"), tb4_bmp1); + tb4->AddTool(ID_SampleItem+27, wxT("Item 6"), tb4_bmp1); + tb4->AddTool(ID_SampleItem+28, wxT("Item 7"), tb4_bmp1); + 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(); - // create some toolbars - wxToolBar* tb5 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTB_FLAT | wxTB_NODIVIDER | wxTB_VERTICAL); + + wxAuiToolBar* tb5 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_VERTICAL); tb5->SetToolBitmapSize(wxSize(48,48)); - tb5->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR)); + tb5->AddTool(ID_SampleItem+30, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR)); tb5->AddSeparator(); - tb5->AddTool(102, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION)); - tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION)); - tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING)); - tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); + tb5->AddTool(ID_SampleItem+31, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION)); + tb5->AddTool(ID_SampleItem+32, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION)); + tb5->AddTool(ID_SampleItem+33, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING)); + tb5->AddTool(ID_SampleItem+34, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); + tb5->SetCustomOverflowItems(prepend_items, append_items); tb5->Realize(); // add a bunch of panes @@ -855,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")). @@ -891,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")). @@ -968,7 +1035,7 @@ void MyFrame::OnSize(wxSizeEvent& event) event.Skip(); } -void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(evt)) { // show the settings pane, and float it wxAuiPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show(); @@ -979,6 +1046,11 @@ void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event)) m_mgr.Update(); } +void MyFrame::OnCustomizeToolbar(wxCommandEvent& WXUNUSED(evt)) +{ + wxMessageBox(_("Customize Toolbar clicked")); +} + void MyFrame::OnGradient(wxCommandEvent& event) { int gradient = 0; @@ -994,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; @@ -1032,13 +1120,14 @@ 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) { m_mgr.SetFlags(m_mgr.GetFlags() ^ flag); } - + m_mgr.Update(); } @@ -1046,7 +1135,7 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event) void MyFrame::OnNotebookFlag(wxCommandEvent& event) { int id = event.GetId(); - + if (id == ID_NotebookNoCloseButton || id == ID_NotebookCloseButton || id == ID_NotebookCloseButtonAll || @@ -1055,7 +1144,7 @@ void MyFrame::OnNotebookFlag(wxCommandEvent& event) m_notebook_style &= ~(wxAUI_NB_CLOSE_BUTTON | wxAUI_NB_CLOSE_ON_ACTIVE_TAB | wxAUI_NB_CLOSE_ON_ALL_TABS); - + switch (id) { case ID_NotebookNoCloseButton: break; @@ -1064,7 +1153,7 @@ void MyFrame::OnNotebookFlag(wxCommandEvent& event) case ID_NotebookCloseButtonActive: m_notebook_style |= wxAUI_NB_CLOSE_ON_ACTIVE_TAB; break; } } - + if (id == ID_NotebookAllowTabMove) { m_notebook_style ^= wxAUI_NB_TAB_MOVE; @@ -1094,12 +1183,12 @@ void MyFrame::OnNotebookFlag(wxCommandEvent& event) size_t i, count; wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); for (i = 0, count = all_panes.GetCount(); i < count; ++i) - { + { wxAuiPaneInfo& pane = all_panes.Item(i); if (pane.window->IsKindOf(CLASSINFO(wxAuiNotebook))) { wxAuiNotebook* nb = (wxAuiNotebook*)pane.window; - + if (id == ID_NotebookArtGloss) { nb->SetArtProvider(new wxAuiDefaultTabArt); @@ -1110,8 +1199,8 @@ void MyFrame::OnNotebookFlag(wxCommandEvent& event) nb->SetArtProvider(new wxAuiSimpleTabArt); m_notebook_theme = 1; } - - + + nb->SetWindowStyleFlag(m_notebook_style); nb->Refresh(); } @@ -1136,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; @@ -1145,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; @@ -1155,14 +1262,14 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event) event.Check(((wxAUI_MGR_TRANSPARENT_HINT | wxAUI_MGR_VENETIAN_BLINDS_HINT | wxAUI_MGR_RECTANGLE_HINT) & flags) == 0); - break; + break; case ID_HintFade: event.Check((flags & wxAUI_MGR_HINT_FADE) != 0); break; case ID_NoVenetianFade: event.Check((flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE) != 0); break; - + case ID_NotebookNoCloseButton: event.Check((m_notebook_style & (wxAUI_NB_CLOSE_BUTTON|wxAUI_NB_CLOSE_ON_ALL_TABS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB)) != 0); break; @@ -1253,7 +1360,7 @@ void MyFrame::OnRestorePerspective(wxCommandEvent& evt) } void MyFrame::OnNotebookPageClose(wxAuiNotebookEvent& evt) -{ +{ wxAuiNotebook* ctrl = (wxAuiNotebook*)evt.GetEventObject(); if (ctrl->GetPage(evt.GetSelection())->IsKindOf(CLASSINFO(wxHtmlWindow))) { @@ -1266,8 +1373,21 @@ 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 // allow all noteboko drag and drop events evt.Allow(); @@ -1335,17 +1455,85 @@ void MyFrame::OnCreateSizeReport(wxCommandEvent& WXUNUSED(event)) m_mgr.Update(); } -void MyFrame::OnChangeContentPane(wxCommandEvent& event) +void MyFrame::OnChangeContentPane(wxCommandEvent& evt) { - m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent); - m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent); - m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent); - m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent); - m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent); - m_mgr.GetPane(wxT("notebook_content")).Show(event.GetId() == ID_NotebookContent); + m_mgr.GetPane(wxT("grid_content")).Show(evt.GetId() == ID_GridContent); + m_mgr.GetPane(wxT("text_content")).Show(evt.GetId() == ID_TextContent); + m_mgr.GetPane(wxT("tree_content")).Show(evt.GetId() == ID_TreeContent); + m_mgr.GetPane(wxT("sizereport_content")).Show(evt.GetId() == ID_SizeReportContent); + m_mgr.GetPane(wxT("html_content")).Show(evt.GetId() == ID_HTMLContent); + m_mgr.GetPane(wxT("notebook_content")).Show(evt.GetId() == ID_NotebookContent); m_mgr.Update(); } +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); + + + // make sure the button is "un-stuck" + tb->SetToolSticky(evt.GetId(), false); + } +} + + +void MyFrame::OnTabAlignment(wxCommandEvent &evt) +{ + size_t i, count; + wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); + for (i = 0, count = all_panes.GetCount(); i < count; ++i) + { + wxAuiPaneInfo& pane = all_panes.Item(i); + if (pane.window->IsKindOf(CLASSINFO(wxAuiNotebook))) + { + wxAuiNotebook* nb = (wxAuiNotebook*)pane.window; + + long style = nb->GetWindowStyleFlag(); + style &= ~(wxAUI_NB_TOP | wxAUI_NB_BOTTOM); + if (evt.GetId() == ID_NotebookAlignTop) + style |= wxAUI_NB_TOP; + else if (evt.GetId() == ID_NotebookAlignBottom) + style |= wxAUI_NB_BOTTOM; + nb->SetWindowStyleFlag(style); + + nb->Refresh(); + } + } +} + void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) { Close(true); @@ -1361,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); @@ -1387,7 +1575,7 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl() wxTreeCtrl* tree = new wxTreeCtrl(this, wxID_ANY, wxPoint(0,0), wxSize(160,250), wxTR_DEFAULT_STYLE | wxNO_BORDER); - + wxImageList* imglist = new wxImageList(16, 16, true, 2); imglist->Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16))); imglist->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16))); @@ -1434,7 +1622,7 @@ wxHtmlWindow* MyFrame::CreateHTMLCtrl(wxWindow* parent) { if (!parent) parent = this; - + wxHtmlWindow* ctrl = new wxHtmlWindow(parent, wxID_ANY, wxDefaultPosition, wxSize(400,300)); @@ -1446,57 +1634,62 @@ wxAuiNotebook* MyFrame::CreateNotebook() { // create the notebook off-window to avoid flicker wxSize client_size = GetClientSize(); - + wxAuiNotebook* ctrl = new wxAuiNotebook(this, wxID_ANY, 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); - + ctrl->SetPageToolTip(0, "Welcome to wxAUI (this is a page tooltip)"); + 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 ); flex->Add( 5,5 ); flex->Add( 5,5 ); flex->Add( new wxStaticText( panel, -1, wxT("wxTextCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 ); - flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1)), + flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1)), 1, wxALL|wxALIGN_CENTRE, 5 ); flex->Add( new wxStaticText( panel, -1, wxT("wxSpinCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 ); - flex->Add( new wxSpinCtrl( panel, -1, wxT("5"), wxDefaultPosition, wxSize(100,-1), + flex->Add( new wxSpinCtrl( panel, -1, wxT("5"), wxDefaultPosition, wxSize(100,-1), wxSP_ARROW_KEYS, 5, 50, 5 ), 0, wxALL|wxALIGN_CENTRE, 5 ); flex->Add( 5,5 ); flex->Add( 5,5 ); panel->SetSizer( flex ); ctrl->AddPage( panel, wxT("wxPanel"), false, page_bmp ); - - + + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 1"), false, page_bmp ); - + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 2") ); - + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 3") ); - + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 4") ); - + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 5") ); - + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 6") ); - + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 7 (longer title)") ); - + ctrl->SetPageToolTip(ctrl->GetPageCount()-1, + "wxTextCtrl 7: and the tooltip message can be even longer!"); + ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 8") ); + ctrl->Thaw(); return ctrl; } @@ -1515,11 +1708,18 @@ 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
    • " "" + "

    What's new in 0.9.4?

    " + "

    wxAUI 0.9.4, which is bundled with wxWidgets, adds the following features:" + "

    " "

    What's new in 0.9.3?

    " "

    wxAUI 0.9.3, which is now bundled with wxWidgets, adds the following features:" "