GNOME.org
 

[gtkmm] Gdk, Gtk: Update for the latest gtk4 (Add CssLocation, etc.)

commit fd0ab1efa34c0f4fd1f46561be5064ff2fb711f8
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Thu Apr 25 15:26:22 2019 +0200

    Gdk, Gtk: Update for the latest gtk4 (Add CssLocation, etc.)
    
    * gdk/src/surface.[ccg|hg]: Remove set/get_group(), invalidate_rect(),
    invalidate(), invalidate_region(), set_skip_taskbar_hint(),
    set_skip_pager_hint(), set_urgency_hint().
    * gtk/src/csslocation.[ccg|hg]: New files.
    * gtk/src/cssprovider.hg: Replace CssProviderError by CssParserError and
    CssParserWarning. Replace get_named() by load_named().
    * gtk/src/csssection.[ccg|hg]: Remove enum CssSection::Type. Add create()
    and to_string(). Replace get_[start|ned]_[line|position]() by
    get_[start|end]_location().
    * gtk/src/enums.hg: Add PickFlags.
    * gtk/src/listbox.hg: Add set/get/property_show_separators().
    * gtk/src/menubar.hg: Remove enum PackDirection. Remove
    set/get/property_pack_direction(), set/get/property_child_pack_direction().
    * gtk/src/widget.hg: Replace set/get/property_can_pick() by
    set/get/property_can_target(). Remove pick_vfunc(), set/get_parent_surface().
    Add PickFlags argument to pick().
    * gtk/src/window.hg: Remove set/get/property_skip_taskbar_hint(),
    set/get/property_skip_pager_hint(), set/get/property_urgency_hint().

 .gitignore              |  2 ++
 gdk/src/surface.ccg     |  5 ---
 gdk/src/surface.hg      | 25 -------------
 gtk/src/csslocation.ccg | 50 ++++++++++++++++++++++++++
 gtk/src/csslocation.hg  | 96 +++++++++++++++++++++++++++++++++++++++++++++++++
 gtk/src/cssprovider.hg  |  9 +++--
 gtk/src/csssection.ccg  |  2 --
 gtk/src/csssection.hg   | 23 +++++++-----
 gtk/src/enums.hg        |  1 +
 gtk/src/filelist.am     |  1 +
 gtk/src/listbox.hg      |  4 +++
 gtk/src/menubar.hg      | 10 ------
 gtk/src/widget.hg       | 15 +++-----
 gtk/src/window.hg       | 12 -------
 tools/m4/convert_gtk.m4 |  8 +++--
 15 files changed, 183 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c210c69..927cda83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,6 +225,8 @@ gtk/gtkmm/comboboxtext.cc
 gtk/gtkmm/comboboxtext.h
 gtk/gtkmm/container.cc
 gtk/gtkmm/container.h
+gtk/gtkmm/csslocation.cc
+gtk/gtkmm/csslocation.h
 gtk/gtkmm/cssprovider.cc
 gtk/gtkmm/cssprovider.h
 gtk/gtkmm/csssection.cc
diff --git a/gdk/src/surface.ccg b/gdk/src/surface.ccg
index 9e740e13..5c8c9ae6 100644
--- a/gdk/src/surface.ccg
+++ b/gdk/src/surface.ccg
@@ -45,11 +45,6 @@ void Surface::unset_icon()
   gdk_surface_set_icon_name(gobj(), nullptr); /* See GDK docs */
 }
 
