merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -86,14 +86,12 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
|
||||
gint page,
|
||||
wxNotebook *notebook )
|
||||
{
|
||||
static bool s_inPageChange = FALSE;
|
||||
|
||||
// are you trying to call SetSelection() from a notebook event handler?
|
||||
// you shouldn't!
|
||||
wxCHECK_RET( !s_inPageChange,
|
||||
wxCHECK_RET( !notebook->m_inSwitchPage,
|
||||
_T("gtk_notebook_page_change_callback reentered") );
|
||||
|
||||
s_inPageChange = TRUE;
|
||||
notebook->m_inSwitchPage = TRUE;
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
@@ -123,7 +121,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
|
||||
notebook->GetEventHandler()->ProcessEvent( eventChanged );
|
||||
}
|
||||
|
||||
s_inPageChange = FALSE;
|
||||
notebook->m_inSwitchPage = FALSE;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -236,6 +234,8 @@ END_EVENT_TABLE()
|
||||
void wxNotebook::Init()
|
||||
{
|
||||
m_padding = 0;
|
||||
m_inSwitchPage = FALSE;
|
||||
|
||||
m_imageList = (wxImageList *) NULL;
|
||||
m_pagesData.DeleteContents( TRUE );
|
||||
m_selection = -1;
|
||||
|
Reference in New Issue
Block a user