GNOME.org
 

[gtkmm] Fix the build with -Wshadow compiler warnings.

commit 92f2689e93ac7bc9aaf019f658932ab103e45eec
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jul 16 09:35:50 2015 +0200

    Fix the build with -Wshadow compiler warnings.
    
    And add this to the warnings used by --enable-warnings=fatal.
    Bug #752469

 configure.ac                 |    2 +-
 gtk/gtkmm/treemodelcolumn.cc |    4 +-
 gtk/gtkmm/treemodelcolumn.h  |    2 +-
 gtk/src/cellarea.hg          |    4 +-
 gtk/src/entry.hg             |    2 +-
 gtk/src/notebook.hg          |   10 +++---
 gtk/src/searchbar.hg         |    2 +-
 gtk/src/searchentry.hg       |    2 +-
 gtk/src/separatortoolitem.hg |    2 +-
 gtk/src/textbuffer.hg        |   22 +++++++-------
 gtk/src/texttag.hg           |    4 +-
 gtk/src/textview.hg          |    2 +-
 gtk/src/widget.hg            |   66 +++++++++++++++++++++---------------------
 13 files changed, 62 insertions(+), 62 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dc7e779..2b9a896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ AC_CHECK_FUNCS([mkfifo])
 # Evaluate the --enable-warnings=level option.
 MM_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
                        [-Wall],
