X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e273c962f80926ad2b8d00807c4d15331f9b743f..f2a4f50e7d53977c3ba1668b3b30e325ac2a81d3:/samples/widgets/widgets.cpp?ds=sidebyside diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index f0e31be924..e14e7337e8 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -51,6 +51,9 @@ #include "wx/imaglist.h" #include "wx/wupdlock.h" +#include "wx/persist/toplevel.h" +#include "wx/persist/treebook.h" + #include "widgets.h" #include "../sample.xpm" @@ -87,7 +90,16 @@ 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_SetHint, + TextEntry_End }; const wxChar *WidgetsCategories[MAX_PAGES] = { @@ -153,6 +165,18 @@ protected: void OnToggleGlobalBusyCursor(wxCommandEvent& event); void OnToggleBusyCursor(wxCommandEvent& event); + + // wxTextEntry-specific tests + void OnDisableAutoComplete(wxCommandEvent& event); + void OnAutoCompleteFixed(wxCommandEvent& event); + void OnAutoCompleteFilenames(wxCommandEvent& event); + + void OnSetHint(wxCommandEvent& event); + + void OnUpdateTextUI(wxUpdateUIEvent& event) + { + event.Enable( CurrentPage()->GetTextEntry() != NULL ); + } #endif // wxUSE_MENUS // initialize the book: add all pages to it @@ -206,29 +230,14 @@ public: private: // implement sink functions - virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) { - // don't put trace messages into listbox or we can get into infinite - // recursion if ( level == wxLOG_Trace ) { if ( m_logOld ) - { - // cast is needed to call protected method - ((LboxLogger *)m_logOld)->DoLog(level, szString, t); - } + m_logOld->LogTextAtLevel(level, msg); + return; } - else - { - wxLog::DoLog(level, szString, t); - } - } - - virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t)) - { - wxString msg; - TimeStamp(&msg); - msg += szString; #ifdef __WXUNIVERSAL__ m_lbox->AppendAndEnsureVisible(msg); @@ -285,6 +294,15 @@ 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_MENU(TextEntry_SetHint, WidgetsFrame::OnSetHint) + + EVT_UPDATE_UI_RANGE(TextEntry_Begin, TextEntry_End - 1, + WidgetsFrame::OnUpdateTextUI) + EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit) #endif // wxUSE_MENUS END_EVENT_TABLE() @@ -302,6 +320,8 @@ bool WidgetsApp::OnInit() if ( !wxApp::OnInit() ) return false; + SetVendorName("wxWidgets_Samples"); + // the reason for having these ifdef's is that I often run two copies of // this sample side by side and it is useful to see which one is which wxString title; @@ -317,6 +337,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 @@ -324,10 +348,6 @@ bool WidgetsApp::OnInit() wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo")); frame->Show(); - //wxLog::AddTraceMask(_T("listbox")); - //wxLog::AddTraceMask(_T("scrollbar")); - //wxLog::AddTraceMask(_T("focus")); - return true; } @@ -338,15 +358,18 @@ bool WidgetsApp::OnInit() WidgetsFrame::WidgetsFrame(const wxString& title) : wxFrame(NULL, wxID_ANY, title) { + SetName("Main"); + const bool sizeSet = wxPersistentRegisterAndRestore(this); + // set the frame icon SetIcon(wxICON(sample)); // init everything #if USE_LOG - m_lboxLog = (wxListBox *)NULL; - m_logTarget = (wxLog *)NULL; + m_lboxLog = NULL; + m_logTarget = NULL; #endif // USE_LOG - m_book = (WidgetsBookCtrl *)NULL; + m_book = NULL; #if wxUSE_MENUS // create the menubar @@ -380,6 +403,19 @@ 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")); + menuTextEntry->AppendSeparator(); + menuTextEntry->Append(TextEntry_SetHint, "Set help &hint"); + + mbar->Append(menuTextEntry, _T("&Text")); + SetMenuBar(mbar); mbar->Check(Widgets_Enable, true); @@ -397,13 +433,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title) // Uncomment to suppress page theme (draw in solid colour) //style |= wxNB_NOPAGETHEME; - m_book = new WidgetsBookCtrl(m_panel, Widgets_BookCtrl, wxDefaultPosition, -#ifdef __WXMOTIF__ - wxSize(500, wxDefaultCoord), // under Motif, height is a function of the width... -#else - wxDefaultSize, -#endif - style); + m_book = new WidgetsBookCtrl(m_panel, Widgets_BookCtrl, + wxDefaultPosition, wxDefaultSize, + style, "Widgets"); + InitBook(); #ifndef __WXHANDHELD__ @@ -444,8 +477,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title) m_panel->SetSizer(sizerTop); - sizerTop->Fit(this); - sizerTop->SetSizeHints(this); + const wxSize sizeMin = m_panel->GetBestSize(); + if ( !sizeSet ) + SetClientSize(sizeMin); + SetMinClientSize(sizeMin); #if USE_LOG && !defined(__WXCOCOA__) // wxCocoa's listbox is too flakey to use for logging right now @@ -576,10 +611,13 @@ void WidgetsFrame::InitBook() wxEVT_COMMAND_WIDGETS_PAGE_CHANGED, wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) ); + const bool pageSet = wxPersistentRegisterAndRestore(m_book); + #if USE_TREEBOOK // for treebook page #0 is empty parent page only so select the first page // with some contents - m_book->SetSelection(1); + if ( !pageSet ) + m_book->SetSelection(1); // but ensure that the top of the tree is shown nevertheless wxTreeCtrl * const tree = m_book->GetTreeCtrl(); @@ -587,10 +625,13 @@ void WidgetsFrame::InitBook() 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); + if ( !pageSet ) + { + // 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 } @@ -811,6 +852,8 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnEnable(wxCommandEvent& event) { CurrentPage()->GetWidget()->Enable(event.IsChecked()); + if (CurrentPage()->GetWidget2()) + CurrentPage()->GetWidget2()->Enable(event.IsChecked()); } void WidgetsFrame::OnSetBorder(wxCommandEvent& event) @@ -855,6 +898,69 @@ 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."); +} + +void WidgetsFrame::OnSetHint(wxCommandEvent& WXUNUSED(event)) +{ + wxTextEntryBase *entry = CurrentPage()->GetTextEntry(); + wxCHECK_RET( entry, "menu item should be disabled" ); + + static wxString s_hint("Type here"); + wxString + hint = wxGetTextFromUser("Text hint:", "Widgets sample", s_hint, this); + if ( hint.empty() ) + return; + + s_hint = hint; + + if ( entry->SetHint(hint) ) + wxLogMessage("Set hint to \"%s\".", hint); + else + wxLogMessage("Text hints not supported."); +} + #endif // wxUSE_MENUS // ---------------------------------------------------------------------------- @@ -923,7 +1029,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 |