From: Vadim Zeitlin Date: Thu, 27 Mar 2008 00:28:45 +0000 (+0000) Subject: don't use gtk_notebook_insert_page() return value as some old GTK+ versions (the... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ec968480032839336ccc7755f5425d02b8450d21 don't use gtk_notebook_insert_page() return value as some old GTK+ versions (the one in Solaris 9 for instance) don't have it; also don't use gtk_notebook_get_nth_page() which we need this return value for at all in the trunk as it seems to be unnecessary git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 6658fa5c13..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 }; @@ -519,10 +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); - 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) {