From: Włodzimierz Skiba Date: Mon, 24 Apr 2006 16:59:17 +0000 (+0000) Subject: wxUSE_NOTEBOOK usage. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bc5a5239598c14d94d9a39e48481e09a41a6fb5e wxUSE_NOTEBOOK usage. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index b7891ecc37..8eab2fc19d 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" #ifndef WX_PRECOMP @@ -75,16 +77,16 @@ class WXDLLEXPORT wxNotebookTabView: public wxTabView { DECLARE_DYNAMIC_CLASS(wxNotebookTabView) public: - wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - ~wxNotebookTabView(void); + wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); + ~wxNotebookTabView(void); - // Called when a tab is activated - virtual void OnTabActivate(int activateId, int deactivateId); - // Allows vetoing - virtual bool OnTabPreActivate(int activateId, int deactivateId); + // Called when a tab is activated + virtual void OnTabActivate(int activateId, int deactivateId); + // Allows vetoing + virtual bool OnTabPreActivate(int activateId, int deactivateId); protected: - wxNotebook* m_notebook; + wxNotebook* m_notebook; }; // ---------------------------------------------------------------------------- @@ -264,17 +266,17 @@ bool wxNotebook::DeletePage(size_t nPage) if (m_pages.GetCount() == 0) { - m_nSelection = -1; - m_tabView->SetTabSelection(-1, false); + m_nSelection = -1; + m_tabView->SetTabSelection(-1, false); } else if (m_nSelection > -1) { - m_nSelection = -1; + m_nSelection = -1; - m_tabView->SetTabSelection((int) (long) GetPage(0), false); + m_tabView->SetTabSelection((int) (long) GetPage(0), false); - if (m_nSelection != 0) - ChangePage(-1, 0); + if (m_nSelection != 0) + ChangePage(-1, 0); } RefreshLayout(false); @@ -713,3 +715,5 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId) } return retval; } + +#endif // wxUSE_NOTEBOOK