Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-27 00:28:45 +00:00
parent 1be45608e7
commit ec96848003
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/notebook.cpp
View File

@@ -59,13 +59,11 @@ public:
wxGtkNotebookPage() wxGtkNotebookPage()
{ {
m_image = -1; m_image = -1;
m_page = (GtkNotebookPage *) NULL; m_box = NULL;
m_box = (GtkWidget *) NULL;
} }
wxString m_text; wxString m_text;
int m_image; int m_image;
GtkNotebookPage *m_page;
GtkLabel *m_label; GtkLabel *m_label;
GtkWidget *m_box; // in which the label and image are packed 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 ); nb_page->m_box = gtk_hbox_new( FALSE, 1 );
gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2); gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2);
gint idx = gtk_notebook_insert_page(notebook, win->m_widget, gtk_notebook_insert_page(notebook, win->m_widget, nb_page->m_box, position);
nb_page->m_box, position);
nb_page->m_page = (GtkNotebookPage *)gtk_notebook_get_nth_page(notebook, idx);
if (imageId != -1) if (imageId != -1)
{ {