redirect to the page only the help events coming from this control itself to avoid...

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

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 4365d243e499dcf3f15c395e1f15f4d7ba9769da..25d11d88b78c520ca9992691996f51edcdde8426 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Program:     wxWidgets Widgets Sample
 /////////////////////////////////////////////////////////////////////////////
 // Program:     wxWidgets Widgets Sample

-// Name:        widgets.cpp
+// Name:        samples/widgets/widgets.cpp

 // Purpose:     Sample showing most of the simple wxWidgets widgets
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Purpose:     Sample showing most of the simple wxWidgets widgets
 // Author:      Vadim Zeitlin
 // Created:     27.03.01


@@ -37,17 +37,23 @@
     #include "wx/statbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/statbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #include "wx/sysopt.h"
 #include "wx/bookctrl.h"
 #endif
 
 #include "wx/sysopt.h"
 #include "wx/bookctrl.h"

+#include "wx/treebook.h"

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

+#include "wx/imaglist.h"
+#include "wx/wupdlock.h"

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

+#include "../sample.xpm"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -57,13 +63,42 @@ enum
 {
     Widgets_ClearLog = 100,
     Widgets_Quit,
 {
     Widgets_ClearLog = 100,
     Widgets_Quit,

+
+    Widgets_BookCtrl,
+

 #if wxUSE_TOOLTIPS
     Widgets_SetTooltip,
 #endif // wxUSE_TOOLTIPS
     Widgets_SetFgColour,
     Widgets_SetBgColour,
     Widgets_SetFont,
 #if wxUSE_TOOLTIPS
     Widgets_SetTooltip,
 #endif // wxUSE_TOOLTIPS
     Widgets_SetFgColour,
     Widgets_SetBgColour,
     Widgets_SetFont,

-    Widgets_Enable
+    Widgets_Enable,
+
+    Widgets_BorderNone,
+    Widgets_BorderStatic,
+    Widgets_BorderSimple,
+    Widgets_BorderRaised,
+    Widgets_BorderSunken,
+    Widgets_BorderDouble,
+    Widgets_BorderDefault,
+
+    Widgets_GoToPage,
+    Widgets_GoToPageLast = Widgets_GoToPage + 100
+};
+
+const wxChar *WidgetsCategories[MAX_PAGES] = {
+#if defined(__WXUNIVERSAL__)
+    wxT("Universal"),
+#else
+    wxT("Native"),
+#endif
+    wxT("Generic"),
+    wxT("Pickers"),
+    wxT("Comboboxes"),
+    wxT("With items"),
+    wxT("Editable"),
+    wxT("Books"),
+    wxT("All controls")

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


@@ -99,6 +134,9 @@ protected:
     void OnExit(wxCommandEvent& event);
 
 #if wxUSE_MENUS
     void OnExit(wxCommandEvent& event);
 
 #if wxUSE_MENUS

+    void OnPageChanged(WidgetsBookCtrlEvent& event);
+    void OnGoToPage(wxCommandEvent& event);
+

 #if wxUSE_TOOLTIPS
     void OnSetTooltip(wxCommandEvent& event);
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     void OnSetTooltip(wxCommandEvent& event);
 #endif // wxUSE_TOOLTIPS


@@ -106,11 +144,15 @@ protected:
     void OnSetBgCol(wxCommandEvent& event);
     void OnSetFont(wxCommandEvent& event);
     void OnEnable(wxCommandEvent& event);
     void OnSetBgCol(wxCommandEvent& event);
     void OnSetFont(wxCommandEvent& event);
     void OnEnable(wxCommandEvent& event);

+    void OnSetBorder(wxCommandEvent& event);

 #endif // wxUSE_MENUS
 
     // initialize the book: add all pages to it
     void InitBook();
 
 #endif // wxUSE_MENUS
 
     // initialize the book: add all pages to it
     void InitBook();
 

+    // finding current page assuming book inside book
+    WidgetsPage *CurrentPage();
+

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


@@ -124,10 +166,7 @@ private:
 #endif // USE_LOG
 
     // the book containing the test pages
 #endif // USE_LOG
 
     // the book containing the test pages

-    wxBookCtrl *m_book;
-
-    // and the image list for it
-    wxImageList *m_imaglist;
+    WidgetsBookCtrl *m_book;

 
 #if wxUSE_MENUS
     // last chosen fg/bg colours and font
 
 #if wxUSE_MENUS
     // last chosen fg/bg colours and font


@@ -222,12 +261,21 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
     EVT_MENU(Widgets_SetTooltip, WidgetsFrame::OnSetTooltip)
 #endif // wxUSE_TOOLTIPS
 
     EVT_MENU(Widgets_SetTooltip, WidgetsFrame::OnSetTooltip)
 #endif // wxUSE_TOOLTIPS
 

+#if wxUSE_MENUS
+    EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged)
+    EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast,
+                   WidgetsFrame::OnGoToPage)
+

     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(Widgets_SetFgColour, WidgetsFrame::OnSetFgCol)
     EVT_MENU(Widgets_SetBgColour, WidgetsFrame::OnSetBgCol)
     EVT_MENU(Widgets_SetFont,     WidgetsFrame::OnSetFont)
     EVT_MENU(Widgets_Enable,      WidgetsFrame::OnEnable)
 

