diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-06-24 15:34:48 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-24 15:34:48 +0000 |
commit | cc223eeff6d60f1b4ab77b09d3d6cdede6372916 (patch) | |
tree | 14c6426d96a95a70756dce3dd7154b9aeda15616 /gtk/gtknotebook.h | |
parent | 5a5580a8e77dda9b7746012405f8e813a0e6c87b (diff) | |
download | gtk+-cc223eeff6d60f1b4ab77b09d3d6cdede6372916.tar.gz |
Fix stupid error introduced last night that was making things decidedly
Sun Jun 24 11:29:35 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Fix stupid error
introduced last night that was making things decidedly not work.
* gtk/*.[ch]: Patch from Kristian Rietveld adding 80 getters
so that we have getter/setter pairing everywhere it makes
sense. (#55767)
* gtk/gtkradiobutton.[ch] gtk/gtktoolbar.c tests/testgtk.:
Rename gtk_radio_button_group to gtk_radio_button_get_group, add a
deprecated compat macro. (#55516)
* gtk/gtklabel.[ch]: Add functions
gtk_label_set/get_use_underline(), gtk_label_set/get_use_markup(),
gtk_label_set_label(), which mirror the property API for GtkLabel.
Make gtk_label_get_attributes() only reflect the attributes
set by gtk_label_set_attributes.
* gtk/gtknotebook.c (gtk_notebook_set_current_page) gtk/gtkcompat.h: Rename
from gtk_notebook_set_page().
Diffstat (limited to 'gtk/gtknotebook.h')
-rw-r--r-- | gtk/gtknotebook.h | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index c908ce431a..651db4534b 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -143,7 +143,7 @@ GtkWidget* gtk_notebook_get_nth_page (GtkNotebook *notebook, gint page_num); gint gtk_notebook_page_num (GtkNotebook *notebook, GtkWidget *child); -void gtk_notebook_set_page (GtkNotebook *notebook, +void gtk_notebook_set_current_page (GtkNotebook *notebook, gint page_num); void gtk_notebook_next_page (GtkNotebook *notebook); void gtk_notebook_prev_page (GtkNotebook *notebook); @@ -152,22 +152,30 @@ void gtk_notebook_prev_page (GtkNotebook *notebook); * set Notebook, NotebookTab style * ***********************************************************/ -void gtk_notebook_set_show_border (GtkNotebook *notebook, - gboolean show_border); -void gtk_notebook_set_show_tabs (GtkNotebook *notebook, - gboolean show_tabs); -void gtk_notebook_set_tab_pos (GtkNotebook *notebook, - GtkPositionType pos); -void gtk_notebook_set_homogeneous_tabs (GtkNotebook *notebook, - gboolean homogeneous); -void gtk_notebook_set_tab_border (GtkNotebook *notebook, - guint border_width); -void gtk_notebook_set_tab_hborder (GtkNotebook *notebook, - guint tab_hborder); -void gtk_notebook_set_tab_vborder (GtkNotebook *notebook, - guint tab_vborder); -void gtk_notebook_set_scrollable (GtkNotebook *notebook, - gboolean scrollable); +void gtk_notebook_set_show_border (GtkNotebook *notebook, + gboolean show_border); +gboolean gtk_notebook_get_show_border (GtkNotebook *notebook); +void gtk_notebook_set_show_tabs (GtkNotebook *notebook, + gboolean show_tabs); +gboolean gtk_notebook_get_show_tabs (GtkNotebook *notebook); +void gtk_notebook_set_tab_pos (GtkNotebook *notebook, + GtkPositionType pos); +GtkPositionType gtk_notebook_get_tab_pos (GtkNotebook *notebook); + +#ifndef GTK_DISABLE_DEPRECATED +void gtk_notebook_set_homogeneous_tabs (GtkNotebook *notebook, + gboolean homogeneous); +void gtk_notebook_set_tab_border (GtkNotebook *notebook, + guint border_width); +void gtk_notebook_set_tab_hborder (GtkNotebook *notebook, + guint tab_hborder); +void gtk_notebook_set_tab_vborder (GtkNotebook *notebook, + guint tab_vborder); +#endif /* GTK_DISABLE_DEPRECATED */ + +void gtk_notebook_set_scrollable (GtkNotebook *notebook, + gboolean scrollable); +gboolean gtk_notebook_get_scrollable (GtkNotebook *notebook); /*********************************************************** * enable/disable PopupMenu * @@ -188,6 +196,8 @@ void gtk_notebook_set_tab_label (GtkNotebook *notebook, void gtk_notebook_set_tab_label_text (GtkNotebook *notebook, GtkWidget *child, const gchar *tab_text); +G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook, + GtkWidget *child); GtkWidget * gtk_notebook_get_menu_label (GtkNotebook *notebook, GtkWidget *child); void gtk_notebook_set_menu_label (GtkNotebook *notebook, @@ -196,6 +206,8 @@ void gtk_notebook_set_menu_label (GtkNotebook *notebook, void gtk_notebook_set_menu_label_text (GtkNotebook *notebook, GtkWidget *child, const gchar *menu_text); +G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook, + GtkWidget *child); void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook, GtkWidget *child, gboolean *expand, |