[gtkmm] Menu: Fix the build.

[Murray Cumming <murrayc src gnome org>]

commit 78cc2114428b1703ecf56cb1c742fd599db91d74
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jun 18 09:42:52 2010 +0200

    Menu: Fix the build.
    
    * gtk/src/menu.ccg: Fix typos in one of my previous commits.

 ChangeLog        |   16 +++++++++++-----
 gtk/src/menu.ccg |    5 ++---
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 684a6f0..bc493b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-18  Murray Cumming  <murrayc murrayc com>
+
+	Menu: Fix the build.
+
+	* gtk/src/menu.ccg: Fix typos in one of my previous commits.
+
 2010-06-16  Murray Cumming  <murrayc murrayc com>
 
 	Entry: Added im_context_filter_keypress().
@@ -8,10 +14,10 @@
 
 	Menu::popup and ComboBox::popup(): Add optional device parameter.
 
-	* gtk/src/combobox.hg: popup_for_device(): Rename to popup(). The extra 
+	* gtk/src/combobox.hg: popup_for_device(): Rename to popup(). The extra
 	parameter is enough.
-	* gtk/src/menu.[hg|ccg]: popup(): Add an extra optional Device parameter to 
-	all 3 method overloads, using the new gtk_menu_popup_for_device() function 
+	* gtk/src/menu.[hg|ccg]: popup(): Add an extra optional Device parameter to
+	all 3 method overloads, using the new gtk_menu_popup_for_device() function
 	when appropriate.
 
 2010-06-16  Murray Cumming  <murrayc murrayc com>
@@ -24,7 +30,7 @@
 2010-06-16  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build for latest git master, and add ComboBox::popup_for_device().
-	
+
 	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
 	* gtk/src/calendar.hg: select_month, mark_day(), unmark_day().
 	* gtk/src/combobox.hg: Added popup_for_device().
@@ -34,7 +40,7 @@
 
 	IconTheme: Add back get_for_screen().
 
-	* gtk/src/icontheme.hg: Add back get_for_screen() because it does not 
+	* gtk/src/icontheme.hg: Add back get_for_screen() because it does not
 	actually seem to be deprecated.
 
 2.90.2:
diff --git a/gtk/src/menu.ccg b/gtk/src/menu.ccg
index b486385..ee4daaa 100644
--- a/gtk/src/menu.ccg
+++ b/gtk/src/menu.ccg
@@ -66,7 +66,7 @@ void Menu::popup(MenuShell& parent_menu_shell, MenuItem& parent_menu_item, const
   if(!device)
     gtk_menu_popup(gobj(), parent_menu_shell.Gtk::Widget::gobj(), parent_menu_item.Gtk::Widget::gobj(), &SignalProxy_PopupPosition_gtk_callback, const_cast<SlotPositionCalc*>(&position_calc_slot), button, activate_time);
   else
-    gtk_menu_popup(gobj(), device->gobj(), parent_menu_shell.Gtk::Widget::gobj(), parent_menu_item.Gtk::Widget::gobj(), &SignalProxy_PopupPosition_gtk_callback, const_cast<SlotPositionCalc*>(&position_calc_slot), button, activate_time);
+    gtk_menu_popup_for_device(gobj(), device->gobj(), parent_menu_shell.Gtk::Widget::gobj(), parent_menu_item.Gtk::Widget::gobj(), &SignalProxy_PopupPosition_gtk_callback, const_cast<SlotPositionCalc*>(&position_calc_slot), button, activate_time);
 }
 
 void Menu::popup(guint button, guint32 activate_time, const Glib::RefPtr<Gdk::Device>& device)
@@ -74,7 +74,7 @@ void Menu::popup(guint button, guint32 activate_time, const Glib::RefPtr<Gdk::De
   if(!device)
     gtk_menu_popup(gobj(), 0, 0, 0, 0, button, activate_time);
   else
-    gtk_menu_popup(gobj(), device->gobj(), 0, 0, 0, 0, button, activate_time);
+    gtk_menu_popup_for_device(gobj(), device->gobj(), 0, 0, 0, 0, button, activate_time);
 }
 
 void Menu::reorder_child(const MenuItem& child, int position)
@@ -102,4 +102,3 @@ void Menu::attach_to_widget(Widget& attach_widget)
 
 
 } // namespace Gtk
-