Added Bil Simser to wxBook page; fixed bug in notebook when deleting pages

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/html/wxbook.htm b/docs/html/wxbook.htm
index c40507fe9aad512e7206b81be02d7cc0880721aa..f2f2fdde53b1437712be79a2de73c4b72bbc54ea 100644 (file)
--- a/docs/html/wxbook.htm
+++ b/docs/html/wxbook.htm
@@ -66,6 +66,10 @@ with a predefined number of points for chapters, indexing, editing, proof-readin
 So far, the following people are interested in taking part in this project:<P>
 
 <ul>
 So far, the following people are interested in taking part in this project:<P>
 
 <ul>

+<li><a href="mailto:bsimser@home.com">Bil Simser</a>. Bil would like to coordinate
+the book. He's currently writing a book for WordWare Publishing (about his CDX library)
+and also has contacts at Sams and the Waite Group. Bil is writing <a href="http://lightning.prohosting.com/~wxbuild" target=_new>
+wxBuilder</a>, an IDE for wxWindows.

 <li><a href="mailto:tomr@scitechsoft.com">Tom Ryan</a>, SciTech Software.
 <li><a href="mailto:robin@alldunn.com">Robin Dunn</a>. <i>Chapter on wxPython.</i>
 <li><a href="mailto:mheck@www.surveyorcorp.com">Matt Heck</a>, SurveyorCorp Inc.
 <li><a href="mailto:tomr@scitechsoft.com">Tom Ryan</a>, SciTech Software.
 <li><a href="mailto:robin@alldunn.com">Robin Dunn</a>. <i>Chapter on wxPython.</i>
 <li><a href="mailto:mheck@www.surveyorcorp.com">Matt Heck</a>, SurveyorCorp Inc.

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 8f6ad71029e5350d768a3a444c73d50e54ade519..43b70d1dbb39ec453423a8ba12b18e10c8b6060c 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -314,6 +314,9 @@ bool wxNotebook::DeletePage(int nPage)
       // no selection if the notebook became empty
       m_nSelection = -1;
   }
       // no selection if the notebook became empty
       m_nSelection = -1;
   }

+  else
+      m_nSelection = TabCtrl_GetCurSel(m_hwnd);
+

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -329,6 +332,8 @@ bool wxNotebook::RemovePage(int nPage)
 
   if ( m_aPages.IsEmpty() )
       m_nSelection = -1;
 
   if ( m_aPages.IsEmpty() )
       m_nSelection = -1;

+    else
+      m_nSelection = TabCtrl_GetCurSel(m_hwnd);

 
   return TRUE;
 }
 
   return TRUE;
 }