+    EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault,
+                   WidgetsFrame::OnSetBorder)
+

     EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
     EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)

+#endif // wxUSE_MENUS

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


@@ -278,19 +326,21 @@ bool WidgetsApp::OnInit()
 
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title,
 
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title,

-                      wxPoint(0, 50), wxDefaultSize,
+                      wxDefaultPosition, wxDefaultSize,

                       wxDEFAULT_FRAME_STYLE |
                       wxNO_FULL_REPAINT_ON_RESIZE |
                       wxCLIP_CHILDREN |
                       wxTAB_TRAVERSAL)
 {
                       wxDEFAULT_FRAME_STYLE |
                       wxNO_FULL_REPAINT_ON_RESIZE |
                       wxCLIP_CHILDREN |
                       wxTAB_TRAVERSAL)
 {

+    // set the frame icon
+    SetIcon(wxICON(sample));
+

     // init everything
 #if USE_LOG
     m_lboxLog = (wxListBox *)NULL;
     m_logTarget = (wxLog *)NULL;
 #endif // USE_LOG
     // init everything
 #if USE_LOG
     m_lboxLog = (wxListBox *)NULL;
     m_logTarget = (wxLog *)NULL;
 #endif // USE_LOG

-    m_book = (wxBookCtrl *)NULL;
-    m_imaglist = (wxImageList *)NULL;
+    m_book = (WidgetsBookCtrl *)NULL;

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


@@ -304,6 +354,17 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     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_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"));

+
+    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"));
+

     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"));


@@ -321,15 +382,20 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     // we have 2 panes: book with pages demonstrating the controls in the
     // upper one and the log window with some buttons in the lower
 
     // 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|wxBC_DEFAULT;
+    int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBK_DEFAULT;

     // 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 wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition,
-        wxDefaultSize, style);
+    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);

     InitBook();
 
     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(
     // the lower one only has the log listbox and a button to clear it
 #if USE_LOG
     wxSizer *sizerDown = new wxStaticBoxSizer(


@@ -359,11 +425,11 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     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);
 

-#else // !__SMARTPHONE__/__SMARTPHONE__
+#else // !__WXHANDHELD__/__WXHANDHELD__

 
     sizerTop->Add(m_book, 1, wxGROW | wxALL );
 
 
     sizerTop->Add(m_book, 1, wxGROW | wxALL );
 

-#endif // __SMARTPHONE__
+#endif // __WXHANDHELD__

 
     m_panel->SetSizer(sizerTop);
 
 
     m_panel->SetSizer(sizerTop);
 


@@ -381,42 +447,139 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
 void WidgetsFrame::InitBook()
 {
 
 void WidgetsFrame::InitBook()
 {

-    m_imaglist = new wxImageList(32, 32);
+#if USE_ICONS_IN_BOOK
+    wxImageList *imageList = new wxImageList(32, 32);
+
+    imageList->Add(wxBitmap(sample_xpm));
+#else
+    wxImageList *imageList = NULL;
+#endif
+
+#if !USE_TREEBOOK
+    WidgetsBookCtrl *books[MAX_PAGES];
+#endif
+
+    ArrayWidgetsPage pages[MAX_PAGES];
+    wxArrayString labels[MAX_PAGES];

 
 

-    ArrayWidgetsPage pages;
-    wxArrayString labels;
+    wxMenu *menuPages = new wxMenu;
+    unsigned int nPage = 0, nFKey = 0;
+    int cat, imageId = 1;

 
     // we need to first create all pages and only then add them to the book
     // as we need the image list first
 
     // 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 )
+    //
+    // we also construct the pages menu during this first iteration
+    for ( cat = 0; cat < MAX_PAGES; cat++ )

     {
     {

-        WidgetsPage *page = (*info->GetCtor())(m_book, m_imaglist);
-        pages.Add(page);
+#if USE_TREEBOOK
+        nPage++; // increase for parent page
+#else
+        books[cat] = new WidgetsBookCtrl(m_book,
+                                         wxID_ANY,
+                                         wxDefaultPosition,
+                                         wxDefaultSize,
+                                         wxBK_DEFAULT);
+#endif
+
+        for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
+              info;
+              info = info->GetNext() )
+        {
+            if( (info->GetCategories() & ( 1 << cat )) == 0)
+                continue;
+
+            WidgetsPage *page = (*info->GetCtor())(
+#if USE_TREEBOOK
+                                 m_book
+#else
+                                 books[cat]
+#endif
+                                 , imageList);
+            pages[cat].Add(page);
+
+            labels[cat].Add(info->GetLabel());
+            if ( cat == ALL_PAGE )
+            {
+                wxString radioLabel(info->GetLabel());
+                nFKey++;
+                if ( nFKey <= 12 )
+                {
+                    radioLabel << wxT("\tF" ) << nFKey;
+                }

 
 

-        labels.Add(info->GetLabel());
+                menuPages->AppendRadioItem(
+                            Widgets_GoToPage + nPage,
+                            radioLabel
+                           );
+#if !USE_TREEBOOK
+                // consider only for book in book architecture
+                nPage++;
+#endif
+            }

 
 

-        info = info->GetNext();
+#if USE_TREEBOOK
+            // consider only for treebook architecture (with subpages)
+            nPage++;
+#endif
+        }

     }
 
     }
 

-    m_book->SetImageList(m_imaglist);
+    GetMenuBar()->Append(menuPages, _T("&Page"));
+
+#if USE_ICONS_IN_BOOK
+    m_book->AssignImageList(imageList);
+#endif

 
 

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

     {
     {

-        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);
-*/
+#if USE_TREEBOOK
+        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
+        size_t count = pages[cat].GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+#if USE_TREEBOOK
+            m_book->AddSubPage(
+#else
+            books[cat]->AddPage(
+#endif
+                            pages[cat][n],
+                            labels[cat][n],
+                            false, // don't select
+                            imageId++
+                           );
+        }

     }
     }

+
+#if USE_TREEBOOK
+    // for treebook page #0 is empty parent page only
+    m_book->SetSelection(1);
+    m_book->SetSelection(0);
+#endif
+}
+
+WidgetsPage *WidgetsFrame::CurrentPage()
+{
+    wxWindow *page = m_book->GetCurrentPage();
+    if(!page) return NULL;
+
+#if USE_TREEBOOK
+    return wxStaticCast(page, WidgetsPage);
+#else
+    WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl);
+    if (!subBook) return NULL;
+    page = subBook->GetCurrentPage();
+    if(!page) return NULL;
+    return wxStaticCast(page, WidgetsPage);
+#endif

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


