colourSize was probably supposed to be used and not just defined and then forgot...

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

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 8f7a0588341094014b627dce23a7838758773b19..d656113dd7415095849539bb8372cf217c971e87 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        widgets.cpp
 // Name:        widgets.cpp

-// Purpose:     Sample showing most of the simple wxWindows widgets
+// Purpose:     Sample showing most of the simple wxWidgets widgets

 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$


@@ -29,16 +29,23 @@
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/menu.h"
+

     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/listbox.h"
     #include "wx/statbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/listbox.h"
     #include "wx/statbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #endif
 

-#include "wx/notebook.h"
+#include "wx/sysopt.h"
+#include "wx/bookctrl.h"

 #include "wx/sizer.h"
 #include "wx/sizer.h"

+#include "wx/colordlg.h"
+#include "wx/fontdlg.h"
+#include "wx/textdlg.h"

 
 #include "widgets.h"
 
 
 #include "widgets.h"
 


@@ -50,7 +57,14 @@
 enum
 {
     Widgets_ClearLog = 100,
 enum
 {
     Widgets_ClearLog = 100,

-    Widgets_Quit
+    Widgets_Quit,
+#if wxUSE_TOOLTIPS
+    Widgets_SetTooltip,
+#endif // wxUSE_TOOLTIPS
+    Widgets_SetFgColour,
+    Widgets_SetBgColour,
+    Widgets_SetFont,
+    Widgets_Enable

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -80,32 +94,54 @@ public:
 
 protected:
     // event handlers
 
 protected:
     // event handlers

+#if USE_LOG

     void OnButtonClearLog(wxCommandEvent& event);
     void OnButtonClearLog(wxCommandEvent& event);

-    void OnButtonQuit(wxCommandEvent& event);
-
-    // initialize the notebook: add all pages to it
-    void InitNotebook();
+#endif // USE_LOG
+    void OnExit(wxCommandEvent& event);
+
+#if wxUSE_MENUS
+#if wxUSE_TOOLTIPS
+    void OnSetTooltip(wxCommandEvent& event);
+#endif // wxUSE_TOOLTIPS
+    void OnSetFgCol(wxCommandEvent& event);
+    void OnSetBgCol(wxCommandEvent& event);
+    void OnSetFont(wxCommandEvent& event);
+    void OnEnable(wxCommandEvent& event);
+#endif // wxUSE_MENUS
+
+    // initialize the book: add all pages to it
+    void InitBook();

 
 private:
     // the panel containing everything
     wxPanel *m_panel;
 
 
 private:
     // the panel containing everything
     wxPanel *m_panel;
 

+#if USE_LOG

     // the listbox for logging messages
     wxListBox *m_lboxLog;
 
     // the log target we use to redirect messages to the listbox
     wxLog *m_logTarget;
     // the listbox for logging messages
     wxListBox *m_lboxLog;
 
     // the log target we use to redirect messages to the listbox
     wxLog *m_logTarget;

+#endif // USE_LOG

 
 

-    // the notebook containing the test pages
-    wxNotebook *m_notebook;
+    // the book containing the test pages
+    wxBookCtrlBase *m_book;

 
     // and the image list for it
     wxImageList *m_imaglist;
 
 
     // and the image list for it
     wxImageList *m_imaglist;
 

-    // any class wishing to process wxWindows events must use this macro
+#if wxUSE_MENUS
+    // last chosen fg/bg colours and font
+    wxColour m_colFg,
+             m_colBg;
+    wxFont   m_font;
+#endif // wxUSE_MENUS
+
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#if USE_LOG

 // A log target which just redirects the messages to a listbox
 class LboxLogger : public wxLog
 {
 // A log target which just redirects the messages to a listbox
 class LboxLogger : public wxLog
 {


@@ -142,7 +178,7 @@ private:
         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t t)
+    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);


@@ -162,9 +198,10 @@ private:
     // the old log target
     wxLog *m_logOld;
 };
     // the old log target
     wxLog *m_logOld;
 };

+#endif // USE_LOG

 
 // array of pages
 
 // array of pages

-WX_DEFINE_ARRAY(WidgetsPage *, ArrayWidgetsPage);
+WX_DEFINE_ARRAY_PTR(WidgetsPage *, ArrayWidgetsPage);

 
 // ----------------------------------------------------------------------------
 // misc macros
 
 // ----------------------------------------------------------------------------
 // misc macros


