added a period at the end of a sentence (test commit, really)

[wxWidgets.git] / samples / widgets / widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 4c16ebb83c76cd73b06227e98abf1b6ce1693d21..19d86f02e3d752860886b995aeb3f85146404869 100644 (file)
--- 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/log.h"
     #include "wx/frame.h"
     #include "wx/menu.h"

+    #include "wx/image.h"

 
     #include "wx/button.h"
     #include "wx/checkbox.h"
 
     #include "wx/button.h"
     #include "wx/checkbox.h"


@@ -50,6 +51,9 @@
 #include "wx/imaglist.h"
 #include "wx/wupdlock.h"
 
 #include "wx/imaglist.h"
 #include "wx/wupdlock.h"
 

+#include "wx/persist/toplevel.h"
+#include "wx/persist/treebook.h"
+

 #include "widgets.h"
 
 #include "../sample.xpm"
 #include "widgets.h"
 
 #include "../sample.xpm"


@@ -86,7 +90,14 @@ enum
     Widgets_BusyCursor,
 
     Widgets_GoToPage,
     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] = {
 };
 
 const wxChar *WidgetsCategories[MAX_PAGES] = {


@@ -152,6 +163,15 @@ protected:
 
     void OnToggleGlobalBusyCursor(wxCommandEvent& event);
     void OnToggleBusyCursor(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
 #endif // wxUSE_MENUS
 
     // initialize the book: add all pages to it


@@ -205,7 +225,7 @@ public:
 
 private:
     // implement sink functions
 
 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
     {
         // don't put trace messages into listbox or we can get into infinite
         // recursion


@@ -214,20 +234,20 @@ private:
             if ( m_logOld )
             {
                 // cast is needed to call protected method
             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
         {
             }
         }
         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);
     {
         wxString msg;
         TimeStamp(&msg);

-        msg += szString;
+        msg += str;

 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);
 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);


@@ -284,6 +304,13 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
     EVT_MENU(Widgets_GlobalBusyCursor,  WidgetsFrame::OnToggleGlobalBusyCursor)
     EVT_MENU(Widgets_BusyCursor,        WidgetsFrame::OnToggleBusyCursor)
 
     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()
     EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
 #endif // wxUSE_MENUS
 END_EVENT_TABLE()


@@ -301,6 +328,8 @@ bool WidgetsApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
     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;
     // 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;


@@ -316,6 +345,10 @@ bool WidgetsApp::OnInit()
     title += _T("wxMAC");
 #elif defined(__WXMOTIF__)
     title += _T("wxMOTIF");
     title += _T("wxMAC");
 #elif defined(__WXMOTIF__)
     title += _T("wxMOTIF");

+#elif __WXPALMOS5__
+    title += _T("wxPALMOS5");
+#elif __WXPALMOS6__
+    title += _T("wxPALMOS6");

 #else
     title += _T("wxWidgets");
 #endif
 #else
     title += _T("wxWidgets");
 #endif


@@ -323,10 +356,6 @@ bool WidgetsApp::OnInit()
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
     frame->Show();
 
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
     frame->Show();
 

-    //wxLog::AddTraceMask(_T("listbox"));
-    //wxLog::AddTraceMask(_T("scrollbar"));
-    //wxLog::AddTraceMask(_T("focus"));
-

     return true;
 }
 
     return true;
 }
 


@@ -337,15 +366,18 @@ bool WidgetsApp::OnInit()
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title)
 {
 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
     // 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
 #endif // USE_LOG

-    m_book = (WidgetsBookCtrl *)NULL;
+    m_book = NULL;

 
 #if wxUSE_MENUS
     // create the menubar
 
 #if wxUSE_MENUS
     // create the menubar


@@ -379,6 +411,17 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     menuWidget->AppendSeparator();
     menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));
     mbar->Append(menuWidget, _T("&Widget"));
     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);
     SetMenuBar(mbar);
 
     mbar->Check(Widgets_Enable, true);


@@ -396,13 +439,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     // Uncomment to suppress page theme (draw in solid colour)
     //style |= wxNB_NOPAGETHEME;
 
     // 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__
     InitBook();
 
 #ifndef __WXHANDHELD__


@@ -443,8 +483,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
     m_panel->SetSizer(sizerTop);
 
 
     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
 
 #if USE_LOG && !defined(__WXCOCOA__)
     // wxCocoa's listbox is too flakey to use for logging right now


@@ -458,9 +500,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 void WidgetsFrame::InitBook()
 {
 #if USE_ICONS_IN_BOOK
 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
 #else
     wxImageList *imageList = NULL;
 #endif


@@ -574,10 +617,13 @@ void WidgetsFrame::InitBook()
              wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
              wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
 
              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
 #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();
 
     // but ensure that the top of the tree is shown nevertheless
     wxTreeCtrl * const tree = m_book->GetTreeCtrl();


@@ -585,10 +631,13 @@ void WidgetsFrame::InitBook()
     wxTreeItemIdValue cookie;
     tree->EnsureVisible(tree->GetFirstChild(tree->GetRootItem(), cookie));
 #else
     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
 }
 
 #endif // USE_TREEBOOK
 }
 


@@ -637,6 +686,8 @@ void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event)
     // don't allow selection of entries without pages (categories)
     if ( !m_book->GetPage(event.GetSelection()) )
         event.Veto();
     // don't allow selection of entries without pages (categories)
     if ( !m_book->GetPage(event.GetSelection()) )
         event.Veto();

+#else
+    wxUnusedVar(event);

 #endif
 }
 
 #endif
 }
 


@@ -651,12 +702,16 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
 
     GetMenuBar()->Check(Widgets_BusyCursor, false);
 
 
     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();
     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 )
         WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl);
         wxSize size;
         for ( size_t i = 0; i < book->GetPageCount(); ++i )


@@ -803,6 +858,8 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {
     CurrentPage()->GetWidget()->Enable(event.IsChecked());
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {
     CurrentPage()->GetWidget()->Enable(event.IsChecked());

+    if (CurrentPage()->GetWidget2())
+        CurrentPage()->GetWidget2()->Enable(event.IsChecked());

 }
 
 void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
 }
 
 void WidgetsFrame::OnSetBorder(wxCommandEvent& event)


@@ -847,6 +904,50 @@ void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
                                                 : wxSTANDARD_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
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_MENUS
 
 // ----------------------------------------------------------------------------


@@ -915,7 +1016,7 @@ WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
 
 WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                          wxImageList *imaglist,
 
 WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                          wxImageList *imaglist,

-                         char* icon[])
+                         const char *const icon[])

            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |


@@ -923,7 +1024,7 @@ WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                      wxTAB_TRAVERSAL)
 {
 #if USE_ICONS_IN_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);
 #else
     wxUnusedVar(imaglist);
     wxUnusedVar(icon);