X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c714e065cd7343b39b3cbb6b4de83036e2d4890..5276b0a53cef4815230e39b54d2ecda14f72cbd1:/samples/widgets/widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 7bf9ade91e..d71656dd40 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"
@@ -72,6 +75,7 @@ enum
 #endif // wxUSE_TOOLTIPS
     Widgets_SetFgColour,
     Widgets_SetBgColour,
+    Widgets_SetPageBg,
     Widgets_SetFont,
     Widgets_Enable,
 
@@ -87,7 +91,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] = {
@@ -147,12 +160,25 @@ protected:
 #endif // wxUSE_TOOLTIPS
     void OnSetFgCol(wxCommandEvent& event);
     void OnSetBgCol(wxCommandEvent& event);
+    void OnSetPageBg(wxCommandEvent& event);
     void OnSetFont(wxCommandEvent& event);
     void OnEnable(wxCommandEvent& event);
     void OnSetBorder(wxCommandEvent& event);
 
     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 +232,14 @@ public:
 
 private:
     // implement sink functions
-    virtual void DoLog(wxLogLevel level, const wxString& str, 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, str, t);
-            }
-        }
-        else
-        {
-            wxLog::DoLog(level, str, t);
+                m_logOld->LogTextAtLevel(level, msg);
+            return;
         }
-    }
-
-    virtual void DoLogString(const wxString& str, time_t WXUNUSED(t))
-    {
-        wxString msg;
-        TimeStamp(&msg);
-        msg += str;
 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);
@@ -276,6 +287,7 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
 
     EVT_MENU(Widgets_SetFgColour, WidgetsFrame::OnSetFgCol)
     EVT_MENU(Widgets_SetBgColour, WidgetsFrame::OnSetBgCol)
+    EVT_MENU(Widgets_SetPageBg,   WidgetsFrame::OnSetPageBg)
     EVT_MENU(Widgets_SetFont,     WidgetsFrame::OnSetFont)
     EVT_MENU(Widgets_Enable,      WidgetsFrame::OnEnable)
 
@@ -285,6 +297,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,32 +323,34 @@ 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;
 #if defined(__WXUNIVERSAL__)
-    title = _T("wxUniv/");
+    title = wxT("wxUniv/");
 #endif
 
 #if defined(__WXMSW__)
-    title += _T("wxMSW");
+    title += wxT("wxMSW");
 #elif defined(__WXGTK__)
-    title += _T("wxGTK");
+    title += wxT("wxGTK");
 #elif defined(__WXMAC__)
-    title += _T("wxMAC");
+    title += wxT("wxMAC");
 #elif defined(__WXMOTIF__)
-    title += _T("wxMOTIF");
+    title += wxT("wxMOTIF");
+#elif defined(__WXPALMOS5__)
+    title += wxT("wxPALMOS5");
+#elif defined(__WXPALMOS6__)
+    title += wxT("wxPALMOS6");
 #else
-    title += _T("wxWidgets");
+    title += wxT("wxWidgets");
 #endif
 
-    wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
+    wxFrame *frame = new WidgetsFrame(title + wxT(" widgets demo"));
     frame->Show();
 
-    //wxLog::AddTraceMask(_T("listbox"));
-    //wxLog::AddTraceMask(_T("scrollbar"));
-    //wxLog::AddTraceMask(_T("focus"));
-
     return true;
 }
 
@@ -338,48 +361,65 @@ 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
     wxMenuBar *mbar = new wxMenuBar;
     wxMenu *menuWidget = new wxMenu;
 #if wxUSE_TOOLTIPS
-    menuWidget->Append(Widgets_SetTooltip, _T("Set &tooltip...\tCtrl-T"));
+    menuWidget->Append(Widgets_SetTooltip, wxT("Set &tooltip...\tCtrl-T"));
     menuWidget->AppendSeparator();
 #endif // wxUSE_TOOLTIPS
