[gtkmm] Remove no_default_handler in some _WRAP_SIGNAL()s
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Remove no_default_handler in some _WRAP_SIGNAL()s
- Date: Wed, 9 Nov 2016 08:35:53 +0000 (UTC)
commit b56fa1059d1fee3ac545bf606737a163bf442ee7
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Wed Nov 9 09:28:12 2016 +0100
Remove no_default_handler in some _WRAP_SIGNAL()s
Remove the no_default_handler argument in _WRAP_SIGNAL() where it was added
only to avoid breaking ABI.
gtk/src/cellarea.hg | 3 +--
gtk/src/combobox.hg | 3 +--
gtk/src/cssprovider.ccg | 7 ++-----
gtk/src/cssprovider.hg | 4 +---
gtk/src/entrycompletion.hg | 3 +--
gtk/src/fontchooser.hg | 3 +--
gtk/src/listbox.hg | 3 +--
gtk/src/menuitem.hg | 5 ++---
gtk/src/menushell.hg | 3 +--
gtk/src/printoperation.hg | 3 +--
gtk/src/searchentry.hg | 9 ++++-----
gtk/src/widget.hg | 17 +++++++----------
gtk/src/window.hg | 3 +--
13 files changed, 24 insertions(+), 42 deletions(-)
---
diff --git a/gtk/src/cellarea.hg b/gtk/src/cellarea.hg
index 0f2cce9..b759836 100644
--- a/gtk/src/cellarea.hg
+++ b/gtk/src/cellarea.hg
@@ -227,8 +227,7 @@ protected:
#m4 _CONVERSION(`GtkCellAreaContext*',`const Glib::RefPtr<CellAreaContext>&',`Glib::wrap($3, true)')
#m4 _CONVERSION(`GtkTreeModel*',`const Glib::RefPtr<TreeModel>&',`Glib::wrap($3, true)')
#m4 _CONVERSION(`GtkTreeIter*',`const TreeModel::iterator&',`Gtk::TreeModel::iterator(p0, $3)')
- //TODO: Remove no_default_handler when we can break ABI:
- _WRAP_SIGNAL(void apply_attributes(const Glib::RefPtr<TreeModel>& tree_model, const TreeModel::iterator&
iter, bool is_expander, bool is_expanded), "apply-attributes", no_default_handler)
+ _WRAP_SIGNAL(void apply_attributes(const Glib::RefPtr<TreeModel>& tree_model, const TreeModel::iterator&
iter, bool is_expander, bool is_expanded), "apply-attributes")
// The add-editable, remove-editable and focus-changed signals can't have default handlers because the
wrapped C signals have no default handlers.
#m4 _CONVERSION(`GdkRectangle*',`const Gdk::Rectangle&',`Glib::wrap($3)')
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 6415fc9..f8ddc13 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -219,13 +219,12 @@ public:
_WRAP_SIGNAL(void changed(), "changed")
-//TODO: Remove no_default_handler when we can break ABI
#m4 dnl// The ::format_value signal handler should return a newly allocated string.
#m4 dnl// (which is obviously not a const gchar*)
#m4 _CONVERSION(`Glib::ustring',`const gchar*',`(strlen($3.c_str()) ? g_strdup($3.c_str()) : 0)')
#m4 _CONVERSION(`const gchar*',`const TreeModel::Path&',`TreeModel::Path($3)')
#m4 _CONVERSION(`const TreeModel::Path&',`const gchar*',`($3).to_string().c_str()')
- _WRAP_SIGNAL(Glib::ustring format_entry_text(const TreeModel::Path& path), "format-entry-text",
no_default_handler)
+ _WRAP_SIGNAL(Glib::ustring format_entry_text(const TreeModel::Path& path), "format-entry-text")
//Key-binding signals:
_IGNORE_SIGNAL("move-active")
diff --git a/gtk/src/cssprovider.ccg b/gtk/src/cssprovider.ccg
index 04ff112..665ef77 100644
--- a/gtk/src/cssprovider.ccg
+++ b/gtk/src/cssprovider.ccg
@@ -58,9 +58,6 @@ void CssProvider::load_from_data(const std::string& data)
gtk_css_provider_load_from_data(gobj(), data.c_str(), -1);
}
-//TODO: When we can break ABI, remove no_default_handler in _WRAP_SIGNAL and
-// uncomment CssProvider_Class::parsing_error_callback().
-#if 0
void CssProvider_Class::parsing_error_callback(GtkCssProvider* self, GtkCssSection* p0, const GError* p1)
{
const auto obj_base = static_cast<Glib::ObjectBase*>(
@@ -82,7 +79,7 @@ void CssProvider_Class::parsing_error_callback(GtkCssProvider* self, GtkCssSecti
}
catch (const Glib::Error& ex)
{
- // ex can be (and usually is) an instance of a subclass ofGlib::Error.
+ // ex can be (and usually is) an instance of a subclass of Glib::Error.
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
// Call the virtual member method, which derived classes might override.
@@ -105,5 +102,5 @@ void CssProvider_Class::parsing_error_callback(GtkCssProvider* self, GtkCssSecti
if(base && base->parsing_error)
(*base->parsing_error)(self, p0, p1);
}
-#endif
+
} //namespace Gtk
diff --git a/gtk/src/cssprovider.hg b/gtk/src/cssprovider.hg
index 7d4f7e2..9d956f3 100644
--- a/gtk/src/cssprovider.hg
+++ b/gtk/src/cssprovider.hg
@@ -73,15 +73,13 @@ public:
_WRAP_METHOD(static Glib::RefPtr<CssProvider> get_named(const Glib::ustring& name, const Glib::ustring&
variant), gtk_css_provider_get_named, refreturn)
- //TODO: When we can break ABI, remove no_default_handler and
- // uncomment CssProvider_Class::parsing_error_callback() in the .ccg file.
#m4 _CONVERSION(`GtkCssSection*',`const Glib::RefPtr<const CssSection>&',`Glib::wrap($3, true)')
#m4 _CONVERSION(`const Glib::RefPtr<const CssSection>&',`GtkCssSection*',__CONVERT_CONST_REFPTR_TO_P)
#m4 _CONVERSION(`const GError*',`const Glib::Error&',`Glib::Error(g_error_copy($3))')
#m4 _CONVERSION(`const Glib::Error&',`const GError*',__FR2P)
/** @param error The parsing error. The referenced object may belong to a subclass of Glib::Error, such as
Gtk::CssProviderError.
*/
- _WRAP_SIGNAL(void parsing_error(const Glib::RefPtr<const CssSection>& section, const Glib::Error& error),
"parsing-error", custom_c_callback, no_default_handler)
+ _WRAP_SIGNAL(void parsing_error(const Glib::RefPtr<const CssSection>& section, const Glib::Error& error),
"parsing-error", custom_c_callback)
//There are no properties.
};
diff --git a/gtk/src/entrycompletion.hg b/gtk/src/entrycompletion.hg
index 8d8b3dc..3566f5a 100644
--- a/gtk/src/entrycompletion.hg
+++ b/gtk/src/entrycompletion.hg
@@ -197,8 +197,7 @@ dnl
_WRAP_SIGNAL(bool insert_prefix(const Glib::ustring& prefix), insert_prefix)
- //TODO: Remove no_default_handler when we can break ABI.
- _WRAP_SIGNAL(void no_matches(), no_matches, no_default_handler)
+ _WRAP_SIGNAL(void no_matches(), no_matches)
_WRAP_PROPERTY("model", Glib::RefPtr<Gtk::TreeModel>)
diff --git a/gtk/src/fontchooser.hg b/gtk/src/fontchooser.hg
index ad3a012..7af5474 100644
--- a/gtk/src/fontchooser.hg
+++ b/gtk/src/fontchooser.hg
@@ -105,8 +105,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<const Pango::FontMap> get_font_map() const, gtk_font_chooser_get_font_map,
refreturn, constversion)
- //TODO: Remove no_default_handler when we can break ABI.
- _WRAP_SIGNAL(void font_activated(const Glib::ustring& fontname), "font-activated", no_default_handler)
+ _WRAP_SIGNAL(void font_activated(const Glib::ustring& fontname), "font-activated")
_WRAP_PROPERTY("font", Glib::ustring)
_WRAP_PROPERTY("font-desc", Pango::FontDescription)
diff --git a/gtk/src/listbox.hg b/gtk/src/listbox.hg
index 9652bb9..0ecb9de 100644
--- a/gtk/src/listbox.hg
+++ b/gtk/src/listbox.hg
@@ -329,8 +329,7 @@ public:
_WRAP_SIGNAL(void row_selected(ListBoxRow* row), row-selected)
_WRAP_SIGNAL(void row_activated(ListBoxRow* row), row-activated)
- //TODO: Remove no_default_handler when we can break ABI.
- _WRAP_SIGNAL(void selected_rows_changed(), selected-rows-changed, no_default_handler)
+ _WRAP_SIGNAL(void selected_rows_changed(), selected-rows-changed)
_IGNORE_SIGNAL(activate-cursor-row, toggle-cursor-row, move-cursor, select-all, unselect-all) // Action
signals
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index 9894e3a..ffa5171 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -86,9 +86,8 @@ public:
_WRAP_SIGNAL(void toggle_size_request(int* requisition), "toggle_size_request")
_WRAP_SIGNAL(void toggle_size_allocate(int allocation), "toggle_size_allocate")
- //TODO: Remove no_default_handler when we can break ABI
- _WRAP_SIGNAL(void select(), "select", no_default_handler)
- _WRAP_SIGNAL(void deselect(), "deselect", no_default_handler)
+ _WRAP_SIGNAL(void select(), "select")
+ _WRAP_SIGNAL(void deselect(), "deselect")
void accelerate(Window& window);
diff --git a/gtk/src/menushell.hg b/gtk/src/menushell.hg
index 188269d..e15b0be 100644
--- a/gtk/src/menushell.hg
+++ b/gtk/src/menushell.hg
@@ -65,8 +65,7 @@ public:
_WRAP_SIGNAL(void selection_done(), "selection_done")
_WRAP_SIGNAL(gboolean move_selected(int distance), "move-selected")
- //TODO: Remove no_default_handler when we can break ABI.
- _WRAP_SIGNAL(void insert(Widget* child, int position), "insert", no_default_handler)
+ _WRAP_SIGNAL(void insert(Widget* child, int position), "insert")
//Keybinding signals:
_IGNORE_SIGNAL("move_current")
diff --git a/gtk/src/printoperation.hg b/gtk/src/printoperation.hg
index 288b60a..4f4a2a9 100644
--- a/gtk/src/printoperation.hg
+++ b/gtk/src/printoperation.hg
@@ -152,9 +152,8 @@ public:
//TODO: This is causing crashes. Is it still causing crashes? murrayc.
_WRAP_SIGNAL(bool preview(const Glib::RefPtr<PrintOperationPreview>& preview, const
Glib::RefPtr<PrintContext>& context, Window* parent), "preview")
- //TODO: Remove no_default_handler when we can break ABI.
#m4 _CONVERSION(`GtkPrintSettings*', `const Glib::RefPtr<PrintSettings>&', `Glib::wrap($3, true)')
- _WRAP_SIGNAL(void update_custom_widget(Widget* widget, const Glib::RefPtr<PageSetup>& setup, const
Glib::RefPtr<PrintSettings>& settings), "update_custom_widget", no_default_handler)
+ _WRAP_SIGNAL(void update_custom_widget(Widget* widget, const Glib::RefPtr<PageSetup>& setup, const
Glib::RefPtr<PrintSettings>& settings), "update_custom_widget")
_WRAP_PROPERTY("default_page_setup", Glib::RefPtr<PageSetup>)
_WRAP_PROPERTY("print_settings", Glib::RefPtr<PrintSettings>)
diff --git a/gtk/src/searchentry.hg b/gtk/src/searchentry.hg
index eaa05f2..3717977 100644
--- a/gtk/src/searchentry.hg
+++ b/gtk/src/searchentry.hg
@@ -65,13 +65,12 @@ public:
#m4 _CONVERSION(`GdkEventKey*',`GdkEvent*',`(($2)($3))')
_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)
+ _WRAP_SIGNAL(void search_changed(), "search-changed")
// Although next-match, previous-match and stop-search are keybinding signals,
// applications shall connect to them.
- _WRAP_SIGNAL(void next_match(), "next-match", no_default_handler)
- _WRAP_SIGNAL(void previous_match(), "previous-match", no_default_handler)
- _WRAP_SIGNAL(void stop_search(), "stop-search", no_default_handler)
+ _WRAP_SIGNAL(void next_match(), "next-match")
+ _WRAP_SIGNAL(void previous_match(), "previous-match")
+ _WRAP_SIGNAL(void stop_search(), "stop-search")
// Gtk::SearchEntry has no properties nor vfuncs as of 3.16.
};
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 682395f..3e973f8 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -550,8 +550,7 @@ public:
// and style_set => style_changed
// to avoid confusion with set_parent and set_style.
- //TODO: Remove no_default_handler when we can break ABI:
- _WRAP_SIGNAL(void state_flags_changed(Gtk::StateFlags previous_state_flags), "state-flags-changed",
no_default_handler)
+ _WRAP_SIGNAL(void state_flags_changed(Gtk::StateFlags previous_state_flags), "state-flags-changed")
/// Informs objects that their parent changed.
//- The widget passed is the former parent, which may be 0 if
@@ -572,6 +571,7 @@ public:
_WRAP_SIGNAL(void grab_focus(), "grab_focus")
_WRAP_SIGNAL(bool focus(DirectionType direction), "focus")
_WRAP_SIGNAL(bool event(GdkEvent* gdk_event), "event")
+ // The event_after signal can't have a default handler because the wrapped C signal has no default handler.
_WRAP_SIGNAL(void event_after(GdkEvent* gdk_event), "event_after", no_default_handler)
/// Event triggered by user pressing button.
@@ -639,7 +639,7 @@ dnl
_WRAP_SIGNAL(void drag_end(const Glib::RefPtr<Gdk::DragContext>& context), "drag_end")
_WRAP_SIGNAL(void drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, SelectionData&
selection_data, guint info, guint time), "drag_data_get", custom_c_callback)
_WRAP_SIGNAL(void drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& context), "drag_data_delete")
- _WRAP_SIGNAL(bool drag_failed(const Glib::RefPtr<Gdk::DragContext>& context, DragResult result),
"drag_failed", no_default_handler)
+ _WRAP_SIGNAL(bool drag_failed(const Glib::RefPtr<Gdk::DragContext>& context, DragResult result),
"drag_failed")
_WRAP_SIGNAL(void drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time), "drag_leave")
_WRAP_SIGNAL(bool drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time),
"drag_motion")
_WRAP_SIGNAL(bool drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time),
"drag_drop")
@@ -651,23 +651,20 @@ _CONVERSION(`GdkScreen*',`const Glib::RefPtr<Gdk::Screen>&',`Glib::wrap($3, true
//TODO: The signal_id is very C-like here:
//_WRAP_SIGNAL(bool can_activate_accel(guint signal_id), "can_activate_accel")
- // TODO: Remove no_default_handler when we can break ABI:
- _WRAP_SIGNAL(bool popup_menu(), "popup_menu", no_default_handler) //Note that popup-menu is a keybinding
signal, but is really meant to be wrapped.
+ _WRAP_SIGNAL(bool popup_menu(), "popup_menu") //Note that popup-menu is a keybinding signal, but is really
meant to be wrapped.
//Keybinding signals:
_IGNORE_SIGNAL("keynav_failed")
_IGNORE_SIGNAL("destroy-event")
- // TODO: Remove no_default_handler when we can break ABI:
#m4 _CONVERSION(`GtkTooltip*',`const Glib::RefPtr<Tooltip>&',`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)
+ _WRAP_SIGNAL(bool query_tooltip(int x, int y, bool keyboard_tooltip, const Glib::RefPtr<Tooltip>&
tooltip), "query_tooltip")
//(This was added to GTK+ 2.8 but forgotten by us until gtkmm 2.13/14):
- _WRAP_SIGNAL(bool grab_broken_event(GdkEventGrabBroken* grab_broken_event), "grab_broken_event",
no_default_handler)
+ _WRAP_SIGNAL(bool grab_broken_event(GdkEventGrabBroken* grab_broken_event), "grab_broken_event")
- // TODO: Remove no_default_handler when we can break ABI:
- _WRAP_SIGNAL(bool touch_event(GdkEventTouch* touch_event), "touch_event", no_default_handler)
+ _WRAP_SIGNAL(bool touch_event(GdkEventTouch* touch_event), "touch_event")
_WRAP_PROPERTY("name", Glib::ustring)
_WRAP_PROPERTY("parent", Container*)
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index d10615e..3665e76 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -87,8 +87,7 @@ public:
_WRAP_SIGNAL(void set_focus(Widget* focus), "set_focus")
- //TODO: Remove no_default_handler when we can break ABI:
- _WRAP_SIGNAL(void keys_changed(), "keys_changed", no_default_handler)
+ _WRAP_SIGNAL(void keys_changed(), "keys_changed")
//Keybinding signals:
_IGNORE_SIGNAL("activate_focus")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]