-void Surface::invalidate()
-{
-  gdk_surface_invalidate_rect(gobj(), nullptr);
-}
-
 void Surface::restack(bool above)
 {
   gdk_surface_restack(gobj(), nullptr, above);
diff --git a/gdk/src/surface.hg b/gdk/src/surface.hg
index f5c0cf6e..6afc838e 100644
--- a/gdk/src/surface.hg
+++ b/gdk/src/surface.hg
@@ -187,10 +187,6 @@ public:
   void unset_icon();
   _WRAP_METHOD(void set_icon_name(const Glib::ustring& name), gdk_surface_set_icon_name)
 
-  _WRAP_METHOD(void set_group(const Glib::RefPtr<Surface>& leader), gdk_surface_set_group)
-  _WRAP_METHOD(Glib::RefPtr<Surface> get_group(), gdk_surface_get_group)
-  _WRAP_METHOD(Glib::RefPtr<const Surface> get_group() const, gdk_surface_get_group, constversion)
-
   _WRAP_METHOD(void set_decorations(WMDecoration decorations), gdk_surface_set_decorations)
   _WRAP_METHOD(bool get_decorations(WMDecoration& decorations) const, gdk_surface_get_decorations)
   _WRAP_METHOD(void set_functions(WMFunction functions), gdk_surface_set_functions)
@@ -221,33 +217,12 @@ public:
 
   _WRAP_METHOD(void queue_expose(), gdk_surface_queue_expose)
 
-  /** A convenience wrapper around invalidate_region() which
-   * invalidates a rectangular region. See invalidate_region() for details.
-   * See also the invalidate() method with no rect parameter, to
-   * invalidate the whole surface.
-   *
-   * @param rect Rectangle to invalidate.
-   */
-  _WRAP_METHOD(void invalidate_rect(const Rectangle& rect), gdk_surface_invalidate_rect)
-
-  /** A convenience wrapper around invalidate_region() which
-   * invalidates the whole surface. See invalidate_region() for details.
-   */
-  void invalidate();
-
-  _WRAP_METHOD(void invalidate_region(const ::Cairo::RefPtr< ::Cairo::Region>& region), 
gdk_surface_invalidate_region)
-
   _WRAP_METHOD(void freeze_updates(), gdk_surface_freeze_updates)
   _WRAP_METHOD(void thaw_updates(), gdk_surface_thaw_updates)
 
   _WRAP_METHOD(static void constrain_size(const Geometry& geometry, Hints flags,
     int width, int height, int& new_width, int& new_height), gdk_surface_constrain_size)
 
-  _WRAP_METHOD(void set_skip_taskbar_hint(bool skips_taskbar = true), gdk_surface_set_skip_taskbar_hint)
-  _WRAP_METHOD(void set_skip_pager_hint(bool skips_pager = true), gdk_surface_set_skip_pager_hint)
-
-  _WRAP_METHOD(void set_urgency_hint(bool urgent = true), gdk_surface_set_urgency_hint)
-
   _WRAP_METHOD(void fullscreen(), gdk_surface_fullscreen)
   _WRAP_METHOD(void fullscreen_on_monitor(const Glib::RefPtr<Monitor>& monitor), 
gdk_surface_fullscreen_on_monitor)
   _WRAP_METHOD(void set_fullscreen_mode(FullscreenMode mode), gdk_surface_set_fullscreen_mode)
diff --git a/gtk/src/csslocation.ccg b/gtk/src/csslocation.ccg
new file mode 100644
index 00000000..a050975a
--- /dev/null
+++ b/gtk/src/csslocation.ccg
@@ -0,0 +1,50 @@
+/* Copyright (C) 2019 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Gtk
+{
+
+CssLocation::CssLocation()
+: gobject_{}
+{
+}
+
+CssLocation::CssLocation(const GtkCssLocation* location)
+: gobject_(*location)
+{
+}
+
+CssLocation::CssLocation(std::size_t bytes, std::size_t chars,
+  std::size_t lines, std::size_t line_bytes, std::size_t line_chars)
+{
+  gobject_.bytes = bytes;
+  gobject_.chars = chars;
+  gobject_.lines = lines;
+  gobject_.line_bytes = line_bytes;
+  gobject_.line_chars = line_chars;
+}
+
+} // namespace Gtk
+
+namespace Glib
+{
+
+Gtk::CssLocation wrap(const GtkCssLocation* object)
+{
+  return Gtk::CssLocation(object);
+}
+
+} // namespace Glib
diff --git a/gtk/src/csslocation.hg b/gtk/src/csslocation.hg
new file mode 100644
index 00000000..9635ef68
--- /dev/null
+++ b/gtk/src/csslocation.hg
@@ -0,0 +1,96 @@
+/* Copyright (C) 2019 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
+#include <cstddef> // std::size_t
+
+_DEFS(gtkmm,gtk)
+
+namespace Gtk
+{
+/** Presents a location in a file - or other source of data parsed by the CSS engine.
+ * 
+ * The @a bytes and @a line_bytes offsets are meant to be used to
+ * programmatically match data. The @a lines and @a line_chars offsets
+ * can be used for printing the location in a file.
+ *
+ * Note that the @a lines parameter starts from 0 and is increased
+ * whenever a CSS line break is encountered. (CSS defines the C character
+ * sequences "\r\n", "\r", "\n" and "\f" as newlines.)
+ * If your document uses different rules for line breaking, you might
+ * run into problems here.
+ *
+ * @newin{3,96}
+ */
+class CssLocation
+{
+  _CLASS_GENERIC(CssLocation, GtkCssLocation)
+public:
+
+  CssLocation();
+  CssLocation(const GtkCssLocation* location);
+  CssLocation(std::size_t bytes, std::size_t chars, std::size_t lines,
+    std::size_t line_bytes, std::size_t line_chars);
+
+#m4 _EQUAL(gsize, std::size_t)
+  /** @returns Number of bytes parsed since the beginning.
+   */
+  _MEMBER_GET(bytes, bytes, std::size_t, gsize)
+  _MEMBER_SET(bytes, bytes, std::size_t, gsize)
+
+  /** @returns Number of characters parsed since the beginning.
+   */
+  _MEMBER_GET(chars, chars, std::size_t, gsize)
+  _MEMBER_SET(chars, chars, std::size_t, gsize)
+
+  /** @returns Number of full lines that have been parsed.
+   *           If you want to display this as a line number, you
+   *           need to add 1 to this.
+   */
+  _MEMBER_GET(lines, lines, std::size_t, gsize)
+  _MEMBER_SET(lines, lines, std::size_t, gsize)
+
+  /** @returns Number of bytes parsed since the last line break.
+   */
+  _MEMBER_GET(line_bytes, line_bytes, std::size_t, gsize)
+  _MEMBER_SET(line_bytes, line_bytes, std::size_t, gsize)
+
+  /** @returns Number of characters parsed since the last line break.
+   */
+  _MEMBER_GET(line_chars, line_chars, std::size_t, gsize)
+  _MEMBER_SET(line_chars, line_chars, std::size_t, gsize)
+
+  GtkCssLocation*       gobj()       { return &gobject_; }
+  const GtkCssLocation* gobj() const { return &gobject_; }
+
+protected:
+  GtkCssLocation gobject_;
+};
+
+} // namespace Gtk
+
+namespace Glib
+{
+  /** A Glib::wrap() method for this object.
+   *
+   * @param object The C instance.
+   * @result A C++ instance that wraps a copy of this C instance.
+   *
+   * @relates Gtk::CssLocation
+   */
+Gtk::CssLocation wrap(const GtkCssLocation* object);
+
+} // namespace Glib
diff --git a/gtk/src/cssprovider.hg b/gtk/src/cssprovider.hg
index d995c39b..da5be23c 100644
--- a/gtk/src/cssprovider.hg
+++ b/gtk/src/cssprovider.hg
@@ -26,9 +26,8 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Gtk
 {
-/** Exception class for Gtk::CssProvider errors.
- */
-_WRAP_GERROR(CssProviderError, GtkCssProviderError, GTK_CSS_PROVIDER_ERROR, newin "3,16")
+_WRAP_GERROR(CssParserError, GtkCssParserError, GTK_CSS_PARSER_ERROR, newin "3,96")
+_WRAP_GERROR(CssParserWarning, GtkCssParserWarning, GTK_CSS_PARSER_WARNING, newin "3,96")
 
 /** CSS-like styling for widgets, implementing the StyleProvider base class.
  *
@@ -69,13 +68,13 @@ public:
   _WRAP_METHOD(void load_from_path(const std::string& path), gtk_css_provider_load_from_path)
   _WRAP_METHOD(void load_from_resource(const std::string& resource_path), 
gtk_css_provider_load_from_resource)
 
-  _WRAP_METHOD(static Glib::RefPtr<CssProvider> get_named(const Glib::ustring& name, const Glib::ustring& 
variant), gtk_css_provider_get_named, refreturn)
+  _WRAP_METHOD(void load_named(const Glib::ustring& name, const Glib::ustring& variant{NULL}), 
gtk_css_provider_load_named)
 
 #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.
+  /** @param error The parsing error. The referenced object may belong to a subclass of Glib::Error, such as 
Gtk::CssParserError.
    */
   _WRAP_SIGNAL(void parsing_error(const Glib::RefPtr<const CssSection>& section, const Glib::Error& error), 
"parsing-error", custom_c_callback)
 
diff --git a/gtk/src/csssection.ccg b/gtk/src/csssection.ccg
index 5d782892..17383569 100644
--- a/gtk/src/csssection.ccg
+++ b/gtk/src/csssection.ccg
@@ -15,5 +15,3 @@
  */
 
 #include <gtk/gtk.h>
-
-using Type = Gtk::CssSection::Type;
diff --git a/gtk/src/csssection.hg b/gtk/src/csssection.hg
index 8f035f0c..e917afa2 100644
--- a/gtk/src/csssection.hg
+++ b/gtk/src/csssection.hg
@@ -16,6 +16,7 @@
 
 #include <glibmm/refptr.h>
 #include <giomm/file.h>
+#include <gtkmm/csslocation.h>
 
 _DEFS(gtkmm,gtk)
 
@@ -30,8 +31,7 @@ namespace Gtk
  * Because sections are nested into one another, you can use get_parent()
  * to get the containing region.
  *
- * There is no public method that creates a CssSection, but it is input data to
- * a Gtk::CssProvider::signal_parsing_error() handler.
+ * A %CssSection is input data to a Gtk::CssProvider::signal_parsing_error() handler.
  *
  * @newin{3,16}
  */
@@ -41,17 +41,24 @@ class CssSection final
   _IGNORE(gtk_css_section_ref, gtk_css_section_unref)
 
 public:
-  _WRAP_ENUM(Type, GtkCssSectionType)
+  _WRAP_METHOD(static Glib::RefPtr<CssSection> create(const Glib::RefPtr<Gio::File>& file,
+    const CssLocation& start, const CssLocation& end), gtk_css_section_new)
 
-  _WRAP_METHOD(Type get_section_type() const, gtk_css_section_get_section_type)
+  /** Prints the section into a human-readable text form.
+   *
+   * This is a form like `gtk.css:32:1-23` to denote line 32,
+   * characters 1 to 23 in the file gtk.css.
+   *
+   * @return A new string.
+   */
+  _WRAP_METHOD(Glib::ustring to_string() const, gtk_css_section_to_string)
+  _IGNORE(gtk_css_section_print)
   _WRAP_METHOD(Glib::RefPtr<CssSection> get_parent(), gtk_css_section_get_parent, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const CssSection> get_parent() const, gtk_css_section_get_parent, refreturn, 
constversion)
   _WRAP_METHOD(Glib::RefPtr<Gio::File> get_file(), gtk_css_section_get_file, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gio::File> get_file() const, gtk_css_section_get_file, refreturn, 
constversion)
-  _WRAP_METHOD(unsigned int get_start_line() const, gtk_css_section_get_start_line)
-  _WRAP_METHOD(unsigned int get_start_position() const, gtk_css_section_get_start_position)
-  _WRAP_METHOD(unsigned int get_end_line() const, gtk_css_section_get_end_line)
-  _WRAP_METHOD(unsigned int get_end_position() const, gtk_css_section_get_end_position)
+  _WRAP_METHOD(CssLocation get_start_location() const, gtk_css_section_get_start_location)
+  _WRAP_METHOD(CssLocation get_end_location() const, gtk_css_section_get_end_location)
 };
 
 } // namespace Gtk
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 09b8a262..1909978c 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -41,6 +41,7 @@ _WRAP_ENUM(Orientation, GtkOrientation)
 _WRAP_ENUM(Overflow, GtkOverflow)
 _WRAP_ENUM(CornerType, GtkCornerType)
 _WRAP_ENUM(PackType, GtkPackType)
