Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxNotebook::RemovePage() now only gives critical assert failures instead of crashing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-04-23 07:06:15 +00:00
parent c72dfe98dc
commit d05e8f3f5c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/notebook.cpp
View File

@@ -521,7 +521,7 @@ bool wxNotebook::DeletePage( int page )
if (!nb_page) return FALSE; if (!nb_page) return FALSE;
/* GTK sets GtkNotebook.cur_page to NULL before sending /* GTK sets GtkNotebook.cur_page to NULL before sending
the switvh page event */ the switch page event */
m_lastSelection = GetSelection(); m_lastSelection = GetSelection();
nb_page->m_client->Destroy(); nb_page->m_client->Destroy();
@@ -536,10 +536,12 @@ bool wxNotebook::RemovePage( int page )
{ {
wxGtkNotebookPage* nb_page = GetNotebookPage(page); wxGtkNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE; wxCHECK_MSG( nb_page, FALSE, _T("wxNotebook::RemovePage: invalid page") );
gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
nb_page->m_client->Destroy();
m_pages.DeleteObject( nb_page ); m_pages.DeleteObject( nb_page );
return TRUE; return TRUE;

6
src/gtk1/notebook.cpp
View File

@@ -521,7 +521,7 @@ bool wxNotebook::DeletePage( int page )
if (!nb_page) return FALSE; if (!nb_page) return FALSE;
/* GTK sets GtkNotebook.cur_page to NULL before sending /* GTK sets GtkNotebook.cur_page to NULL before sending
the switvh page event */ the switch page event */
m_lastSelection = GetSelection(); m_lastSelection = GetSelection();
nb_page->m_client->Destroy(); nb_page->m_client->Destroy();
@@ -536,10 +536,12 @@ bool wxNotebook::RemovePage( int page )
{ {
wxGtkNotebookPage* nb_page = GetNotebookPage(page); wxGtkNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE; wxCHECK_MSG( nb_page, FALSE, _T("wxNotebook::RemovePage: invalid page") );
gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
nb_page->m_client->Destroy();
m_pages.DeleteObject( nb_page ); m_pages.DeleteObject( nb_page );
return TRUE; return TRUE;