diff options
author | Murray Cumming <murrayc@src.gnome.org> | 2008-03-10 19:28:20 +0000 |
---|---|---|
committer | Murray Cumming <murrayc@src.gnome.org> | 2008-03-10 19:28:20 +0000 |
commit | 3a7bdbc8a725bd0586d114116da195f3ed9041dd (patch) | |
tree | f29cdb4f9d51c30f1af53b848756547dd36fc831 | |
parent | 01128a410f5c707df2c3e53ece56bd90d50f20fc (diff) | |
download | glibmm-3a7bdbc8a725bd0586d114116da195f3ed9041dd.tar.gz |
Increased versionglibmm-2.16.0
svn path=/trunk/; revision=640
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | NEWS | 12 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | gio/src/gio_signals.defs | 27 | ||||
-rw-r--r-- | gio/src/themedicon.ccg | 11 | ||||
-rw-r--r-- | gio/src/themedicon.hg | 14 |
6 files changed, 64 insertions, 8 deletions
@@ -1,3 +1,5 @@ +2.16.0: + 2008-03-10 Tim Mooney <murrayc@murrayc.com> * glib/glibmm/object.cc: Include string.h to fix the build with @@ -1,3 +1,15 @@ +2.16.0 (stable): + +Changes compared to glibmm 2.14: + +* New Gio API. Check for giomm-2.4 with pkg-config to use this. + (Marko Anastasov, Jonathon Jongsma, José Alburquerque, Murray Cumming) +* New Glib::Checksum class. + (Naveen Verma, Murray Cumming) +* New uri helper functions: uri_unescape_string(), uri_parse_scheme(), + uri_escape_string(). + (Murray Cumming) + 2.15.8 (unstable): * File: load_contents(), load_contents_finish(), load_partial_contents_finish(): diff --git a/configure.in b/configure.in index 25b72e47..8a5399c6 100644 --- a/configure.in +++ b/configure.in @@ -13,8 +13,8 @@ # pushdef([GLIBMM_MAJOR_VERSION], [2]) -pushdef([GLIBMM_MINOR_VERSION], [15]) -pushdef([GLIBMM_MICRO_VERSION], [8]) +pushdef([GLIBMM_MINOR_VERSION], [16]) +pushdef([GLIBMM_MICRO_VERSION], [0]) pushdef([GLIBMM_EXTRA_VERSION], []) pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION) @@ -131,7 +131,7 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo]) # Dependancy checks ######################################################################### gtkmm_min_sigc_version=2.0.0 -gtkmm_min_glib_version=2.15.6 +gtkmm_min_glib_version=2.16.0 PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version}) AC_SUBST(GLIBMM_CFLAGS) diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs index b7f98925..8caca150 100644 --- a/gio/src/gio_signals.defs +++ b/gio/src/gio_signals.defs @@ -297,6 +297,33 @@ ;; From GThemedIcon +(define-property name + (of-object "GThemedIcon") + (prop-type "GParamString") + (docs "The name of the icon") + (readable #f) + (writable #t) + (construct-only #t) +) + +(define-property names + (of-object "GThemedIcon") + (prop-type "GParamBoxed") + (docs "An array containing the icon names") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property use-default-fallbacks + (of-object "GThemedIcon") + (prop-type "GParamBoolean") + (docs "Whether to use default fallbacks found by shortening the name at '-' characters. Ignores names after the first if multiple names are given.") + (readable #f) + (writable #t) + (construct-only #t) +) + ;; From GVolume ;; From GVolumeMonitor diff --git a/gio/src/themedicon.ccg b/gio/src/themedicon.ccg index 7a72047f..9d65ca8d 100644 --- a/gio/src/themedicon.ccg +++ b/gio/src/themedicon.ccg @@ -18,3 +18,14 @@ */ #include <gio/gio.h> + +namespace Gio +{ + +ThemedIcon::ThemedIcon(const std::string& iconname, bool use_default_callbacks) +: + _CONSTRUCT("name", iconname.c_str(), "use-default-fallbacks", gboolean(use_default_callbacks)) +{} + + +} //namespace Gio diff --git a/gio/src/themedicon.hg b/gio/src/themedicon.hg index 2616aad6..ee5e9c6d 100644 --- a/gio/src/themedicon.hg +++ b/gio/src/themedicon.hg @@ -47,13 +47,13 @@ class ThemedIcon _IMPLEMENTS_INTERFACE(Icon) protected: - _WRAP_CTOR(ThemedIcon(const std::string& iconname), g_themed_icon_new) + //TODO: Documentation: + explicit ThemedIcon(const std::string& iconname, bool use_default_callbacks = false); + _IGNORE(g_themed_icon_new, g_themed_icon_new_with_default_fallbacks) public: - _WRAP_CREATE(const std::string& iconname) + _WRAP_CREATE(const std::string& iconname, bool use_default_callbacks = false) - //See http://bugzilla.gnome.org/show_bug.cgi?id=517676 about the constructors. murrayc. - //TODO: GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname); //TODO: GIcon *g_themed_icon_new_from_names (char **iconnames, int len); _WRAP_METHOD(void append_name(const std::string& iconname), g_themed_icon_append_name) @@ -63,7 +63,11 @@ public: //_WRAP_METHOD(Glib::StringArrayHandle get_names() const, g_themed_icon_get_names) - //There are no signals or properties. + //There are no signals. + + _WRAP_PROPERTY("name", std::string) + //An array: This is awkward to wrap_WRAP_PROPERTY("names", ) + _WRAP_PROPERTY("use-default-fallbacks", bool) }; } // namespace Gio |