+_WRAP_ENUM(PickFlags, GtkPickFlags)
 _WRAP_ENUM(PlacesOpenFlags, GtkPlacesOpenFlags)
 _WRAP_ENUM(PolicyType, GtkPolicyType)
 _WRAP_ENUM(PositionType, GtkPositionType)
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 5f710fcf..e600c89d 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -59,6 +59,7 @@ gtkmm_files_any_hg =          \
        combobox.hg             \
        comboboxtext.hg         \
        container.hg            \
+       csslocation.hg          \
        cssprovider.hg          \
        csssection.hg           \
        dialog.hg               \
diff --git a/gtk/src/listbox.hg b/gtk/src/listbox.hg
index a5cfe6ef..f3724cb4 100644
--- a/gtk/src/listbox.hg
+++ b/gtk/src/listbox.hg
@@ -323,9 +323,13 @@ public:
   void bind_list_store(const Glib::RefPtr<Gio::ListStore<T_item>>& store,
     T_slot&& slot_create_widget);
 
+  _WRAP_METHOD(void set_show_separators(bool show_separators = true), gtk_list_box_set_show_separators)
+  _WRAP_METHOD(bool get_show_separators() const, gtk_list_box_get_show_separators)
+
   _WRAP_PROPERTY("selection-mode", SelectionMode)
   _WRAP_PROPERTY("activate-on-single-click", bool)
   _WRAP_PROPERTY("accept-unpaired-release", bool)
