diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-11-20 16:54:58 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-11-20 16:54:58 +0100 |
| commit | 983dd287da4b00baedbd04ce0f777c043d93f5b0 (patch) | |
| tree | 4d6330ae9de310b0b77423a718c581feb03111b0 /glib/glibmm.h | |
| parent | 26d5c9611cd1bf8d89fc6fd2984dfd0498fcaf71 (diff) | |
| download | glibmm-983dd287da4b00baedbd04ce0f777c043d93f5b0.tar.gz | |
Add Glib::Binding
* .gitignore: Ignore binding.[h|cc].
* glib/glibmm/objectbase.h: Add a comment.
* glib/src/filelist.am: Add glib_signals.defs and binding.hg.
* glib/src/glib.defs: Add glib_signals.defs.
* glib/glibmm.h: Add binding.h.
* tools/extra_defs_gen/generate_defs_glib.cc: Add get_defs(G_TYPE_BINDING).
* tools/m4/convert_glib.m4: Add conversion for BindingFlags.
* tools/generate_wrap_init.pl.in: Define GLIBMM_INCLUDED_FROM_WRAP_INIT_CC.
* glib/src/binding.[hg|ccg]: New files with enum BindingFlags and class Binding.
* glib/src/glib_signals.defs: New file with info about GBinding's properties.
Bug #738663.
Diffstat (limited to 'glib/glibmm.h')
| -rw-r--r-- | glib/glibmm.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/glib/glibmm.h b/glib/glibmm.h index 296db7b7..fb409f81 100644 --- a/glib/glibmm.h +++ b/glib/glibmm.h @@ -82,8 +82,8 @@ #include <glibmmconfig.h> //#include <glibmm/i18n.h> //This must be included by the application, after system headers such as <iostream>. -//Include this first because we need it to be the first thing to include <glib.h>, -//so we can do an undef trick to still use deprecated API in the header: +//Include this first because we need it to be the first thing to include <glib.h>, +//so we can do an undef trick to still use deprecated API in the header: #include <glibmm/thread.h> #include <glibmm/threads.h> @@ -91,6 +91,10 @@ #include <glibmm/arrayhandle.h> #include <glibmm/balancedtree.h> #include <glibmm/base64.h> +#ifndef GLIBMM_INCLUDED_FROM_WRAP_INIT_CC +// wrap_init.cc includes this file after it has cleared G_GNUC_CONST. +#include <glibmm/binding.h> +#endif #include <glibmm/bytearray.h> #include <glibmm/bytes.h> #include <glibmm/checksum.h> |