-    menuWidget->Append(Widgets_SetFgColour, _T("Set &foreground...\tCtrl-F"));
-    menuWidget->Append(Widgets_SetBgColour, _T("Set &background...\tCtrl-B"));
-    menuWidget->Append(Widgets_SetFont,     _T("Set f&ont...\tCtrl-O"));
-    menuWidget->AppendCheckItem(Widgets_Enable,  _T("&Enable/disable\tCtrl-E"));
+    menuWidget->Append(Widgets_SetFgColour, wxT("Set &foreground...\tCtrl-F"));
+    menuWidget->Append(Widgets_SetBgColour, wxT("Set &background...\tCtrl-B"));
+    menuWidget->Append(Widgets_SetPageBg,   wxT("Set &page background...\tShift-Ctrl-B"));
+    menuWidget->Append(Widgets_SetFont,     wxT("Set f&ont...\tCtrl-O"));
+    menuWidget->AppendCheckItem(Widgets_Enable,  wxT("&Enable/disable\tCtrl-E"));
 
     wxMenu *menuBorders = new wxMenu;
-    menuBorders->AppendRadioItem(Widgets_BorderDefault, _T("De&fault\tCtrl-Shift-9"));
-    menuBorders->AppendRadioItem(Widgets_BorderNone,   _T("&None\tCtrl-Shift-0"));
-    menuBorders->AppendRadioItem(Widgets_BorderSimple, _T("&Simple\tCtrl-Shift-1"));
-    menuBorders->AppendRadioItem(Widgets_BorderDouble, _T("&Double\tCtrl-Shift-2"));
-    menuBorders->AppendRadioItem(Widgets_BorderStatic, _T("Stati&c\tCtrl-Shift-3"));
-    menuBorders->AppendRadioItem(Widgets_BorderRaised, _T("&Raised\tCtrl-Shift-4"));
-    menuBorders->AppendRadioItem(Widgets_BorderSunken, _T("S&unken\tCtrl-Shift-5"));
-    menuWidget->AppendSubMenu(menuBorders, _T("Set &border"));
+    menuBorders->AppendRadioItem(Widgets_BorderDefault, wxT("De&fault\tCtrl-Shift-9"));
+    menuBorders->AppendRadioItem(Widgets_BorderNone,   wxT("&None\tCtrl-Shift-0"));
+    menuBorders->AppendRadioItem(Widgets_BorderSimple, wxT("&Simple\tCtrl-Shift-1"));
+    menuBorders->AppendRadioItem(Widgets_BorderDouble, wxT("&Double\tCtrl-Shift-2"));
+    menuBorders->AppendRadioItem(Widgets_BorderStatic, wxT("Stati&c\tCtrl-Shift-3"));
+    menuBorders->AppendRadioItem(Widgets_BorderRaised, wxT("&Raised\tCtrl-Shift-4"));
+    menuBorders->AppendRadioItem(Widgets_BorderSunken, wxT("S&unken\tCtrl-Shift-5"));
+    menuWidget->AppendSubMenu(menuBorders, wxT("Set &border"));
 
     menuWidget->AppendSeparator();
     menuWidget->AppendCheckItem(Widgets_GlobalBusyCursor,
-                                _T("Toggle &global busy cursor\tCtrl-Shift-U"));
+                                wxT("Toggle &global busy cursor\tCtrl-Shift-U"));
     menuWidget->AppendCheckItem(Widgets_BusyCursor,
-                                _T("Toggle b&usy cursor\tCtrl-U"));
+                                wxT("Toggle b&usy cursor\tCtrl-U"));
 
     menuWidget->AppendSeparator();
-    menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));
-    mbar->Append(menuWidget, _T("&Widget"));
+    menuWidget->Append(wxID_EXIT, wxT("&Quit\tCtrl-Q"));
+    mbar->Append(menuWidget, wxT("&Widget"));
+
+    wxMenu *menuTextEntry = new wxMenu;
+    menuTextEntry->AppendRadioItem(TextEntry_DisableAutoComplete,
+                                   wxT("&Disable auto-completion"));
+    menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFixed,
+                                   wxT("Fixed-&list auto-completion"));
+    menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFilenames,
+                                   wxT("&Files names auto-completion"));
+    menuTextEntry->AppendSeparator();
+    menuTextEntry->Append(TextEntry_SetHint, "Set help &hint");
+
+    mbar->Append(menuTextEntry, wxT("&Text"));
+
     SetMenuBar(mbar);
 
     mbar->Check(Widgets_Enable, true);