@@ -177,8 +214,21 @@ IMPLEMENT_APP(WidgetsApp)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)

+#if USE_LOG

     EVT_BUTTON(Widgets_ClearLog, WidgetsFrame::OnButtonClearLog)
     EVT_BUTTON(Widgets_ClearLog, WidgetsFrame::OnButtonClearLog)

-    EVT_BUTTON(Widgets_Quit, WidgetsFrame::OnButtonQuit)
+#endif // USE_LOG
+    EVT_BUTTON(Widgets_Quit, WidgetsFrame::OnExit)
+
+#if wxUSE_TOOLTIPS
+    EVT_MENU(Widgets_SetTooltip, WidgetsFrame::OnSetTooltip)
+#endif // wxUSE_TOOLTIPS
+
+    EVT_MENU(Widgets_SetFgColour, WidgetsFrame::OnSetFgCol)
+    EVT_MENU(Widgets_SetBgColour, WidgetsFrame::OnSetBgCol)
+    EVT_MENU(Widgets_SetFont,     WidgetsFrame::OnSetFont)
+    EVT_MENU(Widgets_Enable,      WidgetsFrame::OnEnable)
+
+    EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -192,7 +242,7 @@ END_EVENT_TABLE()
 bool WidgetsApp::OnInit()
 {
     if ( !wxApp::OnInit() )
 bool WidgetsApp::OnInit()
 {
     if ( !wxApp::OnInit() )

-        return FALSE;
+        return false;

 
     // 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
 
     // 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


@@ -205,8 +255,12 @@ bool WidgetsApp::OnInit()
     title += _T("wxMSW");
 #elif defined(__WXGTK__)
     title += _T("wxGTK");
     title += _T("wxMSW");
 #elif defined(__WXGTK__)
     title += _T("wxGTK");

+#elif defined(__WXMAC__)
+    title += _T("wxMAC");
+#elif defined(__WXMOTIF__)
+    title += _T("wxMOTIF");

 #else
 #else

-    title += _T("wxWindows");
+    title += _T("wxWidgets");

 #endif
 
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
 #endif
 
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));


@@ -214,8 +268,9 @@ bool WidgetsApp::OnInit()
 
     //wxLog::AddTraceMask(_T("listbox"));
     //wxLog::AddTraceMask(_T("scrollbar"));
 
     //wxLog::AddTraceMask(_T("listbox"));
     //wxLog::AddTraceMask(_T("scrollbar"));

+    //wxLog::AddTraceMask(_T("focus"));

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -223,72 +278,126 @@ bool WidgetsApp::OnInit()
 // ----------------------------------------------------------------------------
 
 WidgetsFrame::WidgetsFrame(const wxString& title)
 // ----------------------------------------------------------------------------
 
 WidgetsFrame::WidgetsFrame(const wxString& title)

-            : wxFrame(NULL, -1, title, wxPoint(0, 50))
+            : wxFrame(NULL, wxID_ANY, title,
+                      wxPoint(0, 50), wxDefaultSize,
+                      wxDEFAULT_FRAME_STYLE |
+                      wxNO_FULL_REPAINT_ON_RESIZE |
+                      wxCLIP_CHILDREN |
+                      wxTAB_TRAVERSAL)

 {
     // init everything
 {
     // init everything

+#if USE_LOG

     m_lboxLog = (wxListBox *)NULL;
     m_logTarget = (wxLog *)NULL;
     m_lboxLog = (wxListBox *)NULL;
     m_logTarget = (wxLog *)NULL;

-    m_notebook = (wxNotebook *)NULL;
+#endif // USE_LOG
+    m_book = (wxBookCtrlBase *)NULL;

     m_imaglist = (wxImageList *)NULL;
 
     m_imaglist = (wxImageList *)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->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->AppendSeparator();
+    menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));
+    mbar->Append(menuWidget, _T("&Widget"));
+    SetMenuBar(mbar);
+
+    mbar->Check(Widgets_Enable, true);
+#endif // wxUSE_MENUS
+

     // create controls
     // create controls

-    m_panel = new wxPanel(this, -1);
+    m_panel = new wxPanel(this, wxID_ANY,
+        wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);

 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 

-    // we have 2 panes: notebook which pages demonstrating the controls in the
+    // we have 2 panes: book with pages demonstrating the controls in the

     // upper one and the log window with some buttons in the lower
 
     // upper one and the log window with some buttons in the lower
 

