fix for page change not working after veto, #3808

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

src/gtk/notebook.cpp

@@ -27,14 +27,6 @@
 
 #include "wx/gtk/private.h"
 
-#include <gdk/gdkkeysyms.h>
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool g_blockEventsOnDrag;
-
 //-----------------------------------------------------------------------------
 // wxGtkNotebookPage
 //-----------------------------------------------------------------------------
@@ -65,40 +57,52 @@ public:
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGtkNotebookPagesList)
 
+extern "C" {
+static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*);
+}
 
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static void gtk_notebook_page_changing_callback( GtkNotebook *widget,
+static void
-                                                 GtkNotebookPage *WXUNUSED(gpage),
+switch_page_after(GtkWidget* widget, GtkNotebookPage*, guint, wxNotebook* win)
-                                                 guint page,
-                                                 wxNotebook *notebook )
 {
-    int old = gtk_notebook_get_current_page( widget );
+    g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win);
-
+    win->SendPageChangedEvent(win->m_oldSelection);
-    if ( !notebook->SendPageChangingEvent(page) )
-    {
-        // program doesn't allow the page change
-        g_signal_stop_emission_by_name( widget, "switch_page" );
-    }
-    else
-    {
-        // the page change event also reports the old page
-        notebook->m_oldSelection = old;
-    }
 }
 }
 
 extern "C" {
-static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget),
+static void
-                                                GtkNotebookPage *WXUNUSED(gpage),
+switch_page(GtkNotebook* widget, GtkNotebookPage*, int page, wxNotebook* win)
-                                                guint WXUNUSED(page),
-                                                wxNotebook *notebook )
 {
-    int old = notebook->m_oldSelection;
+    win->m_oldSelection = gtk_notebook_get_current_page(widget);
-    notebook->SendPageChangedEvent( old );
+
+    if (win->SendPageChangingEvent(page))
+        // allow change, unblock handler for changed event
+        g_signal_handlers_unblock_by_func(widget, (void*)switch_page_after, win);
+    else
+        // change vetoed, unblock handler to set selection back
+        g_signal_handlers_unblock_by_func(widget, (void*)event_after, win);
+}
+}
+
+//-----------------------------------------------------------------------------
+// "event_after" from m_widget
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void event_after(GtkNotebook* widget, GdkEvent*, wxNotebook* win)
+{
+    g_signal_handlers_block_by_func(widget, (void*)event_after, win);
+    g_signal_handlers_block_by_func(widget, (void*)switch_page, win);
+
+    // restore previous selection
+    gtk_notebook_set_current_page(widget, win->m_oldSelection);
+
+    g_signal_handlers_unblock_by_func(widget, (void*)switch_page, win);
 }
 }
 
@@ -182,10 +186,14 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     g_signal_connect (m_widget, "switch_page",
-                      G_CALLBACK (gtk_notebook_page_changing_callback), this);
+                      G_CALLBACK(switch_page), this);
 
     g_signal_connect_after (m_widget, "switch_page",
-                      G_CALLBACK (gtk_notebook_page_changed_callback), this);
+                      G_CALLBACK(switch_page_after), this);
+    g_signal_handlers_block_by_func(m_widget, (void*)switch_page_after, this);
+
+    g_signal_connect(m_widget, "event_after", G_CALLBACK(event_after), this);
+    g_signal_handlers_block_by_func(m_widget, (void*)event_after, this);
 
     m_parent->DoAddChild( this );
 
@@ -249,22 +257,14 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
 
     if ( !(flags & SetSelection_SendEvent) )
     {
-        g_signal_handlers_block_by_func(m_widget,
+        g_signal_handlers_block_by_func(m_widget, (void*)switch_page, this);
-            (gpointer)gtk_notebook_page_changing_callback, this);
-
-        g_signal_handlers_block_by_func(m_widget,
-            (gpointer)gtk_notebook_page_changed_callback, this);
     }
 
     gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
 
     if ( !(flags & SetSelection_SendEvent) )
     {
-        g_signal_handlers_unblock_by_func(m_widget,
+        g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this);
-            (gpointer)gtk_notebook_page_changing_callback, this);
-
-        g_signal_handlers_unblock_by_func(m_widget,
-            (gpointer)gtk_notebook_page_changed_callback, this);
     }
 
     wxNotebookPage *client = GetPage(page);