Fix for Bug 1097510, reset m_selectionOld when the value changes

[wxWidgets.git] / samples / notebook / notebook.h

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 28cf666261f766796bc39e4d3fc2cee8725a111c..1eac27735da8fed2e8e2d536b1592e459464d00e 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -48,13 +48,19 @@ public:
     void OnDeleteLastPage(wxCommandEvent& event);
     void OnNextPage(wxCommandEvent& event);
 
     void OnDeleteLastPage(wxCommandEvent& event);
     void OnNextPage(wxCommandEvent& event);
 

+#if wxUSE_NOTEBOOK

     void OnNotebook(wxNotebookEvent& event);
     void OnNotebook(wxNotebookEvent& event);

+#endif
+#if wxUSE_CHOICEBOOK

     void OnChoicebook(wxChoicebookEvent& event);
     void OnChoicebook(wxChoicebookEvent& event);

+#endif
+#if wxUSE_LISTBOOK

     void OnListbook(wxListbookEvent& event);
     void OnListbook(wxListbookEvent& event);

+#endif

 
     void OnIdle(wxIdleEvent& event);
 
 
     void OnIdle(wxIdleEvent& event);
 

-    wxBookCtrl *GetCurrentBook();
+    wxBookCtrlBase *GetCurrentBook();

 
 private:
     wxLog *m_logTargetOld;
 
 private:
     wxLog *m_logTargetOld;


@@ -73,9 +79,15 @@ private:
 
     wxPanel *m_panel; // Panel containing notebook and other controls
 
 
     wxPanel *m_panel; // Panel containing notebook and other controls
 

+#if wxUSE_NOTEBOOK

     wxNotebook   *m_notebook;
     wxNotebook   *m_notebook;

+#endif
+#if wxUSE_CHOICEBOOK

     wxChoicebook *m_choicebook;
     wxChoicebook *m_choicebook;

+#endif
+#if wxUSE_LISTBOOK

     wxListbook   *m_listbook;
     wxListbook   *m_listbook;

+#endif

 
 #if USE_LOG
     // Log window
 
 #if USE_LOG
     // Log window