-    m_notebook = new wxNotebook(m_panel, -1);
-    InitNotebook();
-    wxSizer *sizerUp = new wxNotebookSizer(m_notebook);
+    int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBC_DEFAULT;
+    // Uncomment to suppress page theme (draw in solid colour)
+    //style |= wxNB_NOPAGETHEME;
+
+    m_book = new wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition,
+#ifdef __WXMOTIF__
+        wxSize(500, -1), // under Motif, height is a function of the width...
+#else
+        wxDefaultSize,
+#endif
+        style);
+    InitBook();

 
 

+#ifndef __SMARTPHONE__

     // the lower one only has the log listbox and a button to clear it
     // the lower one only has the log listbox and a button to clear it

-    wxSizer *sizerDown = new wxStaticBoxSizer
-                             (
-                               new wxStaticBox(m_panel, -1, _T("&Log window")),
-                               wxVERTICAL
-                             );
-    m_lboxLog = new wxListBox(m_panel, -1);
+#if USE_LOG
+    wxSizer *sizerDown = new wxStaticBoxSizer(
+        new wxStaticBox( m_panel, wxID_ANY, _T("&Log window") ),
+        wxVERTICAL);
+
+    m_lboxLog = new wxListBox(m_panel, wxID_ANY);

     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);

+    sizerDown->SetMinSize(100, 150);
+#else
+    wxSizer *sizerDown = new wxBoxSizer(wxVERTICAL);
+#endif // USE_LOG
+

     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);

-    wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));
+    wxButton *btn;
+#if USE_LOG
+    btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));

     sizerBtns->Add(btn);
     sizerBtns->Add(10, 0); // spacer
     sizerBtns->Add(btn);
     sizerBtns->Add(10, 0); // spacer

+#endif // USE_LOG

     btn = new wxButton(m_panel, Widgets_Quit, _T("E&xit"));
     sizerBtns->Add(btn);
     sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5);
 
     // put everything together
     btn = new wxButton(m_panel, Widgets_Quit, _T("E&xit"));
     sizerBtns->Add(btn);
     sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5);
 
     // put everything together

-    sizerTop->Add(sizerUp, 1, wxGROW | (wxALL & ~(wxTOP | wxBOTTOM)), 10);
+    sizerTop->Add(m_book, 1, wxGROW | (wxALL & ~(wxTOP | wxBOTTOM)), 10);

     sizerTop->Add(0, 5, 0, wxGROW); // spacer in between
     sizerTop->Add(sizerDown, 0,  wxGROW | (wxALL & ~wxTOP), 10);
 
     sizerTop->Add(0, 5, 0, wxGROW); // spacer in between
     sizerTop->Add(sizerDown, 0,  wxGROW | (wxALL & ~wxTOP), 10);
 

-    m_panel->SetAutoLayout(TRUE);
+#else // !__SMARTPHONE__/__SMARTPHONE__
+
+    sizerTop->Add(m_book, 1, wxGROW | wxALL );
+
+#endif // __SMARTPHONE__
+

     m_panel->SetSizer(sizerTop);
 
     sizerTop->Fit(this);
     sizerTop->SetSizeHints(this);
 
     m_panel->SetSizer(sizerTop);
 
     sizerTop->Fit(this);
     sizerTop->SetSizeHints(this);
 

+#if USE_LOG && !defined(__WXCOCOA__)
+    // wxCocoa's listbox is too flakey to use for logging right now

     // now that everything is created we can redirect the log messages to the
     // listbox
     m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget());
     wxLog::SetActiveTarget(m_logTarget);
     // now that everything is created we can redirect the log messages to the
     // listbox
     m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget());
     wxLog::SetActiveTarget(m_logTarget);

+#endif

 }
 
 }
 

