compilation fix after last change (GTK1 doesn't have g_signal_stop_emission_by_name(), only gtk_signal_emit_stop_by_name())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -118,16 +118,10 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
|
if ( !notebook->SendPageChangingEvent(page) )
|
||||||
notebook->GetId(), page, old );
|
|
||||||
eventChanging.SetEventObject( notebook );
|
|
||||||
|
|
||||||
if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) &&
|
|
||||||
!eventChanging.IsAllowed() )
|
|
||||||
{
|
{
|
||||||
/* program doesn't allow the page change */
|
// program doesn't allow the page change
|
||||||
g_signal_stop_emission_by_name (notebook->m_widget,
|
gtk_signal_emit_stop_by_name(GTK_OBJECT(notebook->m_widget), "switch_page");
|
||||||
"switch_page");
|
|
||||||
}
|
}
|
||||||
else // change allowed
|
else // change allowed
|
||||||
{
|
{
|
||||||
@@ -136,10 +130,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
|
|||||||
// not really changed in GTK+
|
// not really changed in GTK+
|
||||||
notebook->m_selection = page;
|
notebook->m_selection = page;
|
||||||
|
|
||||||
wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
|
notebook->SendPageChangedEvent(old);
|
||||||
notebook->GetId(), page, old );
|
|
||||||
eventChanged.SetEventObject( notebook );
|
|
||||||
notebook->GetEventHandler()->ProcessEvent( eventChanged );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user