@@ -424,7 +587,6 @@ WidgetsFrame::~WidgetsFrame()
 #if USE_LOG
     delete m_logTarget;
 #endif // USE_LOG
 #if USE_LOG
     delete m_logTarget;
 #endif // USE_LOG

-    delete m_imaglist;

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


@@ -445,29 +607,71 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

+void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
+{
+    // adjust "Page" menu selection
+    wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + event.GetSelection());
+    if (item) item->Check();
+
+    // lazy creation of the pages
+    WidgetsPage* page = CurrentPage();
+    if (page && (page->GetChildren().GetCount()==0))
+    {
+        wxWindowUpdateLocker noUpdates(page);
+        page->CreateContent();
+        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();
+}
+
+void WidgetsFrame::OnGoToPage(wxCommandEvent& event)
+{
+#if USE_TREEBOOK
+    m_book->SetSelection(event.GetId() - Widgets_GoToPage);
+#else
+    m_book->SetSelection(m_book->GetPageCount()-1);
+    WidgetsBookCtrl *book = wxStaticCast(m_book->GetCurrentPage(), WidgetsBookCtrl);
+    book->SetSelection(event.GetId() - Widgets_GoToPage);
+#endif
+}
+

 #if wxUSE_TOOLTIPS
 
 void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_tip = _T("This is a tooltip");
 
 #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
