Set focus to generic wxDataViewCtrl when clicking with any mouse button, not just...

[wxWidgets.git] / src / msw / notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index b199c98ab9ea8ce90c5ea660c32e4c7f82e48ed0..0e1f8926d0b8fbbad52affff0a853cb297375cdd 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -688,6 +688,10 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     if ( !pageRemoved )
         return NULL;
 
+    // hide the removed page to maintain the invariant that only the
+    // selected page is visible and others are hidden:
+    pageRemoved->Show(false);
+
     TabCtrl_DeleteItem(GetHwnd(), nPage);
 
     if ( m_pages.IsEmpty() )
@@ -781,7 +785,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( !strText.empty() )
     {
         tcItem.mask |= TCIF_TEXT;
-        tcItem.pszText = (wxChar *)strText.wx_str(); // const_cast
+        tcItem.pszText = const_cast<wxChar *>(strText.wx_str());
     }
 
     // hide the page: unless it is selected, it shouldn't be shown (and if it