merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -122,12 +122,15 @@ public:
    // selection internally instead of querying the notebook for it
    int m_selection;

+    // flag set to TRUE while we're inside "switch_page" callback
+    bool m_inSwitchPage;
+
 protected:
    // remove one page from the notebook but do not destroy it
    virtual wxNotebookPage *DoRemovePage(int nPage);

 private:
-
+    // the padding set by SetPadding()
    int m_padding;

    DECLARE_DYNAMIC_CLASS(wxNotebook)