AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

image in the notebook is now at the left of the label (as in wxMSW), not at

Browse Source 
its right


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-09-04 11:56:53 +00:00
parent dd7f2a6c52
commit 741fd2033e
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gtk/notebook.cpp
View File

@ -374,13 +374,6 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
wxCHECK_MSG(page != NULL, FALSE, wxCHECK_MSG(page != NULL, FALSE,
"Can't add a page whose parent is not the notebook!"); "Can't add a page whose parent is not the notebook!");
// then set the attributes
page->m_text = text;
if ( page->m_text.IsEmpty() )
page->m_text = "";
page->m_image = imageId;
gtk_label_set(page->m_label, page->m_text);
// create the image if any // create the image if any
if ( imageId != -1 ) { if ( imageId != -1 ) {
wxASSERT( m_imageList != NULL ); wxASSERT( m_imageList != NULL );
@ -394,6 +387,20 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
gtk_widget_show(pixmapwid); gtk_widget_show(pixmapwid);
} }
// then set the attributes
page->m_text = text;
if ( page->m_text.IsEmpty() )
page->m_text = "";
page->m_image = imageId;
page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
gtk_box_pack_start(GTK_BOX(page->m_box), (GtkWidget *)page->m_label,
FALSE, FALSE, 3);
// @@@: what does this do? do we still need it?
// gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
gtk_widget_show((GtkWidget *)page->m_label);
if ( bSelect ) { if ( bSelect ) {
SetSelection(GetPageCount()); SetSelection(GetPageCount());
} }
@ -421,15 +428,9 @@ void wxNotebook::AddChild( wxWindow *win )
page->m_box = gtk_hbox_new (FALSE, 0); page->m_box = gtk_hbox_new (FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(page->m_box), 2); gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
page->m_label = (GtkLabel *)gtk_label_new("");
gtk_box_pack_start(GTK_BOX(page->m_box), (GtkWidget *)page->m_label,
FALSE, FALSE, 3);
gtk_widget_show((GtkWidget *)page->m_label);
page->m_client = win; page->m_client = win;
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget,
page->m_box ); page->m_box );
gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
page->m_page = page->m_page =
(GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);

27
src/gtk1/notebook.cpp
View File

@ -374,13 +374,6 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
wxCHECK_MSG(page != NULL, FALSE, wxCHECK_MSG(page != NULL, FALSE,
"Can't add a page whose parent is not the notebook!"); "Can't add a page whose parent is not the notebook!");
// then set the attributes
page->m_text = text;
if ( page->m_text.IsEmpty() )
page->m_text = "";
page->m_image = imageId;
gtk_label_set(page->m_label, page->m_text);
// create the image if any // create the image if any
if ( imageId != -1 ) { if ( imageId != -1 ) {
wxASSERT( m_imageList != NULL ); wxASSERT( m_imageList != NULL );
@ -394,6 +387,20 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
gtk_widget_show(pixmapwid); gtk_widget_show(pixmapwid);
} }
// then set the attributes
page->m_text = text;
if ( page->m_text.IsEmpty() )
page->m_text = "";
page->m_image = imageId;
page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
gtk_box_pack_start(GTK_BOX(page->m_box), (GtkWidget *)page->m_label,
FALSE, FALSE, 3);
// @@@: what does this do? do we still need it?
// gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
gtk_widget_show((GtkWidget *)page->m_label);
if ( bSelect ) { if ( bSelect ) {
SetSelection(GetPageCount()); SetSelection(GetPageCount());
} }
@ -421,15 +428,9 @@ void wxNotebook::AddChild( wxWindow *win )
page->m_box = gtk_hbox_new (FALSE, 0); page->m_box = gtk_hbox_new (FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(page->m_box), 2); gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
page->m_label = (GtkLabel *)gtk_label_new("");
gtk_box_pack_start(GTK_BOX(page->m_box), (GtkWidget *)page->m_label,
FALSE, FALSE, 3);
gtk_widget_show((GtkWidget *)page->m_label);
page->m_client = win; page->m_client = win;
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget,
page->m_box ); page->m_box );
gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
page->m_page = page->m_page =
(GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);