-                 );
+    wxTextEntryDialog dialog
+                      (
+                        this,
+                        _T("Tooltip text (may use \\n, leave empty to remove): "),
+                        _T("Widgets sample"),
+                        s_tip
+                      );

 
 

-    if ( s.empty() )
+    if ( dialog.ShowModal() != wxID_OK )

         return;
 
         return;
 

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
-    page->GetWidget()->SetToolTip(s_tip = s);
+    s_tip = dialog.GetValue();
+    s_tip.Replace(_T("\\n"), _T("\n"));
+
+    WidgetsPage *page = CurrentPage();
+    page->GetWidget()->SetToolTip(s_tip);

 
     wxControl *ctrl2 = page->GetWidget2();
     if ( ctrl2 )
 
     wxControl *ctrl2 = page->GetWidget2();
     if ( ctrl2 )

-        ctrl2->SetToolTip(s);
+        ctrl2->SetToolTip(s_tip);

 }
 
 #endif // wxUSE_TOOLTIPS
 }
 
 #endif // wxUSE_TOOLTIPS


@@ -476,7 +680,7 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_COLOURDLG
     // allow for debugging the default colour the first time this is called
 {
 #if wxUSE_COLOURDLG
     // allow for debugging the default colour the first time this is called

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    WidgetsPage *page = CurrentPage();

     if (!m_colFg.Ok())
         m_colFg = page->GetForegroundColour();
 
     if (!m_colFg.Ok())
         m_colFg = page->GetForegroundColour();
 


@@ -503,7 +707,7 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
 void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_COLOURDLG
 void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_COLOURDLG

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    WidgetsPage *page = CurrentPage();

     if ( !m_colBg.Ok() )
         m_colBg = page->GetBackgroundColour();
 
     if ( !m_colBg.Ok() )
         m_colBg = page->GetBackgroundColour();
 


@@ -530,7 +734,7 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_FONTDLG
 void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_FONTDLG

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    WidgetsPage *page = CurrentPage();

     if (!m_font.Ok())
         m_font = page->GetFont();
 
     if (!m_font.Ok())
         m_font = page->GetFont();
 


@@ -556,31 +760,55 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {
 
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+    WidgetsPage *page = CurrentPage();

     page->GetWidget()->Enable(event.IsChecked());
 }
 
     page->GetWidget()->Enable(event.IsChecked());
 }
 

