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

ComboControl -> ComboCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-05-26 15:15:28 +00:00
parent 81fb185e4f
commit 443fbbf7ae
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/combo/combo.cpp
View File

@@ -107,15 +107,15 @@ private:
// IDs for the controls and the menu commands // IDs for the controls and the menu commands
enum enum
{ {
ComboControl_Compare = wxID_HIGHEST, ComboCtrl_Compare = wxID_HIGHEST,
// menu items // menu items
ComboControl_Quit = wxID_EXIT, ComboCtrl_Quit = wxID_EXIT,
// it is important for the id corresponding to the "About" command to have // it is important for the id corresponding to the "About" command to have
// this standard value as otherwise it won't be handled properly under Mac // this standard value as otherwise it won't be handled properly under Mac
// (where it is special and put into the "Apple" menu) // (where it is special and put into the "Apple" menu)
ComboControl_About = wxID_ABOUT ComboCtrl_About = wxID_ABOUT
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -129,9 +129,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_TEXT(wxID_ANY,MyFrame::OnComboBoxUpdate) EVT_TEXT(wxID_ANY,MyFrame::OnComboBoxUpdate)
EVT_COMBOBOX(wxID_ANY,MyFrame::OnComboBoxUpdate) EVT_COMBOBOX(wxID_ANY,MyFrame::OnComboBoxUpdate)
EVT_MENU(ComboControl_Compare, MyFrame::OnShowComparison) EVT_MENU(ComboCtrl_Compare, MyFrame::OnShowComparison)
EVT_MENU(ComboControl_Quit, MyFrame::OnQuit) EVT_MENU(ComboCtrl_Quit, MyFrame::OnQuit)
EVT_MENU(ComboControl_About, MyFrame::OnAbout) EVT_MENU(ComboCtrl_About, MyFrame::OnAbout)
EVT_IDLE(MyFrame::OnIdle) EVT_IDLE(MyFrame::OnIdle)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -724,12 +724,12 @@ MyFrame::MyFrame(const wxString& title)
// the "About" item should be in the help menu // the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu; wxMenu *helpMenu = new wxMenu;
helpMenu->Append(ComboControl_About, wxT("&About...\tF1"), wxT("Show about dialog")); helpMenu->Append(ComboCtrl_About, wxT("&About...\tF1"), wxT("Show about dialog"));
fileMenu->Append(ComboControl_Compare, wxT("&Compare against wxComboBox..."), fileMenu->Append(ComboCtrl_Compare, wxT("&Compare against wxComboBox..."),
wxT("Show some wxOwnerDrawnComboBoxes side-by-side with native wxComboBoxes.")); wxT("Show some wxOwnerDrawnComboBoxes side-by-side with native wxComboBoxes."));
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append(ComboControl_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); fileMenu->Append(ComboCtrl_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar(); wxMenuBar *menuBar = new wxMenuBar();
@@ -854,7 +854,7 @@ MyFrame::MyFrame(const wxString& title)
rowSizer = new wxBoxSizer( wxHORIZONTAL ); rowSizer = new wxBoxSizer( wxHORIZONTAL );
rowSizer->Add( new wxStaticText(panel,wxID_ANY,wxT("List View wxComboCtrl:")), 1, rowSizer->Add( new wxStaticText(panel,wxID_ANY,wxT("List View wxComboCtrl:")), 1,
wxALIGN_CENTER_VERTICAL|wxRIGHT, 4 ); wxALIGN_CENTER_VERTICAL|wxRIGHT, 4 );
rowSizer->Add( new wxStaticText(panel,wxID_ANY,wxT("Tree Ctrl wxComboControl:")), 1, rowSizer->Add( new wxStaticText(panel,wxID_ANY,wxT("Tree Ctrl wxComboCtrl:")), 1,
wxALIGN_CENTER_VERTICAL|wxRIGHT, 4 ); wxALIGN_CENTER_VERTICAL|wxRIGHT, 4 );
colSizer->Add( rowSizer, 0, wxEXPAND|wxALL, 5 ); colSizer->Add( rowSizer, 0, wxEXPAND|wxALL, 5 );