-void WidgetsFrame::InitNotebook()
+void WidgetsFrame::InitBook()

 {
     m_imaglist = new wxImageList(32, 32);
 
     ArrayWidgetsPage pages;
     wxArrayString labels;
 
 {
     m_imaglist = new wxImageList(32, 32);
 
     ArrayWidgetsPage pages;
     wxArrayString labels;
 

-    // we need to first create all pages and only then add them to the notebook
+    // we need to first create all pages and only then add them to the book

     // as we need the image list first
     WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
     while ( info )
     {
     // as we need the image list first
     WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
     while ( info )
     {

-        WidgetsPage *page = (*info->GetCtor())(m_notebook, m_imaglist);
+        WidgetsPage *page = (*info->GetCtor())(m_book, m_imaglist);

         pages.Add(page);
 
         labels.Add(info->GetLabel());
         pages.Add(page);
 
         labels.Add(info->GetLabel());


@@ -296,24 +405,31 @@ void WidgetsFrame::InitNotebook()
         info = info->GetNext();
     }
 
         info = info->GetNext();
     }
 

-    m_notebook->SetImageList(m_imaglist);
+    m_book->SetImageList(m_imaglist);

 
     // now do add them
     size_t count = pages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
 
     // now do add them
     size_t count = pages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_notebook->AddPage(
-                            pages[n],
-                            labels[n],
-                            FALSE, // don't select
-                            n // image id
-                           );
+        m_book->AddPage(
+                        pages[n],
+                        labels[n],
+                        false, // don't select
+                        n // image id
+                       );
+
+/*
+        wxColour colour = m_book->MSWGetBgColourForChild(pages[n]);
+        pages[n]->SetBackgroundColour(colour);
+*/

     }
 }
 
 WidgetsFrame::~WidgetsFrame()
 {
     }
 }
 
 WidgetsFrame::~WidgetsFrame()
 {

+#if USE_LOG

     delete m_logTarget;
     delete m_logTarget;

+#endif // USE_LOG

     delete m_imaglist;
 }
 
     delete m_imaglist;
 }
 


@@ -321,15 +437,147 @@ WidgetsFrame::~WidgetsFrame()
 // WidgetsFrame event handlers
 // ----------------------------------------------------------------------------
 
 // WidgetsFrame event handlers
 // ----------------------------------------------------------------------------
 

-void WidgetsFrame::OnButtonQuit(wxCommandEvent& WXUNUSED(event))
+void WidgetsFrame::OnExit(wxCommandEvent& WXUNUSED(event))

 {
     Close();
 }
 
 {
     Close();
 }
 

-void WidgetsFrame::OnButtonClearLog(wxCommandEvent& event)
+#if USE_LOG
+void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))

 {
     m_lboxLog->Clear();
 }
 {
     m_lboxLog->Clear();
 }

+#endif // USE_LOG
+
+#if wxUSE_MENUS
+
+#if wxUSE_TOOLTIPS
+
+void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
+{
+    static wxString s_tip = _T("This is a tooltip");
+
+    wxString s = wxGetTextFromUser
+                 (
+                    _T("Tooltip text: "),
+                    _T("Widgets sample"),
+                    s_tip,
+                    this
+                 );
+
+    if ( s.empty() )
+        return;
+
+    s_tip = s;
+
+    if( wxMessageBox( _T("Test multiline tooltip text?"),
+                      _T("Widgets sample"),
+                      wxYES_NO,
+                      this
+                    ) == wxYES )
+    {
+        s = _T("#1 ") + s_tip + _T("\n") + _T("#2 ") + s_tip;
+    }
+
+    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    page->GetWidget()->SetToolTip(s);
+
+    wxControl *ctrl2 = page->GetWidget2();
+    if ( ctrl2 )
+        ctrl2->SetToolTip(s);
+}
+
+#endif // wxUSE_TOOLTIPS
+
+void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_COLOURDLG
+    // allow for debugging the default colour the first time this is called
+    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    if (!m_colFg.Ok())
+        m_colFg = page->GetForegroundColour();
+
+    wxColour col = wxGetColourFromUser(this, m_colFg);
+    if ( !col.Ok() )
+        return;
+
+    m_colFg = col;
+
+    page->GetWidget()->SetForegroundColour(m_colFg);
+    page->GetWidget()->Refresh();
+
+    wxControl *ctrl2 = page->GetWidget2();
+    if ( ctrl2 )
+    {
+        ctrl2->SetForegroundColour(m_colFg);
+        ctrl2->Refresh();
+    }
+#else
+    wxLogMessage(_T("Colour selection dialog not available in current build."));
+#endif
+}
+
+void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_COLOURDLG
+    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    if ( !m_colBg.Ok() )
+        m_colBg = page->GetBackgroundColour();
+
+    wxColour col = wxGetColourFromUser(this, m_colBg);
+    if ( !col.Ok() )
+        return;
+
+    m_colBg = col;
+
+    page->GetWidget()->SetBackgroundColour(m_colBg);
+    page->GetWidget()->Refresh();
+
+    wxControl *ctrl2 = page->GetWidget2();
+    if ( ctrl2 )
+    {
+        ctrl2->SetBackgroundColour(m_colFg);
+        ctrl2->Refresh();
+    }
+#else
+    wxLogMessage(_T("Colour selection dialog not available in current build."));
+#endif
+}
+
+void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_FONTDLG
+    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    if (!m_font.Ok())
+        m_font = page->GetFont();
+
+    wxFont font = wxGetFontFromUser(this, m_font);
+    if ( !font.Ok() )
+        return;
+
+    m_font = font;
+
+    page->GetWidget()->SetFont(m_font);
+    page->GetWidget()->Refresh();
+
+    wxControl *ctrl2 = page->GetWidget2();
+    if ( ctrl2 )
+    {
+        ctrl2->SetFont(m_font);
+        ctrl2->Refresh();
+    }
+#else
+    wxLogMessage(_T("Font selection dialog not available in current build."));
+#endif
+}
+
+void WidgetsFrame::OnEnable(wxCommandEvent& event)
+{
+    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    page->GetWidget()->Enable(event.IsChecked());
+}
+
+#endif // wxUSE_MENUS

 
 // ----------------------------------------------------------------------------
 // WidgetsPageInfo
 
 // ----------------------------------------------------------------------------
 // WidgetsPageInfo