+void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
+{
+    int border;
+    switch ( event.GetId() )
+    {
+        case Widgets_BorderNone:   border = wxBORDER_NONE;   break;
+        case Widgets_BorderStatic: border = wxBORDER_STATIC; break;
+        case Widgets_BorderSimple: border = wxBORDER_SIMPLE; break;
+        case Widgets_BorderRaised: border = wxBORDER_RAISED; break;
+        case Widgets_BorderSunken: border = wxBORDER_SUNKEN; break;
+        case Widgets_BorderDouble: border = wxBORDER_DOUBLE; break;
+
+        default:
+            wxFAIL_MSG( _T("unknown border style") );
+            // fall through
+
+        case Widgets_BorderDefault: border = wxBORDER_DEFAULT; break;
+    }
+
+    WidgetsPage::ms_defaultFlags &= ~wxBORDER_MASK;
+    WidgetsPage::ms_defaultFlags |= border;
+
+    WidgetsPage *page = CurrentPage();
+    page->RecreateWidget();
+}
+

 #endif // wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
 // WidgetsPageInfo
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
 // WidgetsPageInfo
 // ----------------------------------------------------------------------------
 

-WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
-
-WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
+WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label, int categories)

                : m_label(label)
                : m_label(label)

+               , m_categories(categories)

 {
     m_ctor = ctor;
 
     m_next = NULL;
 
 {
     m_ctor = ctor;
 
     m_next = NULL;
 

-    // dummy sorting: add and immediately sort on list according to label
-
-    if(WidgetsPage::ms_widgetPages)
+    // dummy sorting: add and immediately sort in the list according to label
+    if ( WidgetsPage::ms_widgetPages )

     {
         WidgetsPageInfo *node_prev = WidgetsPage::ms_widgetPages;
     {
         WidgetsPageInfo *node_prev = WidgetsPage::ms_widgetPages;

-        if(wxStrcmp(label,node_prev->GetLabel().c_str())<0)
+        if ( wxStrcmp(label, node_prev->GetLabel().c_str()) < 0 )

         {
             // add as first
             m_next = node_prev;
         {
             // add as first
             m_next = node_prev;


@@ -592,10 +820,10 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
             do
             {
                 node_next = node_prev->GetNext();
             do
             {
                 node_next = node_prev->GetNext();

-                if(node_next)
+                if ( node_next )

                 {
                     // add if between two
                 {
                     // add if between two

-                    if(wxStrcmp(label,node_next->GetLabel().c_str())<0)
+                    if ( wxStrcmp(label, node_next->GetLabel().c_str()) < 0 )

                     {
                         node_prev->SetNext(this);
                         m_next = node_next;
                     {
                         node_prev->SetNext(this);
                         m_next = node_next;


@@ -610,30 +838,39 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
                     m_next = node_next;
                 }
                 node_prev = node_next;
                     m_next = node_next;
                 }
                 node_prev = node_next;

-            }while(node_next);
+            }
+            while ( node_next );

         }
     }
     else
     {
         // add when first
         }
     }
     else
     {
         // add when first

-

         WidgetsPage::ms_widgetPages = this;
         WidgetsPage::ms_widgetPages = this;

-

     }
     }

-

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

-WidgetsPage::WidgetsPage(wxBookCtrl *book)
+int WidgetsPage::ms_defaultFlags = wxBORDER_DEFAULT;
+WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
+
+WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
+                         wxImageList *imaglist,
+                         char* icon[])

            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
                      wxCLIP_CHILDREN |
                      wxTAB_TRAVERSAL)
 {
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
                      wxCLIP_CHILDREN |
                      wxTAB_TRAVERSAL)
 {

+#if USE_ICONS_IN_BOOK
+    imaglist->Add(wxBitmap(icon));
+#else
+    wxUnusedVar(imaglist);
+    wxUnusedVar(icon);
+#endif

 }
 
 wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,
 }
 
 wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,


@@ -681,4 +918,3 @@ wxCheckBox *WidgetsPage::CreateCheckBoxAndAddToSizer(wxSizer *sizer,
 
     return checkbox;
 }
 
     return checkbox;
 }

-