add a new menu for wxTextEntry-specific tests, currently it allows to check how auto-completion works (#9614)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-29 00:35:35 +00:00
parent b64845917a
commit 6a8d793736
6 changed files with 87 additions and 1 deletions

View File

@@ -93,6 +93,7 @@ public:
ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_combobox; } virtual wxControl *GetWidget() const { return m_combobox; }
virtual wxTextEntryBase *GetTextEntry() const { return m_combobox; }
virtual wxItemContainer* GetContainer() const { return m_combobox; } virtual wxItemContainer* GetContainer() const { return m_combobox; }
virtual void RecreateWidget() { CreateCombo(); } virtual void RecreateWidget() { CreateCombo(); }

View File

@@ -92,6 +92,8 @@ public:
ODComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); ODComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_combobox; } virtual wxControl *GetWidget() const { return m_combobox; }
virtual wxTextEntryBase *GetTextEntry() const
{ return m_combobox ? m_combobox->GetTextCtrl() : NULL; }
virtual wxItemContainer* GetContainer() const { return m_combobox; } virtual wxItemContainer* GetContainer() const { return m_combobox; }
virtual void RecreateWidget() { CreateCombo(); } virtual void RecreateWidget() { CreateCombo(); }

View File

@@ -72,6 +72,7 @@ public:
virtual ~SearchCtrlWidgetsPage(){}; virtual ~SearchCtrlWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_srchCtrl; } virtual wxControl *GetWidget() const { return m_srchCtrl; }
virtual wxTextEntryBase *GetTextEntry() const { return m_srchCtrl; }
virtual void RecreateWidget() { CreateControl(); } virtual void RecreateWidget() { CreateControl(); }
// lazy creation of the content // lazy creation of the content

View File

@@ -138,6 +138,7 @@ public:
virtual ~TextWidgetsPage(){}; virtual ~TextWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_text; } virtual wxControl *GetWidget() const { return m_text; }
virtual wxTextEntryBase *GetTextEntry() const { return m_text; }
virtual void RecreateWidget() { CreateText(); } virtual void RecreateWidget() { CreateText(); }
// lazy creation of the content // lazy creation of the content

View File

@@ -87,7 +87,14 @@ enum
Widgets_BusyCursor, Widgets_BusyCursor,
Widgets_GoToPage, Widgets_GoToPage,
Widgets_GoToPageLast = Widgets_GoToPage + 100 Widgets_GoToPageLast = Widgets_GoToPage + 100,
TextEntry_Begin,
TextEntry_DisableAutoComplete = TextEntry_Begin,
TextEntry_AutoCompleteFixed,
TextEntry_AutoCompleteFilenames,
TextEntry_End
}; };
const wxChar *WidgetsCategories[MAX_PAGES] = { const wxChar *WidgetsCategories[MAX_PAGES] = {
@@ -153,6 +160,15 @@ protected:
void OnToggleGlobalBusyCursor(wxCommandEvent& event); void OnToggleGlobalBusyCursor(wxCommandEvent& event);
void OnToggleBusyCursor(wxCommandEvent& event); void OnToggleBusyCursor(wxCommandEvent& event);
void OnDisableAutoComplete(wxCommandEvent& event);
void OnAutoCompleteFixed(wxCommandEvent& event);
void OnAutoCompleteFilenames(wxCommandEvent& event);
void OnUpdateTextUI(wxUpdateUIEvent& event)
{
event.Enable( CurrentPage()->GetTextEntry() != NULL );
}
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
// initialize the book: add all pages to it // initialize the book: add all pages to it
@@ -285,6 +301,13 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor) EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor)
EVT_MENU(Widgets_BusyCursor, WidgetsFrame::OnToggleBusyCursor) EVT_MENU(Widgets_BusyCursor, WidgetsFrame::OnToggleBusyCursor)
EVT_MENU(TextEntry_DisableAutoComplete, WidgetsFrame::OnDisableAutoComplete)
EVT_MENU(TextEntry_AutoCompleteFixed, WidgetsFrame::OnAutoCompleteFixed)
EVT_MENU(TextEntry_AutoCompleteFilenames, WidgetsFrame::OnAutoCompleteFilenames)
EVT_UPDATE_UI_RANGE(TextEntry_Begin, TextEntry_End - 1,
WidgetsFrame::OnUpdateTextUI)
EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit) EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -384,6 +407,17 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
menuWidget->AppendSeparator(); menuWidget->AppendSeparator();
menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q")); menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));
mbar->Append(menuWidget, _T("&Widget")); mbar->Append(menuWidget, _T("&Widget"));
wxMenu *menuTextEntry = new wxMenu;
menuTextEntry->AppendRadioItem(TextEntry_DisableAutoComplete,
_T("&Disable auto-completion"));
menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFixed,
_T("Fixed-&list auto-completion"));
menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFilenames,
_T("&Files names auto-completion"));
mbar->Append(menuTextEntry, _T("&Text"));
SetMenuBar(mbar); SetMenuBar(mbar);
mbar->Check(Widgets_Enable, true); mbar->Check(Widgets_Enable, true);
@@ -858,6 +892,50 @@ void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
: wxSTANDARD_CURSOR)); : wxSTANDARD_CURSOR));
} }
void WidgetsFrame::OnDisableAutoComplete(wxCommandEvent& WXUNUSED(event))
{
wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
wxCHECK_RET( entry, "menu item should be disabled" );
if ( entry->AutoComplete(wxArrayString()) )
wxLogMessage("Disabled auto completion.");
else
wxLogMessage("AutoComplete() failed.");
}
void WidgetsFrame::OnAutoCompleteFixed(wxCommandEvent& WXUNUSED(event))
{
wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
wxCHECK_RET( entry, "menu item should be disabled" );
wxArrayString completion_choices;
// add a few strings so a completion occurs on any letter typed
for ( char idxc = 'a'; idxc < 'z'; ++idxc )
completion_choices.push_back(wxString::Format("%c%c", idxc, idxc));
completion_choices.push_back("is this string for test?");
completion_choices.push_back("this is a test string");
completion_choices.push_back("this is another test string");
completion_choices.push_back("this string is for test");
if ( entry->AutoComplete(completion_choices) )
wxLogMessage("Enabled auto completion of a set of fixed strings.");
else
wxLogMessage("AutoComplete() failed.");
}
void WidgetsFrame::OnAutoCompleteFilenames(wxCommandEvent& WXUNUSED(event))
{
wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
wxCHECK_RET( entry, "menu item should be disabled" );
if ( entry->AutoCompleteFileNames() )
wxLogMessage("Enable auto completion of file names.");
else
wxLogMessage("AutoCompleteFileNames() failed.");
}
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -97,6 +97,9 @@ public:
// return the control shown by this page // return the control shown by this page
virtual wxControl *GetWidget() const = 0; virtual wxControl *GetWidget() const = 0;
// return the control shown by this page, if it supports text entry interface
virtual wxTextEntryBase *GetTextEntry() const { return NULL; }
// lazy creation of the content // lazy creation of the content
virtual void CreateContent() = 0; virtual void CreateContent() = 0;