@@ -342,16 +590,66 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
 {
     m_ctor = ctor;
 
 {
     m_ctor = ctor;
 

-    m_next = WidgetsPage::ms_widgetPages;
-    WidgetsPage::ms_widgetPages = this;
+    m_next = NULL;
+
+    // dummy sorting: add and immediately sort on list according to label
+
+    if(WidgetsPage::ms_widgetPages)
+    {
+        WidgetsPageInfo *node_prev = WidgetsPage::ms_widgetPages;
+        if(wxStrcmp(label,node_prev->GetLabel().c_str())<0)
+        {
+            // add as first
+            m_next = node_prev;
+            WidgetsPage::ms_widgetPages = this;
+        }
+        else
+        {
+            WidgetsPageInfo *node_next;
+            do
+            {
+                node_next = node_prev->GetNext();
+                if(node_next)
+                {
+                    // add if between two
+                    if(wxStrcmp(label,node_next->GetLabel().c_str())<0)
+                    {
+                        node_prev->SetNext(this);
+                        m_next = node_next;
+                        // force to break loop
+                        node_next = NULL;
+                    }
+                }
+                else
+                {
+                    // add as last
+                    node_prev->SetNext(this);
+                    m_next = node_next;
+                }
+                node_prev = node_next;
+            }while(node_next);
+        }
+    }
+    else
+    {
+        // add when first
+
+        WidgetsPage::ms_widgetPages = this;
+
+    }
+

 }
 
 // ----------------------------------------------------------------------------
 // WidgetsPage
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // WidgetsPage
 // ----------------------------------------------------------------------------
 

-WidgetsPage::WidgetsPage(wxNotebook *notebook)
-           : wxPanel(notebook, -1)
+WidgetsPage::WidgetsPage(wxBookCtrlBase *book)
+           : wxPanel(book, wxID_ANY,
+                     wxDefaultPosition, wxDefaultSize,
+                     wxNO_FULL_REPAINT_ON_RESIZE |
+                     wxCLIP_CHILDREN |
+                     wxTAB_TRAVERSAL)

 {
 }
 
 {
 }
 


@@ -360,7 +658,9 @@ wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,
                                           wxTextCtrl **ppText)
 {
     wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
                                           wxTextCtrl **ppText)
 {
     wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);

-    wxTextCtrl *text = new wxTextCtrl(this, id, _T(""));
+    wxTextCtrl *text = new wxTextCtrl(this, id, wxEmptyString,
+        wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+

     sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5);
     sizerRow->Add(text, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
 
     sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5);
     sizerRow->Add(text, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
 


@@ -375,7 +675,8 @@ wxSizer *WidgetsPage::CreateSizerWithTextAndLabel(const wxString& label,
                                                   wxWindowID id,
                                                   wxTextCtrl **ppText)
 {
                                                   wxWindowID id,
                                                   wxTextCtrl **ppText)
 {

-    return CreateSizerWithText(new wxStaticText(this, -1, label), id, ppText);
+    return CreateSizerWithText(new wxStaticText(this, wxID_ANY, label),
+        id, ppText);

 }
 
 // create a sizer containing a button and a text ctrl
 }
 
 // create a sizer containing a button and a text ctrl