[gtkmm/gtkmm-2-22] 2.21.7

[Murray Cumming <murrayc src gnome org>]

commit f86dc2a3cca23c62ebe12a6024951fca0502d239
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Aug 31 07:59:21 2010 +0200

    2.21.7

 ChangeLog           |    2 ++
 NEWS                |   35 +++++++++++++++++++++++++++++++++++
 configure.ac        |    4 ++--
 gdk/src/drawable.hg |    3 ++-
 gdk/src/rgbcmap.hg  |    4 ++--
 5 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 07ebe96..8b35138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.21.7:
+
 2010-08-30  Murray Cumming  <murrayc murrayc com>
 
 	gtkmm: Added new methods wrapping new C functions.
diff --git a/NEWS b/NEWS
index 959cb0f..b6bfc5b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,38 @@
+2.21.7 (unstable):
+
+Gtk:
+* Button: Added get_event_window().
+* Expander: Added get/set_label_fill() and property.
+* Notebook:
+  - Deprecated pages().
+  - Added get_tab_hborder() and get_tab_vborder().
+* PrintUnixDialog: Added get_manual_capabilities().
+* StatusBar: Added remove_all_messages().
+* Table:
+  - Deprecated children().
+  - Added get_size().
+* TextView: Added get_hadjustment(), get_vadjustment(),
+  im_context_filter_keypress(), reset_im_context().
+* Viewport: Added get_view_window().
+* Widget:
+  - Added send_focus_change().
+  - Added const version of get_accessible().
+
+Gdk:
+* Color: Deprecate rgb_find_color().
+* Cursor: Added get_cursor_type().
+* Device: Added get_key(), get_axis_use(), get_n_axes().
+* RgbCMap: Deprecated.
+* Window: Added get_composited(), is_input_only(), is_shaped(),
+  has_native(), get_modal_hint(), get_background_pattern(),
+  coords_to_parent(), coords_from_parent(),
+  get_effective_parent(), get_effective_toplevel(), create_similar_surface(),
+  get_accept_focus(), get_focus_on_map().
+  
+Build:
+* MSVC++ and installer fixes.
+  (Armin Burgmeier)
+	
 2.21.5 (unstable):
 
 * Adapt to recent GDK and Gtk+ deprecations.
diff --git a/configure.ac b/configure.ac
index a76885c..4dce84b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gtkmm], [2.21.5],
+AC_INIT([gtkmm], [2.21.7],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -54,7 +54,7 @@ AS_IF([test "x$enable_static" = xyes],
       [AC_DEFINE([GTKMM_STATIC_LIB], [1], [Define when building gtkmm as a static library])])
 
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.21.5'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.21.7'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],
diff --git a/gdk/src/drawable.hg b/gdk/src/drawable.hg
index fc8ab03..ea07d9b 100644
--- a/gdk/src/drawable.hg
+++ b/gdk/src/drawable.hg
@@ -188,12 +188,13 @@ public:
                    RgbDither dith, const guchar* rgb_buf, int rowstride),
                gdk_draw_gray_image)
 
+  //TODO: Make sure that this is really deprecated in GTK+ and improve the deprecation message.
   _WRAP_METHOD(void draw_indexed_image(
                    const Glib::RefPtr<const GC>& gc,
                    int x, int y, int width, int height,
                    RgbDither dith, const guchar* rgb_buf, int rowstride,
                    const RgbCmap& cmap),
-               gdk_draw_indexed_image)
+               gdk_draw_indexed_image, deprecated "Because RgbCmap is deprecated.")
 
   _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_drawable_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_drawable_get_screen, refreturn, constversion)
diff --git a/gdk/src/rgbcmap.hg b/gdk/src/rgbcmap.hg
index 707849c..e4bc2d0 100644
--- a/gdk/src/rgbcmap.hg
+++ b/gdk/src/rgbcmap.hg
@@ -69,7 +69,7 @@ private:
   RgbCmap& operator=(const RgbCmap&);
 };
 
-#endif //GTKMM_DISABLE_DEPRECATED
-
 } // namespace Gdk
 
+#endif //GTKMM_DISABLE_DEPRECATED
+