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 b7891ecc37a7131c29a6fa7329553f6db3d03696..8eab2fc19df7ab70182595680fa211cbaebe5939 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_NOTEBOOK
+

 #include  "wx/notebook.h"
 
 #ifndef WX_PRECOMP
 #include  "wx/notebook.h"
 
 #ifndef WX_PRECOMP


@@ -75,16 +77,16 @@ class WXDLLEXPORT wxNotebookTabView: public wxTabView
 {
 DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
 public:
 {
 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:
 
 protected:

-   wxNotebook*      m_notebook;
+    wxNotebook*      m_notebook;

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


@@ -264,17 +266,17 @@ bool wxNotebook::DeletePage(size_t nPage)
 
     if (m_pages.GetCount() == 0)
     {
 
     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)
     {
     }
     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);
     }
 
     RefreshLayout(false);


@@ -713,3 +715,5 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
   }
   return retval;
 }
   }
   return retval;
 }

+
+#endif // wxUSE_NOTEBOOK