Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented features to modify tool spacing in the toolbar sample.

Browse Source 
There were added two menu items (under 'Tools' menu) to modify current tool spacing.
This way is possible to test SetToolPacking/GetToolPacking methods.
This commit is contained in:
Artur Wieczorek
2015-12-14 21:30:46 +01:00
parent 16d8d6c4a4
commit dd29ecf840
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/toolbar/toolbar.cpp
View File

@@ -123,6 +123,8 @@ public:
void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); } void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); }
void OnInsertPrint(wxCommandEvent& event); void OnInsertPrint(wxCommandEvent& event);
void OnChangeToolTip(wxCommandEvent& event); void OnChangeToolTip(wxCommandEvent& event);
void OnIncToolSpacing(wxCommandEvent& event);
void OnDecToolSpacing(wxCommandEvent& event);
void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); } void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); }
void OnToggleSearch(wxCommandEvent& event); void OnToggleSearch(wxCommandEvent& event);
void OnToggleRadioBtn(wxCommandEvent& event); void OnToggleRadioBtn(wxCommandEvent& event);
@@ -221,6 +223,8 @@ enum
IDM_TOOLBAR_TOGGLERADIOBTN2, IDM_TOOLBAR_TOGGLERADIOBTN2,
IDM_TOOLBAR_TOGGLERADIOBTN3, IDM_TOOLBAR_TOGGLERADIOBTN3,
IDM_TOOLBAR_CHANGE_TOOLTIP, IDM_TOOLBAR_CHANGE_TOOLTIP,
IDM_TOOLBAR_INC_TOOL_SPACING,
IDM_TOOLBAR_DEC_TOOL_SPACING,
ID_COMBO = 1000 ID_COMBO = 1000
}; };
@@ -256,6 +260,8 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1, IDM_TOOLBAR_TOGGLERADIOBTN3, EVT_MENU_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1, IDM_TOOLBAR_TOGGLERADIOBTN3,
MyFrame::OnToggleRadioBtn) MyFrame::OnToggleRadioBtn)
EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip) EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip)
EVT_MENU(IDM_TOOLBAR_INC_TOOL_SPACING, MyFrame::OnIncToolSpacing)
EVT_MENU(IDM_TOOLBAR_DEC_TOOL_SPACING, MyFrame::OnDecToolSpacing)
EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH, EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
MyFrame::OnToolbarStyle) MyFrame::OnToolbarStyle)
@@ -600,6 +606,9 @@ MyFrame::MyFrame(wxFrame* parent,
toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, wxT("Toggle &3rd radio button\tCtrl-3")); toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, wxT("Toggle &3rd radio button\tCtrl-3"));
toolMenu->AppendSeparator(); toolMenu->AppendSeparator();
toolMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, wxT("Change tooltip of \"New\"")); toolMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, wxT("Change tooltip of \"New\""));
toolMenu->AppendSeparator();
toolMenu->Append(IDM_TOOLBAR_INC_TOOL_SPACING, wxT("Increase spacing\tCtrl-+"));
toolMenu->Append(IDM_TOOLBAR_DEC_TOOL_SPACING, wxT("Decrease spacing\tCtrl--"));
wxMenu *fileMenu = new wxMenu; wxMenu *fileMenu = new wxMenu;
fileMenu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Quit toolbar sample") ); fileMenu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Quit toolbar sample") );
@@ -922,6 +931,18 @@ void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))
GetToolBar()->SetToolShortHelp(wxID_NEW, wxT("New toolbar button")); GetToolBar()->SetToolShortHelp(wxID_NEW, wxT("New toolbar button"));
} }
void MyFrame::OnIncToolSpacing(wxCommandEvent& WXUNUSED(event))
{
wxToolBar *tb = GetToolBar();
tb->SetToolPacking(tb->GetToolPacking()+1);
}
void MyFrame::OnDecToolSpacing(wxCommandEvent& WXUNUSED(event))
{
wxToolBar *tb = GetToolBar();
tb->SetToolPacking(tb->GetToolPacking()-1);
}
void MyFrame::OnToolbarStyle(wxCommandEvent& event) void MyFrame::OnToolbarStyle(wxCommandEvent& event)
{ {
long style = GetToolBar()->GetWindowStyle(); long style = GetToolBar()->GetWindowStyle();