Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

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

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index b676beaa1742c3acebac174f95077fa7220663f2..510cdbc6589f8a01aaf52bc97daeb95f5c02865d 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -42,13 +42,18 @@
 
 #include "wx/sysopt.h"
 #include "wx/bookctrl.h"
 
 #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
 // ----------------------------------------------------------------------------


@@ -77,10 +82,28 @@ enum
     Widgets_BorderDouble,
     Widgets_BorderDefault,
 
     Widgets_BorderDouble,
     Widgets_BorderDefault,
 

+    Widgets_GlobalBusyCursor,
+    Widgets_BusyCursor,
+

     Widgets_GoToPage,
     Widgets_GoToPageLast = Widgets_GoToPage + 100
 };
 
     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")
+};
+

 // ----------------------------------------------------------------------------
 // our classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // our classes
 // ----------------------------------------------------------------------------


@@ -114,7 +137,8 @@ protected:
     void OnExit(wxCommandEvent& event);
 
 #if wxUSE_MENUS
     void OnExit(wxCommandEvent& event);
 
 #if wxUSE_MENUS

-    void OnPageChanged(wxBookCtrlEvent& event);
+    void OnPageChanging(WidgetsBookCtrlEvent& event);
+    void OnPageChanged(WidgetsBookCtrlEvent& event);

     void OnGoToPage(wxCommandEvent& event);
 
 #if wxUSE_TOOLTIPS
     void OnGoToPage(wxCommandEvent& event);
 
 #if wxUSE_TOOLTIPS


@@ -125,11 +149,17 @@ protected:
     void OnSetFont(wxCommandEvent& event);
     void OnEnable(wxCommandEvent& event);
     void OnSetBorder(wxCommandEvent& event);
     void OnSetFont(wxCommandEvent& event);
     void OnEnable(wxCommandEvent& event);
     void OnSetBorder(wxCommandEvent& event);

+
+    void OnToggleGlobalBusyCursor(wxCommandEvent& event);
+    void OnToggleBusyCursor(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();
 

+    // return the currently selected page (never NULL)
+    WidgetsPage *CurrentPage();
+

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


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

-    wxBookCtrlBase *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


@@ -242,7 +269,7 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_MENUS
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_MENUS

-    EVT_BOOKCTRL_PAGE_CHANGED(Widgets_BookCtrl, WidgetsFrame::OnPageChanged)
+    EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging)

     EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast,
                    WidgetsFrame::OnGoToPage)
 
     EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast,
                    WidgetsFrame::OnGoToPage)
 


@@ -254,6 +281,9 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
     EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault,
                    WidgetsFrame::OnSetBorder)
 
     EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault,
                    WidgetsFrame::OnSetBorder)
 

+    EVT_MENU(Widgets_GlobalBusyCursor,  WidgetsFrame::OnToggleGlobalBusyCursor)
+    EVT_MENU(Widgets_BusyCursor,        WidgetsFrame::OnToggleBusyCursor)
+

     EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
 #endif // wxUSE_MENUS
 END_EVENT_TABLE()
     EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
 #endif // wxUSE_MENUS
 END_EVENT_TABLE()


@@ -305,20 +335,17 @@ bool WidgetsApp::OnInit()
 // ----------------------------------------------------------------------------
 
 WidgetsFrame::WidgetsFrame(const wxString& title)
 // ----------------------------------------------------------------------------
 
 WidgetsFrame::WidgetsFrame(const wxString& title)

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

 {
 {

+    // 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 = (wxBookCtrlBase *)NULL;
-    m_imaglist = (wxImageList *)NULL;
+    m_book = (WidgetsBookCtrl *)NULL;

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


@@ -343,6 +370,12 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     menuBorders->AppendRadioItem(Widgets_BorderSunken, _T("S&unken\tCtrl-Shift-5"));
     menuWidget->AppendSubMenu(menuBorders, _T("Set &border"));
 
     menuBorders->AppendRadioItem(Widgets_BorderSunken, _T("S&unken\tCtrl-Shift-5"));
     menuWidget->AppendSubMenu(menuBorders, _T("Set &border"));
 

+    menuWidget->AppendSeparator();
+    menuWidget->AppendCheckItem(Widgets_GlobalBusyCursor,
+                                _T("Toggle &global busy cursor\tCtrl-Shift-U"));
+    menuWidget->AppendCheckItem(Widgets_BusyCursor,
+                                _T("Toggle b&usy cursor\tCtrl-U"));
+

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


@@ -352,19 +385,18 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 #endif // wxUSE_MENUS
 
     // create controls
 #endif // wxUSE_MENUS
 
     // create controls

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

 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
     // we have 2 panes: book with pages demonstrating the controls in the
     // upper one and the log window with some buttons in the lower
 
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
     // 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|wxBK_DEFAULT;
+    int style = 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, Widgets_BookCtrl, wxDefaultPosition,
+    m_book = new WidgetsBookCtrl(m_panel, Widgets_BookCtrl, wxDefaultPosition,

 #ifdef __WXMOTIF__
         wxSize(500, wxDefaultCoord), // under Motif, height is a function of the width...
 #else
 #ifdef __WXMOTIF__
         wxSize(500, wxDefaultCoord), // under Motif, height is a function of the width...
 #else


@@ -373,7 +405,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
         style);
     InitBook();
 
         style);
     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(


@@ -403,11 +435,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);
 


@@ -425,49 +457,153 @@ 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);

 
 