+  _WRAP_PROPERTY("show-separators", bool)
 
   _WRAP_SIGNAL(void row_selected(ListBoxRow* row), row-selected)
   _WRAP_SIGNAL(void row_activated(ListBoxRow* row), row-activated)
diff --git a/gtk/src/menubar.hg b/gtk/src/menubar.hg
index 45e79e6d..2b3614f3 100644
--- a/gtk/src/menubar.hg
+++ b/gtk/src/menubar.hg
@@ -25,8 +25,6 @@ _PINCLUDE(gtkmm/private/menushell_p.h)
 namespace Gtk
 {
 
-_WRAP_ENUM(PackDirection, GtkPackDirection)
-
 /** A standard menu bar which usually holds Gtk::Menu submenu items.
  * The useful methods are in the base class - Gtk::MenuShell.
  *
@@ -61,16 +59,8 @@ public:
   explicit MenuBar(const Glib::RefPtr<Gio::MenuModel>& model);
   _IGNORE(gtk_menu_bar_new_from_model)
 
-  _WRAP_METHOD(PackDirection get_pack_direction () const, gtk_menu_bar_get_pack_direction)
-  _WRAP_METHOD(void set_pack_direction(PackDirection pack_dir), gtk_menu_bar_set_pack_direction)
-  _WRAP_METHOD(PackDirection get_child_pack_direction() const, gtk_menu_bar_get_child_pack_direction)
-  _WRAP_METHOD(void set_child_pack_direction(PackDirection child_pack_dir), 
gtk_menu_bar_set_child_pack_direction)
-
   // append, prepend and insert are defined in menushell
 
-  _WRAP_PROPERTY("pack-direction", PackDirection)
-  _WRAP_PROPERTY("child-pack-direction", PackDirection)
-
 private:
   void init_accels_handler_(void);
 };
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index b8ca4036..5717aea2 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -179,8 +179,8 @@ public:
   _WRAP_METHOD(void grab_focus(), gtk_widget_grab_focus)
   _WRAP_METHOD(void set_focus_on_click(bool focus_on_click = true), gtk_widget_set_focus_on_click)
   _WRAP_METHOD(bool get_focus_on_click() const, gtk_widget_get_focus_on_click)
-  _WRAP_METHOD(void set_can_pick(bool can_pick = true), gtk_widget_set_can_pick)
-  _WRAP_METHOD(bool get_can_pick() const, gtk_widget_get_can_pick)
+  _WRAP_METHOD(void set_can_target(bool can_target = true), gtk_widget_set_can_target)
+  _WRAP_METHOD(bool get_can_target() const, gtk_widget_get_can_target)
   _WRAP_METHOD(void set_can_default(bool can_default = true), gtk_widget_set_can_default)
   _WRAP_METHOD(bool get_can_default() const, gtk_widget_get_can_default)
   _WRAP_METHOD(bool has_default() const, gtk_widget_has_default)
@@ -267,10 +267,6 @@ public:
   _WRAP_METHOD(Root* get_root(), gtk_widget_get_root)
   _WRAP_METHOD(const Root* get_root() const, gtk_widget_get_root, constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<Gdk::Surface> get_parent_surface(), gtk_widget_get_parent_surface, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Gdk::Surface> get_parent_surface() const, gtk_widget_get_parent_surface, 
refreturn, constversion)
-  _WRAP_METHOD(void set_parent_surface(const Glib::RefPtr<const Gdk::Surface>& parent_surface), 
gtk_widget_set_parent_surface)
-
   _WRAP_METHOD(bool child_focus(DirectionType direction), gtk_widget_child_focus)
 
   _WRAP_METHOD(bool keynav_failed(DirectionType direction), gtk_widget_keynav_failed)
@@ -352,8 +348,8 @@ public:
                                               int& dest_x, int& dest_y), gtk_widget_translate_coordinates)
 
   _WRAP_METHOD(bool contains(double x, double y) const, gtk_widget_contains)
-  _WRAP_METHOD(Widget* pick(double x, double y), gtk_widget_pick)
-  _WRAP_METHOD(const Widget* pick(double x, double y) const, gtk_widget_pick, constversion)
+  _WRAP_METHOD(Widget* pick(double x, double y, PickFlags flags = PickFlags::DEFAULT), gtk_widget_pick)
+  _WRAP_METHOD(const Widget* pick(double x, double y, PickFlags flags = PickFlags::DEFAULT) const, 
gtk_widget_pick, constversion)
 
   _WRAP_METHOD_DOCS_ONLY(gtk_widget_add_controller)
   void add_controller(const Glib::RefPtr<EventController>& controller);
@@ -730,7 +726,7 @@ dnl
   _WRAP_PROPERTY("can_focus", bool)
   _WRAP_PROPERTY("has_focus", bool)
   _WRAP_PROPERTY("is_focus", bool)
-  _WRAP_PROPERTY("can_pick", bool)
+  _WRAP_PROPERTY("can_target", bool)
   _WRAP_PROPERTY("focus_on_click", bool)
   _WRAP_PROPERTY("can_default", bool)
   _WRAP_PROPERTY("has_default", bool)
@@ -772,7 +768,6 @@ protected:
   _WRAP_VFUNC(void compute_expand(bool& hexpand_p, bool& vexpand_p), compute_expand,
     custom_vfunc_callback, custom_vfunc)
   _WRAP_VFUNC(bool contains(double x, double y) const, contains)
-  _WRAP_VFUNC(Widget* pick(double x, double y), pick)
 
 #m4 _CONVERSION(`GtkSnapshot*',`const Glib::RefPtr<Gtk::Snapshot>&',`Glib::wrap_gtk_snapshot($3, true)')
   _WRAP_VFUNC(void snapshot(const Glib::RefPtr<Gtk::Snapshot>& snapshot), snapshot)
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 8887e5dc..423a5890 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -75,12 +75,9 @@ public:
   _WRAP_PROPERTY("display", Glib::RefPtr<Gdk::Display>)
   _WRAP_PROPERTY("is_active", bool)
   _WRAP_PROPERTY("type_hint", Gdk::Surface::TypeHint)
-  _WRAP_PROPERTY("skip_taskbar_hint", bool)
-  _WRAP_PROPERTY("skip_pager_hint", bool)
   _WRAP_PROPERTY("decorated", bool)
   _WRAP_PROPERTY("transient_for", Window*)
 
-  _WRAP_PROPERTY("urgency_hint", bool)
   _WRAP_PROPERTY("accept-focus", bool)
   _WRAP_PROPERTY("focus-on-map", bool)
   _WRAP_PROPERTY("deletable", bool)
@@ -167,15 +164,6 @@ dnl
   _WRAP_METHOD(void set_type_hint(Gdk::Surface::TypeHint hint), gtk_window_set_type_hint)
   _WRAP_METHOD(Gdk::Surface::TypeHint get_type_hint() const, gtk_window_get_type_hint)
 
-  _WRAP_METHOD(void set_skip_taskbar_hint(bool setting = true), gtk_window_set_skip_taskbar_hint)
-  _WRAP_METHOD(bool get_skip_taskbar_hint() const, gtk_window_get_skip_taskbar_hint)
-
-  _WRAP_METHOD(void set_skip_pager_hint(bool setting = true), gtk_window_set_skip_pager_hint)
-  _WRAP_METHOD(bool get_skip_pager_hint() const, gtk_window_get_skip_pager_hint)
-
-  _WRAP_METHOD(void set_urgency_hint(bool setting = true), gtk_window_set_urgency_hint)
-  _WRAP_METHOD(bool get_urgency_hint() const, gtk_window_get_urgency_hint)
-
   _WRAP_METHOD(void set_accept_focus(bool setting = true), gtk_window_set_accept_focus)
   _WRAP_METHOD(bool get_accept_focus() const, gtk_window_get_accept_focus)
   _WRAP_METHOD(void set_focus_on_map(bool setting = true), gtk_window_set_focus_on_map)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 369d4f93..f06edd08 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -39,8 +39,8 @@ _CONV_INCLASS_ENUM(Gtk,Calendar,DisplayOptions)
 _CONV_ENUM(Gtk,CellRendererMode)
 _CONV_ENUM(Gtk,CellRendererState)
 _CONV_ENUM(Gtk,CornerType)
-_CONV_ENUM(Gtk,CssProviderError)
-_CONV_INCLASS_ENUM(Gtk,CssSection,Type)
+_CONV_ENUM(Gtk,CssParserError)
+_CONV_ENUM(Gtk,CssParserWarning)
 _CONV_ENUM(Gtk,CurveType)
 _CONV_ENUM(Gtk,DeleteType)
 _CONV_ENUM(Gtk,DestDefaults)
@@ -59,8 +59,8 @@ _CONV_ENUM(Gtk,NotebookTab)
 _CONV_ENUM(Gtk,Orientation)
 _CONV_ENUM(Gtk,Overflow)
 _CONV_ENUM(Gtk,PackType)
-_CONV_ENUM(Gtk,PackDirection)
 _CONV_ENUM(Gtk,PanDirection)
+_CONV_ENUM(Gtk,PickFlags)
 _CONV_ENUM(Gtk,PlacesOpenFlags)
 _CONV_ENUM(Gtk,PolicyType)
 _CONV_INCLASS_ENUM(Gtk,Popover,Constraint)
@@ -179,6 +179,8 @@ _CONVERSION(`const Glib::RefPtr<StyleProvider>&',`GtkStyleProvider*',__CONVERT_R
 
 _CONVERSION(`GtkCssProvider*',`Glib::RefPtr<CssProvider>',`Glib::wrap($3)')
 _CONVERSION(`GtkCssSection*',`Glib::RefPtr<CssSection>',`Glib::wrap($3)')
+_CONVERSION(`const CssLocation&',`const GtkCssLocation*',__FR2P)
+_CONVERSION(`const GtkCssLocation*',`CssLocation',`Glib::wrap($3)')
 
 # AccelGroup:
 _CONVERSION(`GtkAccelGroup*',`Glib::RefPtr<AccelGroup>',`Glib::wrap($3)')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]