X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8d07a796ff8e372e1f851d65d96f060dd05e0e1..0b1b2c71e3ee5d3d5533b99447fc4e7e64540fb5:/samples/widgets/widgets.cpp?ds=sidebyside diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 1a371f0bd9..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" @@ -47,6 +48,8 @@ #include "wx/colordlg.h" #include "wx/fontdlg.h" #include "wx/textdlg.h" +#include "wx/imaglist.h" +#include "wx/wupdlock.h" #include "widgets.h" @@ -80,8 +83,18 @@ enum Widgets_BorderDouble, Widgets_BorderDefault, + Widgets_GlobalBusyCursor, + 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] = { @@ -132,6 +145,7 @@ protected: void OnExit(wxCommandEvent& event); #if wxUSE_MENUS + void OnPageChanging(WidgetsBookCtrlEvent& event); void OnPageChanged(WidgetsBookCtrlEvent& event); void OnGoToPage(wxCommandEvent& event); @@ -143,12 +157,24 @@ protected: void OnSetFont(wxCommandEvent& event); void OnEnable(wxCommandEvent& event); void OnSetBorder(wxCommandEvent& event); + + 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 void InitBook(); - // finding current page assuming book inside book + // return the currently selected page (never NULL) WidgetsPage *CurrentPage(); private: @@ -196,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 @@ -205,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); @@ -260,7 +286,7 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) #endif // wxUSE_TOOLTIPS #if wxUSE_MENUS - EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged) + EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging) EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast, WidgetsFrame::OnGoToPage) @@ -272,6 +298,16 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault, WidgetsFrame::OnSetBorder) + 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() @@ -304,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 @@ -323,12 +363,7 @@ bool WidgetsApp::OnInit() // ---------------------------------------------------------------------------- WidgetsFrame::WidgetsFrame(const wxString& title) - : wxFrame(NULL, wxID_ANY, title, - wxPoint(0, 50), wxDefaultSize, - wxDEFAULT_FRAME_STYLE | - wxNO_FULL_REPAINT_ON_RESIZE | - wxCLIP_CHILDREN | - wxTAB_TRAVERSAL) + : wxFrame(NULL, wxID_ANY, title) { // set the frame icon SetIcon(wxICON(sample)); @@ -363,24 +398,40 @@ WidgetsFrame::WidgetsFrame(const wxString& title) menuBorders->AppendRadioItem(Widgets_BorderSunken, _T("S&unken\tCtrl-Shift-5")); menuWidget->AppendSubMenu(menuBorders, _T("Set &border")); + menuWidget->AppendSeparator(); + menuWidget->AppendCheckItem(Widgets_GlobalBusyCursor, + _T("Toggle &global busy cursor\tCtrl-Shift-U")); + menuWidget->AppendCheckItem(Widgets_BusyCursor, + _T("Toggle b&usy cursor\tCtrl-U")); + 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); #endif // wxUSE_MENUS // create controls - m_panel = new wxPanel(this, wxID_ANY, - wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN); + m_panel = new wxPanel(this, wxID_ANY); wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); // we have 2 panes: book with pages demonstrating the controls in the // upper one and the log window with some buttons in the lower - int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBK_DEFAULT; + int style = wxBK_DEFAULT; // Uncomment to suppress page theme (draw in solid colour) //style |= wxNB_NOPAGETHEME; @@ -393,7 +444,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title) style); InitBook(); -#ifndef __SMARTPHONE__ +#ifndef __WXHANDHELD__ // the lower one only has the log listbox and a button to clear it #if USE_LOG wxSizer *sizerDown = new wxStaticBoxSizer( @@ -423,15 +474,14 @@ WidgetsFrame::WidgetsFrame(const wxString& title) sizerTop->Add(0, 5, 0, wxGROW); // spacer in between sizerTop->Add(sizerDown, 0, wxGROW | (wxALL & ~wxTOP), 10); -#else // !__SMARTPHONE__/__SMARTPHONE__ +#else // !__WXHANDHELD__/__WXHANDHELD__ sizerTop->Add(m_book, 1, wxGROW | wxALL ); -#endif // __SMARTPHONE__ +#endif // __WXHANDHELD__ m_panel->SetSizer(sizerTop); - sizerTop->Fit(this); sizerTop->SetSizeHints(this); #if USE_LOG && !defined(__WXCOCOA__) @@ -445,9 +495,14 @@ WidgetsFrame::WidgetsFrame(const wxString& title) void WidgetsFrame::InitBook() { - wxImageList *imageList = new wxImageList(32, 32); +#if USE_ICONS_IN_BOOK + 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 #if !USE_TREEBOOK WidgetsBookCtrl *books[MAX_PAGES]; @@ -469,7 +524,11 @@ void WidgetsFrame::InitBook() #if USE_TREEBOOK nPage++; // increase for parent page #else - books[cat] = new WidgetsBookCtrl( m_book, wxID_ANY ); + books[cat] = new WidgetsBookCtrl(m_book, + wxID_ANY, + wxDefaultPosition, + wxDefaultSize, + wxBK_DEFAULT); #endif for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages; @@ -517,7 +576,9 @@ void WidgetsFrame::InitBook() GetMenuBar()->Append(menuPages, _T("&Page")); +#if USE_ICONS_IN_BOOK m_book->AssignImageList(imageList); +#endif for ( cat = 0; cat < MAX_PAGES; cat++ ) { @@ -525,7 +586,9 @@ void WidgetsFrame::InitBook() m_book->AddPage(NULL,WidgetsCategories[cat],false,0); #else m_book->AddPage(books[cat],WidgetsCategories[cat],false,0); +#if USE_ICONS_IN_BOOK books[cat]->SetImageList(imageList); +#endif #endif // now do add them @@ -533,10 +596,11 @@ void WidgetsFrame::InitBook() for ( size_t n = 0; n < count; n++ ) { #if USE_TREEBOOK - m_book->AddSubPage( + m_book->AddSubPage #else - books[cat]->AddPage( + books[cat]->AddPage #endif + ( pages[cat][n], labels[cat][n], false, // don't select @@ -545,22 +609,40 @@ 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 + // for treebook page #0 is empty parent page only so select the first page + // with some contents + m_book->SetSelection(1); + + // but ensure that the top of the tree is shown nevertheless + wxTreeCtrl * const tree = m_book->GetTreeCtrl(); + + 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 +#endif // USE_TREEBOOK } WidgetsPage *WidgetsFrame::CurrentPage() { -#if USE_TREEBOOK - return wxStaticCast(m_book->GetCurrentPage(), WidgetsPage); -#else - WidgetsBookCtrl *book = wxStaticCast(m_book->GetCurrentPage(), WidgetsBookCtrl); - if (!book) return NULL; - return wxStaticCast(book->GetCurrentPage(), WidgetsPage); -#endif + wxWindow *page = m_book->GetCurrentPage(); + +#if !USE_TREEBOOK + WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl); + wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") ); + + page = subBook->GetCurrentPage(); +#endif // !USE_TREEBOOK + + return wxStaticCast(page, WidgetsPage); } WidgetsFrame::~WidgetsFrame() @@ -588,10 +670,51 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event)) #if wxUSE_MENUS +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) { - wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + event.GetSelection()); - if (item) item->Check(); + const int sel = event.GetSelection(); + + // adjust "Page" menu selection + wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + sel); + if ( item ) + item->Check(); + + GetMenuBar()->Check(Widgets_BusyCursor, false); + + // 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 ) + { + wxWindow *page = book->GetPage(i); + if ( page ) + { + size.IncTo(page->GetSize()); + } + } + page->SetSize(size); + } + event.Skip(); } @@ -627,6 +750,7 @@ void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event)) s_tip.Replace(_T("\\n"), _T("\n")); WidgetsPage *page = CurrentPage(); + page->GetWidget()->SetToolTip(s_tip); wxControl *ctrl2 = page->GetWidget2(); @@ -641,6 +765,7 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event)) #if wxUSE_COLOURDLG // allow for debugging the default colour the first time this is called WidgetsPage *page = CurrentPage(); + if (!m_colFg.Ok()) m_colFg = page->GetForegroundColour(); @@ -668,6 +793,7 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_COLOURDLG WidgetsPage *page = CurrentPage(); + if ( !m_colBg.Ok() ) m_colBg = page->GetBackgroundColour(); @@ -695,6 +821,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FONTDLG WidgetsPage *page = CurrentPage(); + if (!m_font.Ok()) m_font = page->GetFont(); @@ -720,8 +847,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnEnable(wxCommandEvent& event) { - WidgetsPage *page = CurrentPage(); - page->GetWidget()->Enable(event.IsChecked()); + CurrentPage()->GetWidget()->Enable(event.IsChecked()); } void WidgetsFrame::OnSetBorder(wxCommandEvent& event) @@ -747,9 +873,69 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event) WidgetsPage::ms_defaultFlags |= border; WidgetsPage *page = CurrentPage(); + page->RecreateWidget(); } +void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event) +{ + if ( event.IsChecked() ) + wxBeginBusyCursor(); + else + wxEndBusyCursor(); +} + +void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event) +{ + CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked() + ? wxHOURGLASS_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 // ---------------------------------------------------------------------------- @@ -816,13 +1002,21 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label, int cate int WidgetsPage::ms_defaultFlags = wxBORDER_DEFAULT; WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL; -WidgetsPage::WidgetsPage(WidgetsBookCtrl *book) +WidgetsPage::WidgetsPage(WidgetsBookCtrl *book, + wxImageList *imaglist, + const char *const icon[]) : wxPanel(book, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE | wxCLIP_CHILDREN | wxTAB_TRAVERSAL) { +#if USE_ICONS_IN_BOOK + imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE))); +#else + wxUnusedVar(imaglist); + wxUnusedVar(icon); +#endif } wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,