-                       [-pedantic -Wall -Wextra -Wformat-security -Wno-long-long -DGSEAL_ENABLE],
+                       [-pedantic -Wall -Wextra -Wformat-security -Wshadow -Wno-long-long -DGSEAL_ENABLE],
                        [G PANGO ATK GDK GDK_PIXBUF GTK GLIBMM ATKMM PANGOMM CAIROMM SIGCXX])
 
 AC_CONFIG_FILES([Makefile
diff --git a/gtk/gtkmm/treemodelcolumn.cc b/gtk/gtkmm/treemodelcolumn.cc
index ac389b4..dd97598 100644
--- a/gtk/gtkmm/treemodelcolumn.cc
+++ b/gtk/gtkmm/treemodelcolumn.cc
@@ -58,9 +58,9 @@ const GType* TreeModelColumnRecord::types() const
 
 /**** Gtk::TreeModelColumnBase *********************************************/
 
-TreeModelColumnBase::TreeModelColumnBase(GType type)
+TreeModelColumnBase::TreeModelColumnBase(GType g_type)
 :
-  type_  (type),
+  type_  (g_type),
   index_ (-1) //default to an invalid index.
 {}
 
diff --git a/gtk/gtkmm/treemodelcolumn.h b/gtk/gtkmm/treemodelcolumn.h
index 6e53ae7..280170a 100644
--- a/gtk/gtkmm/treemodelcolumn.h
+++ b/gtk/gtkmm/treemodelcolumn.h
@@ -102,7 +102,7 @@ public:
   int index() const { return index_; }
 
 protected:
-  explicit TreeModelColumnBase(GType type);
+  explicit TreeModelColumnBase(GType g_type);
 
 private:
   GType type_;
diff --git a/gtk/src/cellarea.hg b/gtk/src/cellarea.hg
index f12f7ff..0f2cce9 100644
--- a/gtk/src/cellarea.hg
+++ b/gtk/src/cellarea.hg
@@ -156,7 +156,7 @@ public:
   void foreach(const Glib::RefPtr<CellAreaContext>& context, Widget* widget, const Gdk::Rectangle& 
cell_area, const Gdk::Rectangle& background_area, const SlotForeachAlloc& slot);
   _IGNORE(gtk_cell_area_foreach_alloc)
 
-  _WRAP_METHOD(int event(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, GdkEvent* event, 
const Gdk::Rectangle& cell_area,  GtkCellRendererState  flags), gtk_cell_area_event)
+  _WRAP_METHOD(int event(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, GdkEvent* gdk_event, 
const Gdk::Rectangle& cell_area,  GtkCellRendererState  flags), gtk_cell_area_event)
   _WRAP_METHOD(void render(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, const 
::Cairo::RefPtr< ::Cairo::Context>& cr, const Gdk::Rectangle& background_area, const Gdk::Rectangle& 
cell_area, CellRendererState flags,  bool paint_focus), gtk_cell_area_render)
 
   _WRAP_METHOD(void get_cell_allocation(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, 
CellRenderer& renderer,  const Gdk::Rectangle& cell_area, Gdk::Rectangle& allocation), 
gtk_cell_area_get_cell_allocation)
@@ -216,7 +216,7 @@ public:
   _WRAP_METHOD(CellEditable* get_edit_widget(), gtk_cell_area_get_edit_widget)
   _WRAP_METHOD(const CellEditable* get_edit_widget() const, gtk_cell_area_get_edit_widget, constversion)
 
-  _WRAP_METHOD(bool activate_cell(Widget& widget, CellRenderer& renderer, GdkEvent* event, const 
Gdk::Rectangle& cell_area, CellRendererState flags), gtk_cell_area_activate_cell)
+  _WRAP_METHOD(bool activate_cell(Widget& widget, CellRenderer& renderer, GdkEvent* gdk_event, const 
Gdk::Rectangle& cell_area, CellRendererState flags), gtk_cell_area_activate_cell)
   _WRAP_METHOD(void stop_editing(bool canceled), gtk_cell_area_stop_editing)
 
   _WRAP_METHOD(void inner_cell_area(Widget& widget, const Gdk::Rectangle& cell_area, Gdk::Rectangle& 
inner_area), gtk_cell_area_inner_cell_area)
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index 2477156..1ceca39 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -202,7 +202,7 @@ public:
   _IGNORE(gtk_entry_get_icon_area)
 
   _WRAP_METHOD(int get_current_icon_drag_source(), gtk_entry_get_current_icon_drag_source)
-  _WRAP_METHOD(bool im_context_filter_keypress(GdkEventKey* event), gtk_entry_im_context_filter_keypress)
+  _WRAP_METHOD(bool im_context_filter_keypress(GdkEventKey* gdk_event), gtk_entry_im_context_filter_keypress)
   _WRAP_METHOD(void reset_im_context(), gtk_entry_reset_im_context)
 
   _WRAP_METHOD(void set_input_purpose(InputPurpose purpose), gtk_entry_set_input_purpose)
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 1bd13f5..d5deb5c 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -77,20 +77,20 @@ public:
 
   int insert_page(Widget& child, const Glib::ustring& tab_label, const Glib::ustring& menu_label, int 
position, bool use_mnemonic = false);
 
-  _WRAP_METHOD(void remove_page(int page_num = 0), gtk_notebook_remove_page)
+  _WRAP_METHOD(void remove_page(int page_number = 0), gtk_notebook_remove_page)
   void remove_page(Widget& child);
 
   _WRAP_METHOD(void set_group_name(const Glib::ustring& group_name), gtk_notebook_set_group_name)
   _WRAP_METHOD(Glib::ustring get_group_name() const, gtk_notebook_get_group_name)
 
   _WRAP_METHOD(int get_current_page() const, gtk_notebook_get_current_page)
-  _WRAP_METHOD(Widget* get_nth_page(int page_num), gtk_notebook_get_nth_page)
-  _WRAP_METHOD(const Widget* get_nth_page(int page_num) const, gtk_notebook_get_nth_page, constversion)
+  _WRAP_METHOD(Widget* get_nth_page(int page_number), gtk_notebook_get_nth_page)
+  _WRAP_METHOD(const Widget* get_nth_page(int page_number) const, gtk_notebook_get_nth_page, constversion)
   _WRAP_METHOD(int get_n_pages() const, gtk_notebook_get_n_pages)
   /*Widget* get_current_page();*/ /*inconsistency with set_current_page*/
   _WRAP_METHOD(int page_num(const Widget& child) const, gtk_notebook_page_num)
 
-  _WRAP_METHOD(void set_current_page(int page_num), gtk_notebook_set_current_page)
+  _WRAP_METHOD(void set_current_page(int page_number), gtk_notebook_set_current_page)
   _WRAP_METHOD(void next_page(), gtk_notebook_next_page)
   _WRAP_METHOD(void prev_page(), gtk_notebook_prev_page)
 
@@ -135,7 +135,7 @@ public:
   _WRAP_METHOD(Widget* get_action_widget(PackType pack_type = PACK_START), gtk_notebook_get_action_widget)
   _WRAP_METHOD(void set_action_widget(Widget* widget, PackType pack_type = PACK_START), 
gtk_notebook_set_action_widget)
 
-  _WRAP_SIGNAL(void switch_page(Widget* page, guint page_num), "switch_page")
+  _WRAP_SIGNAL(void switch_page(Widget* page, guint page_number), "switch_page")
   _WRAP_SIGNAL(void page_reordered(Widget* page, guint page_num), "page_reordered", no_default_handler)
   _WRAP_SIGNAL(void page_removed(Widget* page, guint page_num), "page_removed", no_default_handler)
   _WRAP_SIGNAL(void page_added(Widget* page, guint page_num), "page_added", no_default_handler)
diff --git a/gtk/src/searchbar.hg b/gtk/src/searchbar.hg
index a177a04..aaef373 100644
--- a/gtk/src/searchbar.hg
+++ b/gtk/src/searchbar.hg
@@ -68,7 +68,7 @@ public:
   //TODO: Use Gdk::EventKey, if we ever use Gdk::Event elsewhere in the API:
 //We use GdkEventKey* rather than GdkEvent*. See GTK+ bug https://bugzilla.gnome.org/show_bug.cgi?id=709544
 #m4 _CONVERSION(`GdkEventKey*',`GdkEvent*',`(($2)($3))')
-  _WRAP_METHOD(bool handle_event(GdkEventKey* event), gtk_search_bar_handle_event)
+  _WRAP_METHOD(bool handle_event(GdkEventKey* gdk_event), gtk_search_bar_handle_event)
 
 
   _WRAP_PROPERTY("search-mode-enabled", bool)
diff --git a/gtk/src/searchentry.hg b/gtk/src/searchentry.hg
index c64eda9..eaa05f2 100644
--- a/gtk/src/searchentry.hg
+++ b/gtk/src/searchentry.hg
@@ -63,7 +63,7 @@ public:
   //TODO: Use Gdk::EventKey, if we ever use Gdk::Event elsewhere in the API:
 //We use GdkEventKey* rather than GdkEvent*. See GTK+ bug https://bugzilla.gnome.org/show_bug.cgi?id=709544
 #m4 _CONVERSION(`GdkEventKey*',`GdkEvent*',`(($2)($3))')
-  _WRAP_METHOD(bool handle_event(GdkEventKey* event), gtk_search_entry_handle_event)
+  _WRAP_METHOD(bool handle_event(GdkEventKey* gdk_event), gtk_search_entry_handle_event)
 
   //TODO: Remove no_default_handler when we can break ABI:
   _WRAP_SIGNAL(void search_changed(), "search-changed", no_default_handler)
diff --git a/gtk/src/separatortoolitem.hg b/gtk/src/separatortoolitem.hg
index b4f2b2e..da23b13 100644
--- a/gtk/src/separatortoolitem.hg
+++ b/gtk/src/separatortoolitem.hg
@@ -41,7 +41,7 @@ public:
   _CTOR_DEFAULT()
 
   _WRAP_METHOD(bool get_draw() const, gtk_separator_tool_item_get_draw)
-  _WRAP_METHOD(void set_draw(bool draw = true), gtk_separator_tool_item_set_draw)
+  _WRAP_METHOD(void set_draw(bool should_draw = true), gtk_separator_tool_item_set_draw)
 
   _WRAP_PROPERTY("draw", bool)
 };
diff --git a/gtk/src/textbuffer.hg b/gtk/src/textbuffer.hg
index f72b06b..07df192 100644
--- a/gtk/src/textbuffer.hg
+++ b/gtk/src/textbuffer.hg
@@ -355,7 +355,7 @@ public:
   iterator backspace(const iterator& iter, bool interactive = true, bool default_editable = true);
   _IGNORE(gtk_text_buffer_backspace)
 
-  _WRAP_METHOD(Glib::ustring get_text(const iterator& start, const iterator& end, bool include_hidden_chars 
= true) const, gtk_text_buffer_get_text)
+  _WRAP_METHOD(Glib::ustring get_text(const iterator& range_start, const iterator& range_end, bool 
include_hidden_chars = true) const, gtk_text_buffer_get_text)
 
   /** Returns all the text in the buffer. Excludes undisplayed
    * text (text marked with tags that set the invisibility attribute) if
@@ -370,7 +370,7 @@ public:
    */
   Glib::ustring get_text(bool include_hidden_chars = true) const;
 
-  _WRAP_METHOD(Glib::ustring get_slice(const iterator& start, const iterator& end, bool include_hidden_chars 
= true) const, gtk_text_buffer_get_slice)
+  _WRAP_METHOD(Glib::ustring get_slice(const iterator& range_start, const iterator& range_end, bool 
include_hidden_chars = true) const, gtk_text_buffer_get_slice)
 
   iterator insert_pixbuf(const iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
   _IGNORE(gtk_text_buffer_insert_pixbuf)
@@ -417,11 +417,11 @@ public:
   _WRAP_METHOD(Glib::RefPtr<TextBuffer::Mark> get_selection_bound(), gtk_text_buffer_get_selection_bound, 
refreturn)
 
   _WRAP_METHOD(void place_cursor(const iterator& where), gtk_text_buffer_place_cursor)
-  _WRAP_METHOD(void apply_tag(const Glib::RefPtr<Tag>& tag, const iterator& start, const iterator& end), 
gtk_text_buffer_apply_tag)
-  _WRAP_METHOD(void remove_tag(const Glib::RefPtr<Tag>& tag, const iterator& start, const iterator& end), 
gtk_text_buffer_remove_tag)
-  _WRAP_METHOD(void apply_tag_by_name(const Glib::ustring& name, const iterator& start, const iterator& 
end), gtk_text_buffer_apply_tag_by_name)
-  _WRAP_METHOD(void remove_tag_by_name(const Glib::ustring& name, const iterator& start, const iterator& 
end), gtk_text_buffer_remove_tag_by_name)
-  _WRAP_METHOD(void remove_all_tags(const iterator& start, const iterator& end), 
gtk_text_buffer_remove_all_tags)
+  _WRAP_METHOD(void apply_tag(const Glib::RefPtr<Tag>& tag, const iterator& range_start, const iterator& 
range_end), gtk_text_buffer_apply_tag)
+  _WRAP_METHOD(void remove_tag(const Glib::RefPtr<Tag>& tag, const iterator& range_start, const iterator& 
range_end), gtk_text_buffer_remove_tag)
+  _WRAP_METHOD(void apply_tag_by_name(const Glib::ustring& name, const iterator& range_start, const 
iterator& range_end), gtk_text_buffer_apply_tag_by_name)
+  _WRAP_METHOD(void remove_tag_by_name(const Glib::ustring& name, const iterator& range_start, const 
iterator& range_end), gtk_text_buffer_remove_tag_by_name)
+  _WRAP_METHOD(void remove_all_tags(const iterator& range_start, const iterator& range_end), 
gtk_text_buffer_remove_all_tags)
 
   /** Creates a tag and adds it to the tag table for buffer. Equivalent to calling 
Gtk::TextBuffer::Tag::create() and then adding
    * the tag to the buffer's tag table.
@@ -473,7 +473,7 @@ public:
   void paste_clipboard(const Glib::RefPtr<Clipboard>& clipboard, bool default_editable = true);
   _IGNORE(gtk_text_buffer_paste_clipboard)
 
-  _WRAP_METHOD(bool get_selection_bounds(iterator& start, iterator& end) const, 
gtk_text_buffer_get_selection_bounds)
+  _WRAP_METHOD(bool get_selection_bounds(iterator& range_start, iterator& range_end) const, 
gtk_text_buffer_get_selection_bounds)
   _WRAP_METHOD(bool erase_selection(bool interactive = true, bool default_editable = true), 
gtk_text_buffer_delete_selection)
 
   _WRAP_METHOD(void select_range(const iterator& ins, const iterator& bound), gtk_text_buffer_select_range)
@@ -555,8 +555,8 @@ public:
 
   _WRAP_METHOD(guint8* serialize(const Glib::RefPtr<TextBuffer>& content_buffer,
                                  const Glib::ustring& format,
-                                 const iterator& start,
-                                 const iterator& end,
+                                 const iterator& range_start,
+                                 const iterator& range_end,
                                  gsize& length), gtk_text_buffer_serialize)
 
   _WRAP_METHOD(bool deserialize(const Glib::RefPtr<TextBuffer>& content_buffer,
@@ -577,7 +577,7 @@ _CONVERSION(`const char*',`const Glib::ustring&',`Glib::ustring(p1, p1 + p2)')
 #m4 _CONVERSION(`GtkTextChildAnchor*',`const Glib::RefPtr<ChildAnchor>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(void insert_child_anchor(const TextBuffer::iterator& pos, const Glib::RefPtr<ChildAnchor>& 
anchor), "insert_child_anchor")
 
-  _WRAP_SIGNAL(void erase(const TextBuffer::iterator& start, const TextBuffer::iterator& end), 
"delete_range")
+  _WRAP_SIGNAL(void erase(const TextBuffer::iterator& range_start, const TextBuffer::iterator& range_end), 
"delete_range")
   _WRAP_SIGNAL(void changed(), "changed")
   _WRAP_SIGNAL(void modified_changed(), "modified_changed")
 
diff --git a/gtk/src/texttag.hg b/gtk/src/texttag.hg
index ae85cc0..ec530aa 100644
--- a/gtk/src/texttag.hg
+++ b/gtk/src/texttag.hg
@@ -66,10 +66,10 @@ public:
 
   _WRAP_METHOD(int get_priority() const, gtk_text_tag_get_priority)
   _WRAP_METHOD(void set_priority(int priority), gtk_text_tag_set_priority)
-  _WRAP_METHOD(bool event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& 
iter), gtk_text_tag_event)
+  _WRAP_METHOD(bool event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* gdk_event, const 
TextIter& iter), gtk_text_tag_event)
 
 #m4 _CONVERSION(`GObject*',`const Glib::RefPtr<Glib::Object>&',`Glib::wrap($3, true)')
-  _WRAP_SIGNAL(bool event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& 
iter), "event")
+  _WRAP_SIGNAL(bool event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* gdk_event, const 
TextIter& iter), "event")
 
   _WRAP_PROPERTY("name", Glib::ustring) //construct-only.
   _WRAP_PROPERTY("background", Glib::ustring)
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index ee10c45..fb5ca54 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -154,7 +154,7 @@ public:
   _WRAP_METHOD(bool starts_display_line(const TextBuffer::iterator&  iter), 
gtk_text_view_starts_display_line)
   _WRAP_METHOD(bool move_visually(TextBuffer::iterator& iter, int count), gtk_text_view_move_visually)
 
-  _WRAP_METHOD(bool im_context_filter_keypress(GdkEventKey* event), gtk_text_view_im_context_filter_keypress)
+  _WRAP_METHOD(bool im_context_filter_keypress(GdkEventKey* gdk_event), 
gtk_text_view_im_context_filter_keypress)
   _WRAP_METHOD(void reset_im_context(), gtk_text_view_reset_im_context)
 
   _WRAP_METHOD(void add_child_at_anchor(Widget& child, const Glib::RefPtr<TextBuffer::ChildAnchor>& anchor), 
gtk_text_view_add_child_at_anchor)
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index ee56ee3..fccb3fb 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -160,9 +160,9 @@ public:
   //Probably not useful. Too C-specific: _WRAP_METHOD(bool can_activate_accel(guint signal_id) const, 
gtk_widget_can_activate_accel)
 
   //TODO: Use C++ type
-  _WRAP_METHOD(bool event(GdkEvent* event), gtk_widget_event)
-  _WRAP_METHOD(int send_expose(GdkEvent* event), gtk_widget_send_expose)
-  _WRAP_METHOD(bool send_focus_change(GdkEvent* event), gtk_widget_send_focus_change)
+  _WRAP_METHOD(bool event(GdkEvent* gdk_event), gtk_widget_event)
+  _WRAP_METHOD(int send_expose(GdkEvent* gdk_event), gtk_widget_send_expose)
+  _WRAP_METHOD(bool send_focus_change(GdkEvent* gdk_event), gtk_widget_send_focus_change)
   _WRAP_METHOD(bool activate(), gtk_widget_activate)
 
   //TODO: When we can break ABI/API, change to void reparent(Container& new_parent).
@@ -253,7 +253,7 @@ public:
   _WRAP_METHOD(void set_redraw_on_allocate(bool redraw_on_allocate = true),
                gtk_widget_set_redraw_on_allocate)
 
-  _WRAP_METHOD(void set_child_visible(bool is_visible = true), gtk_widget_set_child_visible)
+  _WRAP_METHOD(void set_child_visible(bool visible = true), gtk_widget_set_child_visible)
   _WRAP_METHOD(bool get_child_visible() const, gtk_widget_get_child_visible)
 
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(), gtk_widget_get_window, refreturn)
@@ -559,9 +559,9 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(void drag_source_add_uri_targets(), gtk_drag_source_add_uri_targets)
   _WRAP_METHOD(void drag_source_add_image_targets(), gtk_drag_source_add_image_targets)
 
-  _WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets, 
Gdk::DragAction actions, int button, GdkEvent* event), gtk_drag_begin, refreturn,
+  _WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets, 
Gdk::DragAction actions, int button, GdkEvent* gdk_event), gtk_drag_begin, refreturn,
                deprecated "Use the drag_begin() that takes x,y coordinates.")
-  _WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets, 
Gdk::DragAction actions, int button, GdkEvent* event, int x, int y), gtk_drag_begin_with_coordinates, 
refreturn)
+  _WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets, 
Gdk::DragAction actions, int button, GdkEvent* gdk_event, int x, int y), gtk_drag_begin_with_coordinates, 
refreturn)
   _WRAP_METHOD(bool drag_check_threshold(int start_x, int start_y, int current_x, int current_y), 
gtk_drag_check_threshold)
 
   //These should be a method of Gdk::DragContext, but gdkmm can't depend on gtkmm.
@@ -693,21 +693,21 @@ _DEPRECATE_IFDEF_END
   _WRAP_SIGNAL(bool mnemonic_activate(bool group_cycling), "mnemonic_activate")
   _WRAP_SIGNAL(void grab_focus(), "grab_focus")
   _WRAP_SIGNAL(bool focus(DirectionType direction), "focus")
-  _WRAP_SIGNAL(bool event(GdkEvent* event), "event")
-  _WRAP_SIGNAL(void event_after(GdkEvent* event), "event_after", no_default_handler)
+  _WRAP_SIGNAL(bool event(GdkEvent* gdk_event), "event")
+  _WRAP_SIGNAL(void event_after(GdkEvent* gdk_event), "event_after", no_default_handler)
 
   /// Event triggered by user pressing button.
-  _WRAP_SIGNAL(bool button_press_event(GdkEventButton* event),"button_press_event")
+  _WRAP_SIGNAL(bool button_press_event(GdkEventButton* button_event),"button_press_event")
 
   /// Event triggered by user releasing button.
-  _WRAP_SIGNAL(bool button_release_event(GdkEventButton* event), "button_release_event")
+  _WRAP_SIGNAL(bool button_release_event(GdkEventButton* release_event), "button_release_event")
 
-  _WRAP_SIGNAL(bool scroll_event(GdkEventScroll* event), "scroll_event")
+  _WRAP_SIGNAL(bool scroll_event(GdkEventScroll* scroll_event), "scroll_event")
 
   /// Event triggered by user moving pointer.
-  _WRAP_SIGNAL(bool motion_notify_event(GdkEventMotion* event), "motion_notify_event")
+  _WRAP_SIGNAL(bool motion_notify_event(GdkEventMotion* motion_event), "motion_notify_event")
 
-  _WRAP_SIGNAL(bool delete_event(GdkEventAny* event), "delete_event")
+  _WRAP_SIGNAL(bool delete_event(GdkEventAny* any_event), "delete_event")
 
 #m4begin
 dnl// Hook in special code to catch explicit uses of gtk_object_destroy() by
@@ -725,32 +725,32 @@ dnl
   _WRAP_SIGNAL(bool draw(const ::Cairo::RefPtr< ::Cairo::Context>& cr), "draw")
 
   /// Event triggered by a key press will widget has focus.
-  _WRAP_SIGNAL(bool key_press_event(GdkEventKey* event), "key_press_event")
+  _WRAP_SIGNAL(bool key_press_event(GdkEventKey* key_event), "key_press_event")
 
   /// Event triggered by a key release will widget has focus.
-  _WRAP_SIGNAL(bool key_release_event(GdkEventKey* event), "key_release_event")
+  _WRAP_SIGNAL(bool key_release_event(GdkEventKey* key_event), "key_release_event")
 
   /// Event triggered by pointer entering widget area.
-  _WRAP_SIGNAL(bool enter_notify_event(GdkEventCrossing* event), "enter_notify_event")
+  _WRAP_SIGNAL(bool enter_notify_event(GdkEventCrossing* crossing_event), "enter_notify_event")
 
   /// Event triggered by pointer leaving widget area.
-  _WRAP_SIGNAL(bool leave_notify_event(GdkEventCrossing* event), "leave_notify_event")
+  _WRAP_SIGNAL(bool leave_notify_event(GdkEventCrossing* crossing_event), "leave_notify_event")
 
   /// Event triggered by a window resizing.
-  _WRAP_SIGNAL(bool configure_event(GdkEventConfigure* event), "configure_event")
-  _WRAP_SIGNAL(bool focus_in_event(GdkEventFocus* event), "focus_in_event")
-  _WRAP_SIGNAL(bool focus_out_event(GdkEventFocus* event), "focus_out_event")
-  _WRAP_SIGNAL(bool map_event(GdkEventAny* event), "map_event")
-  _WRAP_SIGNAL(bool unmap_event(GdkEventAny* event), "unmap_event")
-  _WRAP_SIGNAL(bool property_notify_event(GdkEventProperty* event), "property_notify_event")
-  _WRAP_SIGNAL(bool selection_clear_event(GdkEventSelection* event), "selection_clear_event")
-  _WRAP_SIGNAL(bool selection_request_event(GdkEventSelection* event), "selection_request_event")
-  _WRAP_SIGNAL(bool selection_notify_event(GdkEventSelection* event), "selection_notify_event")
-  _WRAP_SIGNAL(bool proximity_in_event(GdkEventProximity* event), "proximity_in_event")
-  _WRAP_SIGNAL(bool proximity_out_event(GdkEventProximity* event), "proximity_out_event")
-  _WRAP_SIGNAL(bool visibility_notify_event(GdkEventVisibility* event), "visibility_notify_event",
+  _WRAP_SIGNAL(bool configure_event(GdkEventConfigure* configure_event), "configure_event")
+  _WRAP_SIGNAL(bool focus_in_event(GdkEventFocus* focus_event), "focus_in_event")
+  _WRAP_SIGNAL(bool focus_out_event(GdkEventFocus* gdk_event), "focus_out_event")
+  _WRAP_SIGNAL(bool map_event(GdkEventAny* any_event), "map_event")
+  _WRAP_SIGNAL(bool unmap_event(GdkEventAny* any_event), "unmap_event")
+  _WRAP_SIGNAL(bool property_notify_event(GdkEventProperty* property_event), "property_notify_event")
+  _WRAP_SIGNAL(bool selection_clear_event(GdkEventSelection* selection_event), "selection_clear_event")
+  _WRAP_SIGNAL(bool selection_request_event(GdkEventSelection* selection_event), "selection_request_event")
+  _WRAP_SIGNAL(bool selection_notify_event(GdkEventSelection* selection_event), "selection_notify_event")
+  _WRAP_SIGNAL(bool proximity_in_event(GdkEventProximity* proximity_event), "proximity_in_event")
+  _WRAP_SIGNAL(bool proximity_out_event(GdkEventProximity* proximity_event), "proximity_out_event")
+  _WRAP_SIGNAL(bool visibility_notify_event(GdkEventVisibility* visibility_event), "visibility_notify_event",
     deprecated "Modern composited windowing systems with pervasive transparency make it impossible to track 
the visibility of a window reliably, so this signal can not be guaranteed to provide useful information.")
-  _WRAP_SIGNAL(bool window_state_event(GdkEventWindowState* event), "window_state_event")
+  _WRAP_SIGNAL(bool window_state_event(GdkEventWindowState* window_state_event), "window_state_event")
 
   //We use the optional custom_c_callback parameter with _WRAP_SIGNAL() for some of these,
   //so that we can write special code to wrap the non-const SelectionData& output parameters:
@@ -791,13 +791,13 @@ _CONVERSION(`GdkScreen*',`const Glib::RefPtr<Gdk::Screen>&',`Glib::wrap($3, true
   _WRAP_SIGNAL(bool query_tooltip(int x, int y, bool keyboard_tooltip, const Glib::RefPtr<Tooltip>& 
tooltip), "query_tooltip", no_default_handler)
 
   //(This was added to GTK+ 2.8 but forgotten by us until gtkmm 2.13/14):
-  _WRAP_SIGNAL(bool grab_broken_event(GdkEventGrabBroken* event), "grab_broken_event", no_default_handler)
+  _WRAP_SIGNAL(bool grab_broken_event(GdkEventGrabBroken* grab_broken_event), "grab_broken_event", 
no_default_handler)
 
   // TODO: Remove no_default_handler when we can break ABI:
-  _WRAP_SIGNAL(bool damage_event(GdkEventExpose* event), "damage-event", no_default_handler)
+  _WRAP_SIGNAL(bool damage_event(GdkEventExpose* expose_event), "damage-event", no_default_handler)
 
   // TODO: Remove no_default_handler when we can break ABI:
-  _WRAP_SIGNAL(bool touch_event(GdkEventTouch* event), "touch_event", no_default_handler)
+  _WRAP_SIGNAL(bool touch_event(GdkEventTouch* touch_event), "touch_event", no_default_handler)
 
   _WRAP_PROPERTY("name", Glib::ustring)
   _WRAP_PROPERTY("parent", Container*)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]