AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate GtkNotebookPage as used in switch-page

Browse Source 
Fixes: 618327
This commit is contained in:
Christian Dywan 2010-07-13 16:49:53 +02:00
parent a5272c82a6
commit 04c54efe5c
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtknotebook.c
View File

@ -398,7 +398,7 @@ static void gtk_notebook_calc_tabs (GtkNotebook *notebook,
/*** GtkNotebook Page Switch Methods ***/
static void gtk_notebook_real_switch_page (GtkNotebook *notebook,
GtkNotebookPage *page,
GtkNotebookPage *child,
guint page_num);
/*** GtkNotebook Page Switch Functions ***/
@ -6019,12 +6019,14 @@ gtk_notebook_update_tab_states (GtkNotebook *notebook)
*/
static void
gtk_notebook_real_switch_page (GtkNotebook *notebook,
GtkNotebookPage *page,
GtkNotebookPage* child,
guint page_num)
{
GList *list = gtk_notebook_find_child (notebook, GTK_WIDGET (child), NULL);
GtkNotebookPage *page = GTK_NOTEBOOK_PAGE (list);
gboolean child_has_focus;
if (notebook->cur_page == page || !gtk_widget_get_visible (page->child))
if (notebook->cur_page == page || !gtk_widget_get_visible (GTK_WIDGET (child)))
return;
/* save the value here, changing visibility changes focus */
@ -6082,7 +6084,7 @@ gtk_notebook_switch_page (GtkNotebook *notebook,
g_signal_emit (notebook,
notebook_signals[SWITCH_PAGE],
0,
page,
page->child,
page_num);
}

10
gtk/gtknotebook.h
View File

@ -54,13 +54,19 @@ typedef enum
typedef struct _GtkNotebook GtkNotebook;
typedef struct _GtkNotebookClass GtkNotebookClass;
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
typedef struct _GtkNotebookPage GtkNotebookPage;
#endif
struct _GtkNotebook
{
GtkContainer container;
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GtkNotebookPage *GSEAL (cur_page);
#else
gpointer GSEAL (cur_page);
#endif
GList *GSEAL (children);
GList *GSEAL (first_tab); /* The first tab visible (for scrolling notebooks) */
GList *GSEAL (focus_tab);
@ -97,7 +103,11 @@ struct _GtkNotebookClass
GtkContainerClass parent_class;
void (* switch_page) (GtkNotebook *notebook,
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GtkNotebookPage *page,
#else
gpointer page,
#endif
guint page_num);
/* Action signals for keybindings */

4
modules/other/gail/gailnotebookpage.h
View File

@ -40,7 +40,11 @@ struct _GailNotebookPage
AtkObject parent;
GtkNotebook *notebook;
#ifndef GTK_DISABLE_DEPRECATED
GtkNotebookPage *page;
#else
gpointer page;
#endif
gint index;
guint notify_child_added_id;

2
tests/testgtk.c
View File

@ -6681,7 +6681,7 @@ set_page_image (GtkNotebook *notebook, gint page_num, GdkPixbuf *pixbuf)
}
static void
page_switch (GtkWidget *widget, GtkNotebookPage *page, gint page_num)
page_switch (GtkWidget *widget, gpointer *page, gint page_num)
{
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
gint old_page_num = gtk_notebook_get_current_page (notebook);