X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c821db16e6e7675e00a2f87c0320ef75ed8a7ce1..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index f0f8bc5abd..3ff62c1a3d 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -59,13 +59,11 @@ public: wxGtkNotebookPage() { m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; + m_box = NULL; } wxString m_text; int m_image; - GtkNotebookPage *m_page; GtkLabel *m_label; GtkWidget *m_box; // in which the label and image are packed }; @@ -101,9 +99,9 @@ static void gtk_notebook_page_changing_callback( GtkNotebook *widget, } extern "C" { -static void gtk_notebook_page_changed_callback( GtkNotebook *widget, +static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget), GtkNotebookPage *WXUNUSED(gpage), - guint page, + guint WXUNUSED(page), wxNotebook *notebook ) { int old = notebook->m_oldSelection; @@ -111,36 +109,6 @@ static void gtk_notebook_page_changed_callback( GtkNotebook *widget, } } -//----------------------------------------------------------------------------- -// "size_allocate" -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) -{ - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } - - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); - - /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate - here in order to make repositioning after resizing to take effect. */ - if ((gtk_major_version == 1) && - (gtk_minor_version == 2) && - (gtk_micro_version < 6) && - (win->m_wxwindow) && - (GTK_WIDGET_REALIZED(win->m_wxwindow))) - { - gtk_widget_size_allocate( win->m_wxwindow, alloc ); - } -} -} - //----------------------------------------------------------------------------- // "realize" from m_widget //----------------------------------------------------------------------------- @@ -180,9 +148,9 @@ static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) // wxNotebook //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase) -BEGIN_EVENT_TABLE(wxNotebook, wxControl) +BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() @@ -305,26 +273,22 @@ int wxNotebook::DoSetSelection( size_t page, int flags ) if ( !(flags & SetSelection_SendEvent) ) { - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) gtk_notebook_page_changing_callback, - this); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_notebook_page_changing_callback, this); - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) gtk_notebook_page_changed_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) ) { - // reconnect to signals - - g_signal_connect (m_widget, "switch_page", - G_CALLBACK (gtk_notebook_page_changing_callback), this); + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_notebook_page_changing_callback, this); - g_signal_connect_after (m_widget, "switch_page", - G_CALLBACK (gtk_notebook_page_changed_callback), this); + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_notebook_page_changed_callback, this); } wxNotebookPage *client = GetPage(page); @@ -480,7 +444,12 @@ bool wxNotebook::DeleteAllPages() wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); + // We cannot remove the page yet, as GTK sends the "switch_page" + // signal before it has removed the notebook-page from its + // corresponding list. Thus, if we were to remove the page from + // m_pages at this point, the two lists of pages would be out + // of sync during the PAGE_CHANGING/PAGE_CHANGED events. + wxNotebookPage *client = GetPage(page); if ( !client ) return NULL; @@ -489,13 +458,16 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) // we don't need to unparent the client->m_widget; GTK+ will do // that for us (and will throw a warning if we do it!) - gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); + // It's safe to remove the page now. + wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete")); + wxNotebookBase::DoRemovePage(page); + wxGtkNotebookPage* p = GetNotebookPage(page); m_pagesData.DeleteObject(p); delete p; - + return client; } @@ -534,18 +506,18 @@ bool wxNotebook::InsertPage( size_t position, m_pages.Insert(win, position); + // set the label image and text + // this must be done before adding the page, as GetPageText + // and GetPageImage will otherwise return wrong values in + // the page-changed event that results from inserting the + // first page. + nb_page->m_image = imageId; + nb_page->m_text = wxStripMenuCodes(text); + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2); - g_signal_connect (win->m_widget, "size_allocate", - G_CALLBACK (gtk_page_size_callback), win); - - gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); - - nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; - - /* set the label image */ - nb_page->m_image = imageId; + gtk_notebook_insert_page(notebook, win->m_widget, nb_page->m_box, position); if (imageId != -1) { @@ -558,10 +530,6 @@ bool wxNotebook::InsertPage( size_t position, } /* set the label text */ - - nb_page->m_text = wxStripMenuCodes(text); - if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString; - nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );