X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f986fe7613f8e59727a11285be53017fecaafd0f..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/gtk/notebook.cpp?ds=inline diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 448d7e4638..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 }; @@ -111,25 +109,6 @@ static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(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 ); -} -} - //----------------------------------------------------------------------------- // "realize" from m_widget //----------------------------------------------------------------------------- @@ -538,13 +517,7 @@ bool wxNotebook::InsertPage( size_t position, 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); - - gint idx = gtk_notebook_insert_page(notebook, win->m_widget, - nb_page->m_box, position); - - nb_page->m_page = (GtkNotebookPage *)gtk_notebook_get_nth_page(notebook, idx); + gtk_notebook_insert_page(notebook, win->m_widget, nb_page->m_box, position); if (imageId != -1) {