@@ -397,20 +437,17 @@ 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__
     // the lower one only has the log listbox and a button to clear it
 #if USE_LOG
     wxSizer *sizerDown = new wxStaticBoxSizer(
-        new wxStaticBox( m_panel, wxID_ANY, _T("&Log window") ),
+        new wxStaticBox( m_panel, wxID_ANY, wxT("&Log window") ),
         wxVERTICAL);
 
     m_lboxLog = new wxListBox(m_panel, wxID_ANY);
@@ -423,11 +460,11 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxButton *btn;
 #if USE_LOG
-    btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));
+    btn = new wxButton(m_panel, Widgets_ClearLog, wxT("Clear &log"));
     sizerBtns->Add(btn);
     sizerBtns->Add(10, 0); // spacer
 #endif // USE_LOG
-    btn = new wxButton(m_panel, Widgets_Quit, _T("E&xit"));
+    btn = new wxButton(m_panel, Widgets_Quit, wxT("E&xit"));
     sizerBtns->Add(btn);
     sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5);
 
@@ -444,8 +481,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
@@ -537,7 +576,7 @@ void WidgetsFrame::InitBook()
         }
     }
 
-    GetMenuBar()->Append(menuPages, _T("&Page"));
+    GetMenuBar()->Append(menuPages, wxT("&Page"));
 
 #if USE_ICONS_IN_BOOK
     m_book->AssignImageList(imageList);
@@ -576,10 +615,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 +629,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
 }
 
@@ -600,7 +645,7 @@ WidgetsPage *WidgetsFrame::CurrentPage()
 
 #if !USE_TREEBOOK
     WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl);
-    wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") );
+    wxCHECK_MSG( subBook, NULL, wxT("no WidgetsBookCtrl?") );
 
     page = subBook->GetCurrentPage();
 #endif // !USE_TREEBOOK
@@ -696,13 +741,13 @@ void WidgetsFrame::OnGoToPage(wxCommandEvent& event)
 
 void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
 {
-    static wxString s_tip = _T("This is a tooltip");
+    static wxString s_tip = wxT("This is a tooltip");
 
     wxTextEntryDialog dialog
                       (
                         this,
-                        _T("Tooltip text (may use \\n, leave empty to remove): "),
-                        _T("Widgets sample"),
+                        wxT("Tooltip text (may use \\n, leave empty to remove): "),
+                        wxT("Widgets sample"),
                         s_tip
                       );
 
@@ -710,74 +755,96 @@ void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
         return;
 
     s_tip = dialog.GetValue();
-    s_tip.Replace(_T("\\n"), _T("\n"));
+    s_tip.Replace(wxT("\\n"), wxT("\n"));
 
     WidgetsPage *page = CurrentPage();
 
-    page->GetWidget()->SetToolTip(s_tip);
-
-    wxControl *ctrl2 = page->GetWidget2();
-    if ( ctrl2 )
-        ctrl2->SetToolTip(s_tip);
+    const Widgets widgets = page->GetWidgets();
+    for ( Widgets::const_iterator it = widgets.begin();
+          it != widgets.end();
+          ++it )
+    {
+        (*it)->SetToolTip(s_tip);
+    }
 }
 
 #endif // wxUSE_TOOLTIPS
 
-void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
+namespace
+{
+
+// Trivial wrapper for wxGetColourFromUser() which also does something even if
+// the colour dialog is not available in the current build (which may happen
+// for the ports in development and it is still useful to see how colours work)
+wxColour GetColourFromUser(wxWindow *parent, const wxColour& colDefault)
 {
 #if wxUSE_COLOURDLG
+    return wxGetColourFromUser(parent, colDefault);
+#else // !wxUSE_COLOURDLG
+    if ( colDefault == *wxBLACK )
+        return *wxWHITE;
+    else
+        return *wxBLACK;
+#endif // wxUSE_COLOURDLG/!wxUSE_COLOURDLG
+}
+
+} // anonymous namespace
+
+void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
+{
     // allow for debugging the default colour the first time this is called
     WidgetsPage *page = CurrentPage();
 
     if (!m_colFg.Ok())
         m_colFg = page->GetForegroundColour();
 
-    wxColour col = wxGetColourFromUser(this, m_colFg);
+    wxColour col = GetColourFromUser(this, m_colFg);
     if ( !col.Ok() )
         return;
 
     m_colFg = col;
 
-    page->GetWidget()->SetForegroundColour(m_colFg);
-    page->GetWidget()->Refresh();
-
-    wxControl *ctrl2 = page->GetWidget2();
-    if ( ctrl2 )
+    const Widgets widgets = page->GetWidgets();
+    for ( Widgets::const_iterator it = widgets.begin();
+          it != widgets.end();
+          ++it )
     {
-        ctrl2->SetForegroundColour(m_colFg);
-        ctrl2->Refresh();
+        (*it)->SetForegroundColour(m_colFg);
+        (*it)->Refresh();
     }
-#else
-    wxLogMessage(_T("Colour selection dialog not available in current build."));
-#endif
 }
 
 void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
