X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe24a9451e84346c541c781c5454cdcb1d6668fe..b46f221ff3a68c8f3a14ac6a67eb4923c266faf8:/samples/widgets/widgets.cpp diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 3e17c1ae5e..ada1bd3364 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -30,6 +30,7 @@ #include "wx/log.h" #include "wx/frame.h" #include "wx/menu.h" + #include "wx/image.h" #include "wx/button.h" #include "wx/checkbox.h" @@ -86,7 +87,14 @@ enum Widgets_BusyCursor, 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] = { @@ -152,6 +160,15 @@ protected: void OnToggleGlobalBusyCursor(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 // initialize the book: add all pages to it @@ -205,7 +222,7 @@ public: private: // implement sink functions - virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) + virtual void DoLog(wxLogLevel level, const wxString& str, time_t t) { // don't put trace messages into listbox or we can get into infinite // recursion @@ -214,20 +231,20 @@ private: if ( m_logOld ) { // cast is needed to call protected method - ((LboxLogger *)m_logOld)->DoLog(level, szString, t); + ((LboxLogger *)m_logOld)->DoLog(level, str, t); } } else { - wxLog::DoLog(level, szString, t); + wxLog::DoLog(level, str, t); } } - virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t)) + virtual void DoLogString(const wxString& str, time_t WXUNUSED(t)) { wxString msg; TimeStamp(&msg); - msg += szString; + msg += str; #ifdef __WXUNIVERSAL__ m_lbox->AppendAndEnsureVisible(msg); @@ -270,7 +287,6 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) #if wxUSE_MENUS EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging) - EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged) EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast, WidgetsFrame::OnGoToPage) @@ -285,6 +301,13 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor) 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) #endif // wxUSE_MENUS END_EVENT_TABLE() @@ -317,6 +340,10 @@ bool WidgetsApp::OnInit() title += _T("wxMAC"); #elif defined(__WXMOTIF__) title += _T("wxMOTIF"); +#elif __WXPALMOS5__ + title += _T("wxPALMOS5"); +#elif __WXPALMOS6__ + title += _T("wxPALMOS6"); #else title += _T("wxWidgets"); #endif @@ -380,6 +407,17 @@ WidgetsFrame::WidgetsFrame(const wxString& title) menuWidget->AppendSeparator(); menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q")); 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); mbar->Check(Widgets_Enable, true); @@ -444,7 +482,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title) m_panel->SetSizer(sizerTop); - sizerTop->Fit(this); sizerTop->SetSizeHints(this); #if USE_LOG && !defined(__WXCOCOA__) @@ -459,9 +496,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title) void WidgetsFrame::InitBook() { #if USE_ICONS_IN_BOOK - wxImageList *imageList = new wxImageList(32, 32); + wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE); - imageList->Add(wxBitmap(sample_xpm)); + wxImage img(sample_xpm); + imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE))); #else wxImageList *imageList = NULL; #endif @@ -571,6 +609,10 @@ void WidgetsFrame::InitBook() } } + Connect( wxID_ANY, + wxEVT_COMMAND_WIDGETS_PAGE_CHANGED, + wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) ); + #if USE_TREEBOOK // for treebook page #0 is empty parent page only so select the first page // with some contents @@ -578,7 +620,14 @@ void WidgetsFrame::InitBook() // but ensure that the top of the tree is shown nevertheless wxTreeCtrl * const tree = m_book->GetTreeCtrl(); - tree->EnsureVisible(tree->GetRootItem()); + + wxTreeItemIdValue cookie; + tree->EnsureVisible(tree->GetFirstChild(tree->GetRootItem(), cookie)); +#else + // for other books set selection twice to force connected event handler + // to force lazy creation of initial visible content + m_book->SetSelection(1); + m_book->SetSelection(0); #endif // USE_TREEBOOK } @@ -623,8 +672,13 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event) { +#if USE_TREEBOOK + // don't allow selection of entries without pages (categories) if ( !m_book->GetPage(event.GetSelection()) ) event.Veto(); +#else + wxUnusedVar(event); +#endif } void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event) @@ -638,12 +692,16 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event) GetMenuBar()->Check(Widgets_BusyCursor, false); - // lazy creation of the pages + // create the pages on demand, otherwise the sample startup is too slow as + // it creates hundreds of controls WidgetsPage *page = CurrentPage(); if ( page->GetChildren().empty() ) { wxWindowUpdateLocker noUpdates(page); page->CreateContent(); + //page->Layout(); + page->GetSizer()->Fit(page); + WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl); wxSize size; for ( size_t i = 0; i < book->GetPageCount(); ++i ) @@ -834,6 +892,50 @@ void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event) : 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 // ---------------------------------------------------------------------------- @@ -902,7 +1004,7 @@ WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL; WidgetsPage::WidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, - char* icon[]) + const char *const icon[]) : wxPanel(book, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE | @@ -910,7 +1012,7 @@ WidgetsPage::WidgetsPage(WidgetsBookCtrl *book, wxTAB_TRAVERSAL) { #if USE_ICONS_IN_BOOK - imaglist->Add(wxBitmap(icon)); + imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE))); #else wxUnusedVar(imaglist); wxUnusedVar(icon);