From c0f482da5b6a907f355394e5b18a55f572c6eeb4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 27 Mar 2008 00:28:45 +0000 Subject: [PATCH] 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/branches/WX_2_8_BRANCH@52841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/notebook.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 1fd65e9e33..2fd4a730ef 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -60,13 +60,13 @@ public: wxGtkNotebookPage() { m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; + m_page = NULL; + m_box = NULL; } wxString m_text; int m_image; - GtkNotebookPage *m_page; + GtkWidget *m_page; GtkLabel *m_label; GtkWidget *m_box; // in which the label and image are packed }; @@ -640,10 +640,9 @@ bool wxNotebook::InsertPage( size_t position, 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); + 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); + nb_page->m_page = gtk_notebook_get_nth_page(notebook, position); if (imageId != -1) {