-#if wxUSE_COLOURDLG
     WidgetsPage *page = CurrentPage();
 
     if ( !m_colBg.Ok() )
         m_colBg = page->GetBackgroundColour();
 
-    wxColour col = wxGetColourFromUser(this, m_colBg);
+    wxColour col = GetColourFromUser(this, m_colBg);
     if ( !col.Ok() )
         return;
 
     m_colBg = col;
 
-    page->GetWidget()->SetBackgroundColour(m_colBg);
-    page->GetWidget()->Refresh();
-
-    wxControl *ctrl2 = page->GetWidget2();
-    if ( ctrl2 )
+    const Widgets widgets = page->GetWidgets();
+    for ( Widgets::const_iterator it = widgets.begin();
+          it != widgets.end();
+          ++it )
     {
-        ctrl2->SetBackgroundColour(m_colFg);
-        ctrl2->Refresh();
+        (*it)->SetBackgroundColour(m_colBg);
+        (*it)->Refresh();
     }
-#else
-    wxLogMessage(_T("Colour selection dialog not available in current build."));
-#endif
+}
+
+void WidgetsFrame::OnSetPageBg(wxCommandEvent& WXUNUSED(event))
+{
+    wxColour col = GetColourFromUser(this, GetBackgroundColour());
+    if ( !col.Ok() )
+        return;
+
+    CurrentPage()->SetBackgroundColour(col);
+    CurrentPage()->Refresh();
 }
 
 void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
@@ -794,23 +861,28 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 
     m_font = font;
 
-    page->GetWidget()->SetFont(m_font);
-    page->GetWidget()->Refresh();
-
-    wxControl *ctrl2 = page->GetWidget2();
-    if ( ctrl2 )
+    const Widgets widgets = page->GetWidgets();
+    for ( Widgets::const_iterator it = widgets.begin();
+          it != widgets.end();
+          ++it )
     {
-        ctrl2->SetFont(m_font);
-        ctrl2->Refresh();
+        (*it)->SetFont(m_font);
+        (*it)->Refresh();
     }
 #else
-    wxLogMessage(_T("Font selection dialog not available in current build."));
+    wxLogMessage(wxT("Font selection dialog not available in current build."));
 #endif
 }
 
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {
-    CurrentPage()->GetWidget()->Enable(event.IsChecked());
+    const Widgets widgets = CurrentPage()->GetWidgets();
+    for ( Widgets::const_iterator it = widgets.begin();
+          it != widgets.end();
+          ++it )
+    {
+        (*it)->Enable(event.IsChecked());
+    }
 }
 
 void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
@@ -826,7 +898,7 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
         case Widgets_BorderDouble: border = wxBORDER_DOUBLE; break;
 
         default:
-            wxFAIL_MSG( _T("unknown border style") );
+            wxFAIL_MSG( wxT("unknown border style") );
             // fall through
 
         case Widgets_BorderDefault: border = wxBORDER_DEFAULT; break;
@@ -850,9 +922,95 @@ void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event)
 
 void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
 {
-    CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked()
-                                                ? wxHOURGLASS_CURSOR
-                                                : wxSTANDARD_CURSOR));
+    wxCursor cursor(*(event.IsChecked() ? wxHOURGLASS_CURSOR
+                                        : wxSTANDARD_CURSOR));
+
+    const Widgets widgets = CurrentPage()->GetWidgets();
+    for ( Widgets::const_iterator it = widgets.begin();
+          it != widgets.end();
+          ++it )
+    {
+        (*it)->SetCursor(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 +1081,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 |