projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into gtk3.
[pspp]
/
src
/
ui
/
gui
/
psppire-data-editor.c
diff --git
a/src/ui/gui/psppire-data-editor.c
b/src/ui/gui/psppire-data-editor.c
index b1526ac95af529f0c875208f061caf181cf4f8fe..09729bc42510353fbca895a62ad1a26d7d96b245 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-225,14
+225,10
@@
psppire_data_editor_get_property (GObject *object,
static void
psppire_data_editor_switch_page (GtkNotebook *notebook,
static void
psppire_data_editor_switch_page (GtkNotebook *notebook,
-#if GTK_DISABLE_DEPRECATED && GTK_CHECK_VERSION(2,20,0)
- gpointer page,
-#else
- GtkNotebookPage *page,
-#endif
+ GtkWidget *w,
guint page_num)
{
guint page_num)
{
- GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook,
page
, page_num);
+ GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook,
w
, page_num);
psppire_data_editor_update_ui_manager (PSPPIRE_DATA_EDITOR (notebook));
}
psppire_data_editor_update_ui_manager (PSPPIRE_DATA_EDITOR (notebook));
}