X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6d74808f6d6a3fa21dd1e1098c42469684961a4..e1efca652844273c3e8d32c7e5f442b87e455ca7:/samples/aui/auidemo.cpp
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 0dacca9fc0..08d5d136d9 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -85,6 +85,7 @@ class MyFrame : public wxFrame
ID_VerticalGradient,
ID_HorizontalGradient,
ID_LiveUpdate,
+ ID_AllowToolbarResizing,
ID_Settings,
ID_CustomizeToolbar,
ID_DropDownToolbarItem,
@@ -152,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);
@@ -567,7 +570,6 @@ bool MyApp::OnInit()
wxT("wxAUI Sample Application"),
wxDefaultPosition,
wxSize(800, 600));
- SetTopWindow(frame);
frame->Show();
return true;
@@ -611,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)
@@ -643,12 +646,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
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()
@@ -708,6 +713,8 @@ MyFrame::MyFrame(wxWindow* parent,
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;
@@ -787,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);
@@ -804,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();
@@ -845,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();
@@ -905,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")).
@@ -941,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")).
@@ -1049,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;
@@ -1192,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;
@@ -1325,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
@@ -1451,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)
{
@@ -1460,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();
}
}
@@ -1484,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);
@@ -1574,6 +1639,7 @@ 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));
@@ -1620,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;
}
@@ -1638,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"