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
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user