[gtkmm/gtkmm-2-24] Fix the make check build.

[Murray Cumming <murrayc src gnome org>]

commit 400b8c6ea5d0aa8fcac6567258126b2469db1724
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 12 15:17:01 2011 +0100

    Fix the make check build.
    
    	* demos/gtk-demo/example_change_display.cc: Comment out the code that
    	we cannot yet port because the C example has not been ported.
    	See https://bugzilla.gnome.org/show_bug.cgi?id=638907
    	This at least fixes distcheck so I can make a tarball release.
    	* demos/gtk-demo/example_stockbrowser.cc: Revert my previous clear()->reset()
    	change because this was actually meant to call Image::clear().

 ChangeLog                                |   12 +++++++++++-
 demos/gtk-demo/example_change_display.cc |    4 +++-
 demos/gtk-demo/example_stockbrowser.cc   |    4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d4392f1..3bd8224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-12  Murray Cumming  <murrayc murrayc com>
+
+	Fix the make check build.
+
+	* demos/gtk-demo/example_change_display.cc: Comment out the code that 
+	we cannot yet port because the C example has not been ported.
+	See https://bugzilla.gnome.org/show_bug.cgi?id=638907
+	This at least fixes distcheck so I can make a tarball release.
+	* demos/gtk-demo/example_stockbrowser.cc: Revert my previous clear()->reset() 
+	change because this was actually meant to call Image::clear().
+
 2011-01-14  Murray Cumming  <murrayc murrayc com>
 
 	Use RefPtr::reset() instead of deprecated RefPtr::clear().
@@ -9551,4 +9562,3 @@ This is the HEAD branch. The stable branch is gtkmm-2-6.
 
 	* Changed library names: 1.0 -> 1.4 and 2.0 -> 2.4
 
-
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index d8213a1..216263e 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -414,10 +414,11 @@ Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::S
 }
 
 // Finds the toplevel window under the mouse pointer, if any.
-Gtk::Widget* Example_ChangeDisplay::find_toplevel_at_pointer(const Glib::RefPtr<Gdk::Display>& display)
+Gtk::Widget* Example_ChangeDisplay::find_toplevel_at_pointer(const Glib::RefPtr<Gdk::Display>& /* display */)
 {
   //TODO: This needs to use Device::get_window_at_position(), when we can figure that out.
   //See https://bugzilla.gnome.org/show_bug.cgi?id=638907
+  /*
   Glib::RefPtr<Gdk::Window> refPointerWindow = display->get_window_at_pointer();
 
   if (refPointerWindow)
@@ -433,6 +434,7 @@ Gtk::Widget* Example_ChangeDisplay::find_toplevel_at_pointer(const Glib::RefPtr<
     if(pWidget)
       return pWidget->get_toplevel();
   }
+  */
 
   return 0;
 }
diff --git a/demos/gtk-demo/example_stockbrowser.cc b/demos/gtk-demo/example_stockbrowser.cc
index c8d8aaa..532e817 100644
--- a/demos/gtk-demo/example_stockbrowser.cc
+++ b/demos/gtk-demo/example_stockbrowser.cc
@@ -262,7 +262,7 @@ void Example_StockBrowser::on_selection_changed()
     }
     else
     {
-      m_Image.reset();
+      m_Image.clear();
     }
   }
   else
@@ -271,7 +271,7 @@ void Example_StockBrowser::on_selection_changed()
     m_Label_Symbol.set_text("");
     m_Label_ID.set_text("");
     m_Label_Accel.set_text("");
-    m_Image.reset();
+    m_Image.clear();
   }
 }