-    ArrayWidgetsPage pages;
-    wxArrayString labels;
+    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];

 
     wxMenu *menuPages = new wxMenu;
 
     wxMenu *menuPages = new wxMenu;

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

-    for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
-          info;
-          info = info->GetNext(), nPage++ )
+    for ( cat = 0; cat < MAX_PAGES; cat++ )

     {
     {

-        WidgetsPage *page = (*info->GetCtor())(m_book, m_imaglist);
-        pages.Add(page);
-
-        labels.Add(info->GetLabel());
-        menuPages->AppendRadioItem
-                   (
-                    Widgets_GoToPage + nPage,
-                    wxString::Format(wxT("%s\tF%u"),
-                                     info->GetLabel().c_str(), nPage + 1)
-                   );
+#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;
+                }
+
+                menuPages->AppendRadioItem(
+                            Widgets_GoToPage + nPage,
+                            radioLabel
+                           );
+#if !USE_TREEBOOK
+                // consider only for book in book architecture
+                nPage++;
+#endif
+            }
+
+#if USE_TREEBOOK
+            // consider only for treebook architecture (with subpages)
+            nPage++;
+#endif
+        }

     }
 
     GetMenuBar()->Append(menuPages, _T("&Page"));
 
     }
 
     GetMenuBar()->Append(menuPages, _T("&Page"));
 

-    m_book->SetImageList(m_imaglist);
+#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
-                       );
+#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++
+                           );
+        }

     }
     }

+
+    Connect( wxID_ANY,
+             wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
+             wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
+
+#if USE_TREEBOOK
+    // for treebook page #0 is empty parent page only so select the first page
+    // with some contents
+    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);
+#endif // USE_TREEBOOK
+}
+
+WidgetsPage *WidgetsFrame::CurrentPage()
+{
+    wxWindow *page = m_book->GetCurrentPage();
+
+#if !USE_TREEBOOK
+    WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl);
+    wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") );
+
+    page = subBook->GetCurrentPage();
+#endif // !USE_TREEBOOK
+
+    return wxStaticCast(page, WidgetsPage);

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


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

-    delete m_imaglist;

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


@@ -496,15 +631,59 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

-void WidgetsFrame::OnPageChanged(wxBookCtrlEvent& event)
+void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event)
+{
+#if USE_TREEBOOK
+    // don't allow selection of entries without pages (categories)
+    if ( !m_book->GetPage(event.GetSelection()) )
+        event.Veto();
+#else
+    wxUnusedVar(event);
+#endif
+}
+
+void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)

 {
 {

-    GetMenuBar()->Check(Widgets_GoToPage + event.GetSelection(), true);
+    const int sel = event.GetSelection();
+
+    // adjust "Page" menu selection
+    wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + sel);
+    if ( item )
+        item->Check();
+
+    GetMenuBar()->Check(Widgets_BusyCursor, false);
+
+    // lazy creation of the pages
+    WidgetsPage *page = CurrentPage();
+    if ( page->GetChildren().empty() )
+    {
+        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)
 {
     event.Skip();
 }
 
 void WidgetsFrame::OnGoToPage(wxCommandEvent& event)
 {

+#if USE_TREEBOOK

     m_book->SetSelection(event.GetId() - Widgets_GoToPage);
     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
 }
 
 #if wxUSE_TOOLTIPS


@@ -513,34 +692,27 @@ void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_tip = _T("This is a tooltip");
 
 {
     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;
 

-    s_tip = s;
+    s_tip = dialog.GetValue();
+    s_tip.Replace(_T("\\n"), _T("\n"));

 
 

-    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 = CurrentPage();

 
 

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
-    page->GetWidget()->SetToolTip(s);
+    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


@@ -549,7 +721,8 @@ 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();
 


@@ -576,7 +749,8 @@ 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();
 


@@ -603,7 +777,8 @@ 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();
 


@@ -629,8 +804,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {
 
 void WidgetsFrame::OnEnable(wxCommandEvent& event)
 {

-    WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
-    page->GetWidget()->Enable(event.IsChecked());
+    CurrentPage()->GetWidget()->Enable(event.IsChecked());

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


@@ -655,18 +829,35 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
     WidgetsPage::ms_defaultFlags &= ~wxBORDER_MASK;
     WidgetsPage::ms_defaultFlags |= border;
 
     WidgetsPage::ms_defaultFlags &= ~wxBORDER_MASK;
     WidgetsPage::ms_defaultFlags |= border;
 

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

     page->RecreateWidget();
 }
 
     page->RecreateWidget();
 }
 

+void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event)
+{
+    if ( event.IsChecked() )
+        wxBeginBusyCursor();
+    else
+        wxEndBusyCursor();
+}
+
+void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
+{
+    CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked()
+                                                ? wxHOURGLASS_CURSOR
+                                                : wxSTANDARD_CURSOR));
+}
+

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

-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_ctor = ctor;
 


@@ -724,13 +915,21 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
 int WidgetsPage::ms_defaultFlags = wxBORDER_DEFAULT;
 WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
 
 int WidgetsPage::ms_defaultFlags = wxBORDER_DEFAULT;
 WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
 

-WidgetsPage::WidgetsPage(wxBookCtrlBase *book)
+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,