Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 1034747a3f465fe318796c69ef796c81866878ae..3626e86c461a04e89256808e17bb46a43c2d6319 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -178,6 +178,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
         /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
         event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
         /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
         event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */

+        event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );

         event.SetCurrentFocus( win );
         if (!page->m_client->GetEventHandler()->ProcessEvent( event ))
         {
         event.SetCurrentFocus( win );
         if (!page->m_client->GetEventHandler()->ProcessEvent( event ))
         {


@@ -520,7 +521,7 @@ bool wxNotebook::DeletePage( int page )
     if (!nb_page) return FALSE;
 
     /* GTK sets GtkNotebook.cur_page to NULL before sending
     if (!nb_page) return FALSE;
 
     /* GTK sets GtkNotebook.cur_page to NULL before sending

-       the switvh page event */
+       the switch page event */

     m_lastSelection = GetSelection();
 
     nb_page->m_client->Destroy();
     m_lastSelection = GetSelection();
 
     nb_page->m_client->Destroy();


@@ -535,8 +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_widget_ref( nb_page->m_client->m_widget );
+    gtk_widget_unrealize( nb_page->m_client->m_widget );
+    gtk_widget_unparent( nb_page->m_client->m_widget );
+        

     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
     m_pages.DeleteObject( nb_page );
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
     m_pages.DeleteObject( nb_page );