diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-11-10 13:59:36 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-11-10 13:59:36 +0000 |
| commit | 93369788c907b9c61204ff377854729cd404e25f (patch) | |
| tree | 7b952164ccebb6c46be79b1cbb38129f33a47332 /gtk/gtk-autocleanups.h | |
| parent | d589170754af9620feabb0e598b626116470557f (diff) | |
| download | gtk+-93369788c907b9c61204ff377854729cd404e25f.tar.gz | |
Start recursively moving autocleanups macros to their headers
* Cover letter
Having a single header file for all autocleanups definitions was a
reasonable stop-gap measure, but now GTK+ is starting to use G_DECLARE_*
macros. This means that every class using a G_DECLARE_* macro will need
to include "gtk.h" to avoid compiler warnings, which is not acceptable.
By moving the G_DEFINE_AUTO* use to the header that defines the type we
allow using the G_DECLARE_* macros without sacrificing the ability to
include only the needed files when deriving from a class.
* Commit
This commit changes all includes relative to GtkWindow to define their
own autocleanup macros.
Diffstat (limited to 'gtk/gtk-autocleanups.h')
| -rw-r--r-- | gtk/gtk-autocleanups.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h index 60cccdd943..089dd0a735 100644 --- a/gtk/gtk-autocleanups.h +++ b/gtk/gtk-autocleanups.h @@ -22,7 +22,6 @@ #ifndef __GI_SCANNER__ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAboutDialog, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccelGroup, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccelLabel, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccelMap, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccessible, g_object_unref) @@ -33,11 +32,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooser, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserButton, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserDialog, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserWidget, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkApplication, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkApplicationWindow, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAspectFrame, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAssistant, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBin, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBox, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBuildable, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBuilder, g_object_unref) @@ -68,7 +65,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorChooserDialog, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorChooserWidget, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkComboBox, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkComboBoxText, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkContainer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCssProvider, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkDialog, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkDrawingArea, g_object_unref) @@ -202,11 +198,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeView, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeViewColumn, 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(GtkWidget, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBorder, gtk_border_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRequisition, gtk_requisition_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSelectionData, gtk_selection_data_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTargetList, gtk_target_list_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextAttributes, gtk_text_attributes_unref) |