[gtkmm] Gtk: Add DragIcon::create_widget_for_value(), remove enum PlacesOpenFlags
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Gtk: Add DragIcon::create_widget_for_value(), remove enum PlacesOpenFlags
- Date: Mon, 9 Nov 2020 15:59:20 +0000 (UTC)
commit 0544d2571692a69064c2e6f2a5fc601009d2080f
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Mon Nov 9 16:56:25 2020 +0100
Gtk: Add DragIcon::create_widget_for_value(), remove enum PlacesOpenFlags
* gdk/src/gdk_docs_override.xml:
* gtk/src/gtk_docs_override.xml:
* gtk/src/gtk_extra_objects.defs: Remove obsolete entries.
* gtk/src/dragicon.hg: Add create_widget_for_value().
* gtk/src/enums.hg:
* tools/m4/convert_gtk.m4: Remove enum PlacesOpenFlags.
gdk/src/gdk_docs_override.xml | 22 +-----
gtk/src/dragicon.hg | 6 +-
gtk/src/enums.hg | 1 -
gtk/src/gtk_docs_override.xml | 162 +----------------------------------------
gtk/src/gtk_extra_objects.defs | 24 ------
tools/m4/convert_gtk.m4 | 1 -
6 files changed, 4 insertions(+), 212 deletions(-)
---
diff --git a/gdk/src/gdk_docs_override.xml b/gdk/src/gdk_docs_override.xml
index 5ea596c2..f907622f 100644
--- a/gdk/src/gdk_docs_override.xml
+++ b/gdk/src/gdk_docs_override.xml
@@ -77,7 +77,7 @@
<substitute_enumerator_name from="GDK_BUTTON_SECONDARY" to="GDK_BUTTON_SECONDARY" />
<function name="gdk_display_manager_list_displays">
-<return> a list of #GdkDisplay objects.
+<return> a vector of #GdkDisplay objects.
</return>
</function>
@@ -119,24 +119,4 @@ Since: 2.14
</description>
</function>
-<!-- TODO: Remove this function description when gtk's description has been -->
-<!-- fixed. @event: (transfer none) instead of @event (transfer none): -->
-<function name="gdk_display_put_event">
-<description>
-Appends the given event onto the front of the event
-queue for @display.
-</description>
-<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
-</parameter_description>
-</parameter>
-<parameter name="event">
-<parameter_description> a #GdkEvent
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
</root>
diff --git a/gtk/src/dragicon.hg b/gtk/src/dragicon.hg
index d53aa22d..95554ec0 100644
--- a/gtk/src/dragicon.hg
+++ b/gtk/src/dragicon.hg
@@ -63,10 +63,8 @@ public:
const Glib::RefPtr<Gdk::Paintable>& paintable, int hot_x, int hot_y),
gtk_drag_icon_set_from_paintable)
- //TODO: Is gtk_drag_icon_create_widget_for_value() internal to gtk?
- // It lacks GDK_AVAILABLE_IN_ALL.
- //_WRAP_METHOD(static Widget* create_widget_for_value(const Glib::ValueBase& value),
- // gtk_drag_icon_create_widget_for_value)
+ _WRAP_METHOD(static Widget* create_widget_for_value(const Glib::ValueBase& value),
+ gtk_drag_icon_create_widget_for_value)
_WRAP_PROPERTY("child", Widget*)
};
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 27cdf8a1..918bc864 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -42,7 +42,6 @@ _WRAP_ENUM(Overflow, GtkOverflow, decl_prefix GTKMM_API)
_WRAP_ENUM(CornerType, GtkCornerType, decl_prefix GTKMM_API)
_WRAP_ENUM(PackType, GtkPackType, decl_prefix GTKMM_API)
_WRAP_ENUM(PickFlags, GtkPickFlags, decl_prefix GTKMM_API)
-_WRAP_ENUM(PlacesOpenFlags, GtkPlacesOpenFlags, decl_prefix GTKMM_API)
_WRAP_ENUM(PolicyType, GtkPolicyType, decl_prefix GTKMM_API)
_WRAP_ENUM(PositionType, GtkPositionType, decl_prefix GTKMM_API)
_WRAP_ENUM(RevealerTransitionType, GtkRevealerTransitionType, decl_prefix GTKMM_API)
diff --git a/gtk/src/gtk_docs_override.xml b/gtk/src/gtk_docs_override.xml
index 3e032911..291ef54a 100644
--- a/gtk/src/gtk_docs_override.xml
+++ b/gtk/src/gtk_docs_override.xml
@@ -62,7 +62,6 @@
<substitute_enumerator_name from_prefix="GTK_RESPONSE_" to_prefix="Gtk::ResponseType::" />
<substitute_enumerator_name from_prefix="GTK_INPUT_PURPOSE_" to_prefix="Gtk::InputPurpose::" />
<substitute_enumerator_name from_prefix="GTK_IMAGE_" to_prefix="Gtk::Image::Type::" />
-<substitute_enumerator_name from_prefix="GTK_PLACES_OPEN_" to_prefix="Gtk::PlacesOpenFlags::" />
<substitute_enumerator_name from_prefix="GTK_SELECTION_" to_prefix="Gtk::SelectionMode::" />
<substitute_enumerator_name from_prefix="GTK_WIN_POS_" to_prefix="Gtk::WindowPosition::" />
<substitute_enumerator_name from_prefix="GTK_WINDOW_" to_prefix="Gtk::WindowType::" />
@@ -115,7 +114,6 @@
<substitute_enumerator_name from_prefix="GTK_MESSAGE_" to_prefix="Gtk::MessageType::" />
<substitute_enumerator_name from_prefix="GDK_SURFACE_TYPE_HINT_" to_prefix="Gdk::Surface::TypeHint::" />
<substitute_enumerator_name from_prefix="GTK_BUTTON_ROLE_" to_prefix="Gtk::ButtonRole::" />
-<substitute_enumerator_name from_prefix="GTK_POPOVER_CONSTRAINT_" to_prefix="Gtk::Popover::Constraint::" />
<substitute_enumerator_name from_prefix="GTK_RECENT_SORT_" to_prefix="Gtk::RecentSortType::" />
<substitute_enumerator_name from_prefix="GTK_REVEALER_TRANSITION_TYPE_"
to_prefix="Gtk::RevealerTransitionType::" />
<substitute_enumerator_name from_prefix="GTK_SCROLL_" to_prefix="Gtk::Scrollabel::Policy::" />
@@ -371,14 +369,7 @@ Returns a list of all the #GtkTreeViewColumn s currently in @tree_view.
</description>
</function>
-<function name="gtk_window_get_default_icon_list">
-<description>
-Gets the value set by Gtk::Window::set_default_icon_list().
-</description>
-</function>
-
-
-<function name="gtk_window_set_default">
+<function name="gtk_window_set_default_widget">
<parameters>
<parameter name="window">
<parameter_description> a #GtkWindow
@@ -664,66 +655,6 @@ gtk_widget_grab_focus() instead of this function.
</return>
</function>
-<!-- gmmproc is confused if the GError** parameter is not called "error" -->
-<function name="gtk_window_set_icon_from_file">
-<description>
-Sets the icon for the window.
-
-This function is equivalent to calling gtk_window_set_icon()
-with a pixbuf created by loading the image from @filename.
-</description>
-<parameters>
-<parameter name="window">
-<parameter_description> a #GtkWindow
-</parameter_description>
-</parameter>
-<parameter name="filename">
-<parameter_description> location of icon file
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> location to store error, or %NULL.
-</parameter_description>
-</parameter>
-</parameters>
-</function>
-
-<function name="gtk_window_get_position">
-<parameters>
-<parameter name="window">
-<parameter_description> a #GtkWindow
-</parameter_description>
-</parameter>
-<parameter name="root_x">
-<parameter_description> return location for X coordinate of gravity-determined reference point
-</parameter_description>
-</parameter>
-<parameter name="root_y">
-<parameter_description> return location for Y coordinate of gravity-determined reference point
-</parameter_description>
-</parameter>
-</parameters>
-</function>
-
-<!-- gmmproc is confused if the GError** parameter is not called "error" -->
-<function name="gtk_window_set_default_icon_from_file">
-<description>
-Sets an icon to be used as fallback for windows that haven't
-had gtk_window_set_icon_list() called on them from a file
-on disk.
-</description>
-<parameters>
-<parameter name="filename">
-<parameter_description> location of icon file
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> location to store error, or %NULL.
-</parameter_description>
-</parameter>
-</parameters>
-</function>
-
<function name="gtk_drag_check_threshold">
<mapping class="Widget" />
</function>
@@ -1395,17 +1326,6 @@ See also gtk_editable_get_chars().
</function>
-<function name="gtk_selection_data_get_uris">
-<description>
-Gets the contents of the selection data as a vector of URIs.
-
-Since: 2.6
-</description>
-<return>If the selection data contains a list of
-URIs, a vector containing the URIs, otherwise an empty vector.
-</return>
-</function>
-
<function name="gtk_builder_get_objects">
<description>
Gets all objects that have been constructed by the Gtk::Builder.
@@ -1470,84 +1390,4 @@ pointer buttons. See #GdkModifierType.
<return></return>
</signal>
-<!-- TODO: Remove this function description when gtk+'s description contains -->
-<!-- the correct number of parameters (@enable_undo). -->
-<function name="gtk_text_buffer_set_enable_undo">
-<description>
-Sets whether or not to enable undoable actions in the text buffer. If
-enabled, the user will be able to undo the last number of actions up to
-gtk_text_buffer_get_max_undo_levels().
-
-See gtk_text_buffer_begin_irreversible_action() and
-gtk_text_buffer_end_irreversible_action() to create changes to the buffer
-that cannot be undone.
-
-</description>
-<parameters>
-<parameter name="buffer">
-<parameter_description> a #GtkTextBuffer
-</parameter_description>
-</parameter>
-<parameter name="enable_undo">
-<parameter_description> %TRUE to enable undoable actions
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<!-- TODO: Remove this signal description when gtk's description contains -->
-<!-- the correct class name (not GtkWidget). -->
-<signal name="GtkDropTarget::accept">
-<description>
-The ::accept signal is emitted on the drop site when the user
-moves the cursor over the widget during a drag. The signal handler
-must determine whether the cursor position is in a drop zone or not.
-If it is not in a drop zone, it returns %FALSE and no further processing
-is necessary. Otherwise, the handler returns %TRUE. In this case, the
-handler is responsible for providing the necessary information for
-displaying feedback to the user, by calling gdk_drag_status().
-
-The default handler for this signal decides whether to accept the drop
-based on the type of the data.
-
-If the decision whether the drop will be accepted or rejected can't be
-made based solely the data format, handler may inspect the dragged data
-by calling one of the #GdkDrop read functions and return %TRUE to
-tentatively accept the drop. When the data arrives and is found to not be
-acceptable, a call to gtk_drop_target_deny_drop() should be made to reject
-the drop.
-</description>
-<parameters>
-<parameter name="dest">
-<parameter_description> the #GtkDropTarget
-</parameter_description>
-</parameter>
-<parameter name="drop">
-<parameter_description> the #GdkDrop
-</parameter_description>
-</parameter>
-</parameters>
-<return> whether the cursor position is in a drop zone
-</return>
-</signal>
-
-<!-- TODO: Remove this function description when gtk+'s description contains -->
-<!-- the correct number of parameters (no @drop). -->
-<signal name="GtkDropTarget::leave">
-<description>
-The ::leave signal is emitted on the drop site when the pointer
-leaves the widget. Its main purpose it to undo things done in
-#GtkDropTarget::enter.
-
-</description>
-<parameters>
-<parameter name="self">
-<parameter_description> the #GtkDropTarget
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</signal>
-
</root>
diff --git a/gtk/src/gtk_extra_objects.defs b/gtk/src/gtk_extra_objects.defs
index 9daa5483..d00f47ef 100644
--- a/gtk/src/gtk_extra_objects.defs
+++ b/gtk/src/gtk_extra_objects.defs
@@ -12,24 +12,12 @@
(gtype-id "GTK_TYPE_ABOUT_DIALOG")
)
-(define-object AccelLabel
- (in-module "Gtk")
- (c-name "GtkAccelLabel")
- (gtype-id "GTK_TYPE_ACCEL_LABEL")
-)
-
(define-object Actionable
(in-module "Gtk")
(c-name "GtkActionable")
(gtype-id "GTK_TYPE_ACTIONABLE")
)
-(define-object AccelMap
- (in-module "Gtk")
- (c-name "GtkAccelMap")
- (gtype-id "GTK_TYPE_ACCEL_MAP")
-)
-
(define-object AlternativeTrigger
(in-module "Gtk")
(c-name "GtkAlternativeTrigger")
@@ -436,12 +424,6 @@
(gtype-id "GTK_TYPE_PICTURE")
)
-(define-object PlacesSidebar
- (in-module "Gtk")
- (c-name "GtkPlacesSidebar")
- (gtype-id "GTK_TYPE_PLACES_SIDEBAR")
-)
-
(define-object PopoverMenu
(in-module "Gtk")
(c-name "GtkPopoverMenu")
@@ -520,12 +502,6 @@
(gtype-id "GTK_TYPE_SEARCH_BAR")
)
-(define-object SelectionData
- (in-module "Gtk")
- (c-name "GtkSelectionData")
- (gtype-id "GTK_TYPE_SELECTION_DATA")
-)
-
(define-object SelectionModel
(in-module "Gtk")
(c-name "GtkSelectionModel")
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index a706e205..57a7bea5 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -68,7 +68,6 @@ _CONV_ENUM(Gtk,Overflow)
_CONV_ENUM(Gtk,PackType)
_CONV_ENUM(Gtk,PanDirection)
_CONV_ENUM(Gtk,PickFlags)
-_CONV_ENUM(Gtk,PlacesOpenFlags)
_CONV_ENUM(Gtk,PolicyType)
_CONV_INCLASS_ENUM(Gtk,Popover,Constraint)
_CONV_INCLASS_ENUM(Gtk,PopoverMenu,Flags)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]