[gtkmm] Fix the make check build.

[Murray Cumming <murrayc src gnome org>]

commit e338d040a1a34c29cdf38623819f708187510a74
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                                |   11 +++++++++++
 demos/gtk-demo/example_change_display.cc |    4 +++-
 demos/gtk-demo/example_stockbrowser.cc   |    4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 17cd057..00f38ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 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-12  Murray Cumming  <murrayc murrayc com>
+
 	Pixbuf: Removed set_option() again.
 
 	* gdk/src/pixbuf.hg: gdk_pixbuf_set_option() is actually only available when
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 55a9bcc..40bd742 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -415,10 +415,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)
@@ -434,6 +435,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 5d96dcb..18e4e44 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();
   }
 }