[gtkmm/gtkmm-2-22] 2.21.1

[Murray Cumming <murrayc src gnome org>]

commit 4586f96b734b4f02e55e9b6236522eecb4c40591
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jun 23 09:57:23 2010 +0200

    2.21.1

 ChangeLog                                    |    2 +
 NEWS                                         |   30 +++++++++++++++++++++++++-
 configure.ac                                 |    2 +-
 demos/gtk-demo/example_treeview_treestore.cc |   14 +++++-------
 tests/property_notification/main.cc          |   16 +------------
 5 files changed, 40 insertions(+), 24 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f98e9bc..fb2f5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.21.1:
+
 2010-06-23  Daniel Elstner  <danielk openismus com>
 
 	Split off atkmm into its own separate module
diff --git a/NEWS b/NEWS
index 5432515..bb027af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,36 @@
+2.21.1 (unstable):
+
+* atkmm is now a separate tarball module.
+* Remove support for these glibmm build options via ifdefs:
+  --enable-api-exceptions
+  --enable-api-properties
+  --enable-api-default-signal-handlers
+  (All this gtkmm API is now always present.)
+* Assistant: Added commit().
+* Entry: Added im_context_filter_keypress() and reset_im_context().
+
+Entry: Added im_context_filter_keypress().
+
+	* gtk/src/entry.hg: Added im_context_filter_keypress(), new in gtk+ 2.22.
+
+2010-06-16  Murray Cumming  <murrayc murrayc com>
+
+	Added Assistant::commit() and Entry::reset_im_context().
+
+	* gtk/src/assistant.hg: Added commit(), new in gtk+ 2.22.
+	* gtk/src/entry.hg: Added reset_im_context(), new in gtk+ 2.22.
+
+2010-05-18  Murray Cumming  <murrayc murrayc com>
+
+	Remove the ifdefs that supported building with optional API.
+
+    As discussed on the mailing list, these will be removed from glibmm soon
+    anyway. Anybody who really still needs this should tell us.
 2.20.3 (stable):
 
 * Documentation: Added main page text at index.html.
   (David King, Murray Cumming)
-  
+
 2.20.2 (stable):
 
 * Documentation: Strip out the gobject-introspection annotations, and use
diff --git a/configure.ac b/configure.ac
index b1fc2a5..7fa0d29 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.20.3],
+AC_INIT([gtkmm], [2.21.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index 3aaba1f..c526851 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -341,7 +341,7 @@ void Example_TreeView_TreeStore::add_columns()
   }
 
   /* column for Alex */
-  { 
+  {
     int cols_count = m_TreeView.append_column_editable("Alex", m_columns.alex);
     Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
     if(pColumn)
@@ -366,7 +366,7 @@ void Example_TreeView_TreeStore::add_columns()
     {
       Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell_renderer());
       pRenderer->property_xalign().set_value(0.0);
-      
+
       pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
 
       pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
@@ -383,10 +383,10 @@ void Example_TreeView_TreeStore::add_columns()
     {
       Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell_renderer());
       pRenderer->property_xalign().set_value(0.0);
-      
+
       pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
       pColumn->add_attribute(pRenderer->property_activatable(), m_columns.world);
-      
+
       pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
       pColumn->set_fixed_width(50);
       pColumn->set_clickable();
@@ -401,7 +401,7 @@ void Example_TreeView_TreeStore::add_columns()
     {
       Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell_renderer());
       pRenderer->property_xalign().set_value(0.0);
-      
+
       pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
 
       pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
@@ -418,7 +418,7 @@ void Example_TreeView_TreeStore::add_columns()
     {
       Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell_renderer());
       pRenderer->property_xalign().set_value(0.0);
-      
+
       pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
 
       pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
@@ -434,6 +434,4 @@ void Example_TreeView_TreeStore::on_realize()
   m_TreeView.expand_all();
   //call base class:
   Window::on_realize();
-#endif
 }
-
diff --git a/tests/property_notification/main.cc b/tests/property_notification/main.cc
index f5cf16b..29bd7c6 100644
--- a/tests/property_notification/main.cc
+++ b/tests/property_notification/main.cc
@@ -6,11 +6,6 @@ void on_property_color_changed()
   std::cout << "color property changed" << std::endl;
 }
 
-void on_property_color_changed_nicer_api()
-{
-  std::cout << "color property changed (nicer API)" << std::endl;
-}
-
 void on_property_name_changed()
 {
   //Check that we don't get notification of the wrong property:
@@ -26,17 +21,10 @@ int main (int argc, char **argv)
   Gtk::ColorButton button;
   button.show();
 
-  button.connect_property_changed("color", sigc::ptr_fun(&on_property_color_changed));
-
-  button.property_color().signal_changed().connect(sigc::ptr_fun(&on_property_color_changed_nicer_api));
-#endif
-
-  button.connect_property_changed("name", sigc::ptr_fun(&on_property_name_changed));
-
+  button.property_color().signal_changed().connect(sigc::ptr_fun(&on_property_color_changed));
+  button.property_name().signal_changed().connect(sigc::ptr_fun(&on_property_name_changed));
 
   window.add(button);
 
   Gtk::Main::run(window);
 }
-
-