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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/extra_defs_gen/generate_defs_glib.cc | 5 | ||||
| -rw-r--r-- | tools/generate_wrap_init.pl.in | 3 | ||||
| -rw-r--r-- | tools/m4/convert_glib.m4 | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/extra_defs_gen/generate_defs_glib.cc b/tools/extra_defs_gen/generate_defs_glib.cc index 2ead0a0e..1e32edba 100644 --- a/tools/extra_defs_gen/generate_defs_glib.cc +++ b/tools/extra_defs_gen/generate_defs_glib.cc @@ -1,5 +1,3 @@ -/* $Id$ */ - /* generate_defs_gtk.cc * * Copyright (C) 2001 The Free Software Foundation @@ -27,7 +25,8 @@ int main() // g_type_init() is deprecated as of 2.36. // g_type_init(); - std::cout << get_defs( G_TYPE_BYTES ) + std::cout << get_defs( G_TYPE_BINDING ) + << get_defs( G_TYPE_BYTES ) << get_defs( G_TYPE_CHECKSUM ) << get_defs( G_TYPE_DATE ) << get_defs( G_TYPE_DATE_TIME ) diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in index 59cd6540..1381dfe3 100644 --- a/tools/generate_wrap_init.pl.in +++ b/tools/generate_wrap_init.pl.in @@ -192,7 +192,7 @@ while ($ARGV[0]) elsif (/\b_NO_WRAP_INIT_REGISTRATION\b/) { $exclude_from_wrap_init{$filename_header} = 1; - } + } } shift @ARGV; @@ -205,6 +205,7 @@ while ($ARGV[0]) print << "EOF"; // Generated by generate_wrap_init.pl -- DO NOT MODIFY! +#define GLIBMM_INCLUDED_FROM_WRAP_INIT_CC #include <glibmm.h> // Disable the 'const' function attribute of the get_type() functions. diff --git a/tools/m4/convert_glib.m4 b/tools/m4/convert_glib.m4 index f7e768cf..0c70cdf2 100644 --- a/tools/m4/convert_glib.m4 +++ b/tools/m4/convert_glib.m4 @@ -60,6 +60,7 @@ dnl dnl # These are for fixmegtkconst _CONVERSION(`const guchar*',`guchar*',`const_cast<guchar*>($3)',`$3') +_CONV_GLIB_ENUM(BindingFlags) _CONV_GLIB_ENUM(IOCondition) _CONV_GLIB_ENUM(IOFlags) _CONV_GLIB_ENUM(IOStatus) |