callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move GtkWindow g_autoptr macros in the class header

Browse Source 
Otherwise we won't be able to use G_DECLARE_* macros internally to GTK
without generating warnings, or without including gtk.h itself.
This commit is contained in:
Emmanuele Bassi
2015-11-10 13:34:33 +00:00
parent d694a9a83b
commit 40d6321b4c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtk-autocleanups.h
View File

@ -205,8 +205,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeViewColumn, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkViewport, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkViewport, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWidget, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWidget, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindow, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindowGroup, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBorder, gtk_border_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBorder, gtk_border_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free)

5
gtk/gtkwindow.h
View File

@ -497,6 +497,11 @@ gboolean gtk_window_is_maximized (GtkWindow *window);
GDK_AVAILABLE_IN_3_14 GDK_AVAILABLE_IN_3_14
void gtk_window_set_interactive_debugging (gboolean enable); void gtk_window_set_interactive_debugging (gboolean enable);
#ifndef __GI_SCANNER__
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindow, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindowGroup, g_object_unref)
#endif
G_END_DECLS G_END_DECLS
#endif /* __GTK_WINDOW_H__ */ #endif /* __GTK_WINDOW_H__ */