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 2c87c7d2f5ebe3c6dcb58af07e2791be95cd1ce4..510cdbc6589f8a01aaf52bc97daeb95f5c02865d 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -270,7 +270,6 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
 
 #if wxUSE_MENUS
     EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging)
 
 #if wxUSE_MENUS
     EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging)

-    EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged)

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


@@ -571,6 +570,10 @@ void WidgetsFrame::InitBook()
         }
     }
 
         }
     }
 

+    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
 #if USE_TREEBOOK
     // for treebook page #0 is empty parent page only so select the first page
     // with some contents


@@ -578,7 +581,14 @@ void WidgetsFrame::InitBook()
 
     // 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();

-    tree->EnsureVisible(tree->GetRootItem());
+
+    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
 }
 
 #endif // USE_TREEBOOK
 }
 


@@ -623,8 +633,13 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 
 void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& 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();
     if ( !m_book->GetPage(event.GetSelection()) )
         event.Veto();

+#else
+    wxUnusedVar(event);
+#endif

 }
 
 void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
 }
 
 void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)


@@ -636,6 +651,8 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
     if ( item )
         item->Check();
 
     if ( item )
         item->Check();
 

+    GetMenuBar()->Check(Widgets_BusyCursor, false);
+

     // lazy creation of the pages
     WidgetsPage *page = CurrentPage();
     if ( page->GetChildren().empty() )
     // lazy creation of the pages
     WidgetsPage *page = CurrentPage();
     if ( page->GetChildren().empty() )