#include "wx/imaglist.h"
#include "wx/wupdlock.h"
+#include "wx/persist/toplevel.h"
+#include "wx/persist/treebook.h"
+
#include "widgets.h"
#include "../sample.xpm"
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] = {
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
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);
- }
+ m_logOld->LogTextAtLevel(level, msg);
+ return;
}
- else
- {
- wxLog::DoLog(level, str, t);
- }
- }
-
- virtual void DoLogString(const wxString& str, time_t WXUNUSED(t))
- {
- wxString msg;
- TimeStamp(&msg);
- msg += str;
#ifdef __WXUNIVERSAL__
m_lbox->AppendAndEnsureVisible(msg);
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()
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 __WXPALMOS5__
+ title += wxT("wxPALMOS5");
+#elif __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;
}
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_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);
// 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);
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);
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
}
}
- GetMenuBar()->Append(menuPages, _T("&Page"));
+ GetMenuBar()->Append(menuPages, wxT("&Page"));
#if USE_ICONS_IN_BOOK
m_book->AssignImageList(imageList);
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();
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
}
#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
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
);
return;
s_tip = dialog.GetValue();
- s_tip.Replace(_T("\\n"), _T("\n"));
+ s_tip.Replace(wxT("\\n"), wxT("\n"));
WidgetsPage *page = CurrentPage();
ctrl2->Refresh();
}
#else
- wxLogMessage(_T("Colour selection dialog not available in current build."));
+ wxLogMessage(wxT("Colour selection dialog not available in current build."));
#endif
}
ctrl2->Refresh();
}
#else
- wxLogMessage(_T("Colour selection dialog not available in current build."));
+ wxLogMessage(wxT("Colour selection dialog not available in current build."));
#endif
}
ctrl2->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());
+ if (CurrentPage()->GetWidget2())
+ CurrentPage()->GetWidget2()->Enable(event.IsChecked());
}
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;
: 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
// ----------------------------------------------------------------------------
WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
wxImageList *imaglist,
- char* icon[])
+ const char *const icon[])
: wxPanel(book, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxNO_FULL_REPAINT_ON_RESIZE |
projects / wxWidgets.git / blobdiff