GNOME.org
 

[gtkmm] Wrap GtkPlacesSidebar (not complete)

commit 39b16e1be46a8215b123880bac0e2b0024a25dd7
Author: Juan Rafael García Blanco <juanrgar FedoraMacBook localdomain>
Date:   Tue Sep 17 22:22:40 2013 +0200

    Wrap GtkPlacesSidebar (not complete)
    
    Bug #705642

 gtk/gtkmm.h                               |    1 +
 gtk/src/enums.hg                          |    1 +
 gtk/src/filelist.am                       |    1 +
 gtk/src/gtk_signals.defs                  |  136 +++++++++++++++++++++++++---
 gtk/src/gtk_signals.defs.patch            |  127 ++++++++++++++++++++++-----
 gtk/src/placessidebar.ccg                 |   24 +++++
 gtk/src/placessidebar.hg                  |  124 ++++++++++++++++++++++++++
 tools/extra_defs_gen/generate_defs_gtk.cc |    1 +
 tools/m4/convert_gtk.m4                   |    4 +
 9 files changed, 381 insertions(+), 38 deletions(-)
---
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index 3aba3de..3aae998 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -199,6 +199,7 @@ extern const int gtkmm_micro_version;
 # include <gtkmm/pagesetupunixdialog.h>
 #endif
 #include <gtkmm/papersize.h>
+#include <gtkmm/placessidebar.h>
 #include <gtkmm/printcontext.h>
 #ifndef G_OS_WIN32
 # include <gtkmm/printer.h>
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 9c34180..286312c 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -84,6 +84,7 @@ _WRAP_ENUM(CornerType, GtkCornerType)
 _WRAP_ENUM(PackType, GtkPackType)
 _WRAP_ENUM(PathPriorityType, GtkPathPriorityType)
 _WRAP_ENUM(PathType, GtkPathType)
+_WRAP_ENUM(PlacesOpenFlags, GtkPlacesOpenFlags)
 _WRAP_ENUM(PolicyType, GtkPolicyType)
 _WRAP_ENUM(PositionType, GtkPositionType)
 _WRAP_ENUM(ReliefStyle, GtkReliefStyle)
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index f82a512..6450f7f 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -111,6 +111,7 @@ gtkmm_files_any_hg =                \
        pagesetup.hg            \
        paned.hg                \
        papersize.hg            \
+       placessidebar.hg        \
        printcontext.hg         \
        printoperation.hg       \
        printoperationpreview.hg\
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 8182e17..8099d50 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -2988,19 +2988,19 @@
 
 ;; From GtkDialog
 
-(define-signal response
+(define-signal close
   (of-object "GtkDialog")
   (return-type "void")
   (when "last")
-  (parameters
-    '("gint" "p0")
-  )
 )
 
-(define-signal close
+(define-signal response
   (of-object "GtkDialog")
   (return-type "void")
   (when "last")
+  (parameters
+    '("gint" "p0")
+  )
 )
 
 ;; From GtkDrawingArea
@@ -4487,19 +4487,19 @@
 
 ;; From GtkInfoBar
 
-(define-signal response
+(define-signal close
   (of-object "GtkInfoBar")
   (return-type "void")
   (when "last")
-  (parameters
-    '("gint" "p0")
-  )
 )
 
-(define-signal close
+(define-signal response
   (of-object "GtkInfoBar")
   (return-type "void")
   (when "last")
+  (parameters
+    '("gint" "p0")
+  )
 )
 
 (define-property message-type
@@ -5805,6 +5805,112 @@
   (construct-only #f)
 )
 
+;; From GtkPlacesSidebar
+
+(define-signal populate-popup
+  (of-object "GtkPlacesSidebar")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GtkMenu*" "p0")
+    '("GFile*" "p1")
+    '("GVolume*" "p2")
+  )
+)
+
+(define-signal open-location
+  (of-object "GtkPlacesSidebar")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GFile*" "p0")
+    '("GtkPlacesOpenFlags" "p1")
+  )
+)
+
+(define-signal show-error-message
+  (of-object "GtkPlacesSidebar")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("const-gchar*" "p0")
+    '("const-gchar*" "p1")
+  )
+)
+
+(define-signal show-connect-to-server
+  (of-object "GtkPlacesSidebar")
+  (return-type "void")
+  (when "first")
+)
+
+(define-signal drag-action-requested
+  (of-object "GtkPlacesSidebar")
+  (return-type "gint")
+  (when "last")
+  (parameters
+    '("GdkDragContext*" "p0")
+    '("GFile*" "p1")
+    '("GList*" "p2")
+  )
+)
+
+(define-signal drag-action-ask
+  (of-object "GtkPlacesSidebar")
+  (return-type "gint")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal drag-perform-drop
+  (of-object "GtkPlacesSidebar")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GFile*" "p0")
+    '("GList*" "p1")
+    '("gint" "p2")
+  )
+)
+
+(define-property location
+  (of-object "GtkPlacesSidebar")
+  (prop-type "GParamObject")
+  (docs "The location to highlight in the sidebar")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property open-flags
+  (of-object "GtkPlacesSidebar")
+  (prop-type "GParamFlags")
+  (docs "Modes in which the calling application can open locations selected in the sidebar")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-desktop
+  (of-object "GtkPlacesSidebar")
+  (prop-type "GParamBoolean")
+  (docs "Whether the sidebar includes a builtin shortcut to the Desktop folder")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-connect-to-server
+  (of-object "GtkPlacesSidebar")
+  (prop-type "GParamBoolean")
+  (docs "Whether the sidebar includes a builtin shortcut to a 'Connect to server' dialog")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkPlug
 
 (define-signal embedded
@@ -6868,19 +6974,19 @@
 
 ;; From GtkScaleButton
 
-(define-signal popup
+(define-signal value-changed
   (of-object "GtkScaleButton")
   (return-type "void")
   (when "last")
+  (parameters
+    '("gdouble" "p0")
+  )
 )
 
-(define-signal value-changed
+(define-signal popup
   (of-object "GtkScaleButton")
   (return-type "void")
   (when "last")
-  (parameters
-    '("gdouble" "p0")
-  )
 )
 
 (define-signal popdown
diff --git a/gtk/src/gtk_signals.defs.patch b/gtk/src/gtk_signals.defs.patch
index abdcfde..b81331f 100644
--- a/gtk/src/gtk_signals.defs.patch
+++ b/gtk/src/gtk_signals.defs.patch
@@ -1,8 +1,6 @@
-diff --git a/gtk/src/gtk_signals.defs.orig b/gtk/src/gtk_signals.defs
-index 6590e18..0227efa 100644
---- a/gtk/src/gtk_signals.defs.orig
-+++ b/gtk/src/gtk_signals.defs
-@@ -2437,21 +2437,21 @@
+--- gtk/src/gtk_signals.defs.orig      2013-09-11 22:05:42.655978022 +0200
++++ gtk/src/gtk_signals.defs   2013-09-11 22:07:53.554448890 +0200
+@@ -2455,21 +2455,21 @@
    (construct-only #f)
  )
  
@@ -25,7 +23,7 @@ index 6590e18..0227efa 100644
    (return-type "void")
    (when "first")
  )
-@@ -2501,21 +2501,21 @@
+@@ -2519,21 +2519,21 @@
    (construct-only #f)
  )
  
@@ -48,7 +46,7 @@ index 6590e18..0227efa 100644
    (readable #t)
    (writable #t)
    (construct-only #f)
-@@ -2656,21 +2656,21 @@
+@@ -2674,21 +2674,21 @@
    (of-object "GtkComboBox")
    (return-type "void")
    (when "last")
@@ -71,7 +69,7 @@ index 6590e18..0227efa 100644
    (of-object "GtkComboBox")
    (prop-type "GParamObject")
    (docs "The model for the combo box")
-@@ -3101,31 +3101,31 @@
+@@ -3119,31 +3119,31 @@
      '("const-gchar*" "p0")
    )
  )
@@ -105,7 +103,7 @@ index 6590e18..0227efa 100644
    (readable #t)
    (writable #t)
    (construct-only #f)
-@@ -5147,21 +5147,21 @@
+@@ -5219,21 +5219,21 @@
    (of-object "GtkMenuItem")
    (return-type "void")
    (when "first")
@@ -128,7 +126,90 @@ index 6590e18..0227efa 100644
    (parameters
      '("gint" "p0")
    )
-@@ -5982,21 +5982,21 @@
+@@ -5805,32 +5805,32 @@
+   (construct-only #f)
+ )
+ 
+ ;; From GtkPlacesSidebar
+ 
+ (define-signal populate-popup
+   (of-object "GtkPlacesSidebar")
+   (return-type "void")
+   (when "first")
+   (parameters
+-    '("GObject*" "p0")
+-    '("GObject*" "p1")
+-    '("GObject*" "p2")
++    '("GtkMenu*" "p0")
++    '("GFile*" "p1")
++    '("GVolume*" "p2")
+   )
+ )
+ 
+ (define-signal open-location
+   (of-object "GtkPlacesSidebar")
+   (return-type "void")
+   (when "first")
+   (parameters
+-    '("GObject*" "p0")
++    '("GFile*" "p0")
+     '("GtkPlacesOpenFlags" "p1")
+   )
+ )
+ 
+ (define-signal show-error-message
+   (of-object "GtkPlacesSidebar")
+   (return-type "void")
+   (when "first")
+   (parameters
+     '("const-gchar*" "p0")
+@@ -5843,41 +5843,41 @@
+   (return-type "void")
+   (when "first")
+ )
+ 
+ (define-signal drag-action-requested
+   (of-object "GtkPlacesSidebar")
+   (return-type "gint")
+   (when "last")
+   (parameters
+     '("GdkDragContext*" "p0")
+-    '("GObject*" "p1")
+-    '("gpointer" "p2")
++    '("GFile*" "p1")
++    '("GList*" "p2")
+   )
+ )
+ 
+ (define-signal drag-action-ask
+   (of-object "GtkPlacesSidebar")
+   (return-type "gint")
+   (when "last")
+   (parameters
+     '("gint" "p0")
+   )
+ )
+ 
+ (define-signal drag-perform-drop
+   (of-object "GtkPlacesSidebar")
+   (return-type "void")
+   (when "first")
+   (parameters
+-    '("GObject*" "p0")
+-    '("gpointer" "p1")
++    '("GFile*" "p0")
++    '("GList*" "p1")
+     '("gint" "p2")
+   )
+ )
+ 
+ (define-property location
+   (of-object "GtkPlacesSidebar")
+   (prop-type "GParamObject")
+   (docs "The location to highlight in the sidebar")
+   (readable #t)
+   (writable #t)
+@@ -6160,21 +6160,21 @@
  )
  
  (define-signal status-changed
@@ -151,8 +232,8 @@ index 6590e18..0227efa 100644
    (parameters
      '("GtkWidget*" "p0")
      '("GtkPageSetup*" "p1")
-@@ -6706,21 +6706,21 @@
-   (docs "The size of the recently used resources list")
+@@ -6922,21 +6922,21 @@
+   (docs "Whether the child is revealed and the animation target reached")
    (readable #t)
    (writable #f)
    (construct-only #f)
@@ -174,7 +255,7 @@ index 6590e18..0227efa 100644
    (of-object "GtkScale")
    (prop-type "GParamInt")
    (docs "The number of decimal places that are displayed in the value")
-@@ -7096,21 +7096,21 @@
+@@ -7318,21 +7318,21 @@
    (prop-type "GParamString")
    (docs "Name of default font to use")
    (readable #t)
@@ -197,7 +278,7 @@ index 6590e18..0227efa 100644
    (prop-type "GParamString")
    (docs "List of currently active GTK modules")
    (readable #t)
-@@ -7709,21 +7709,21 @@
+@@ -7931,21 +7931,21 @@
    (of-object "GtkSpinButton")
    (return-type "void")
    (when "last")
@@ -220,7 +301,7 @@ index 6590e18..0227efa 100644
  )
  
  (define-signal wrapped
-@@ -7835,39 +7835,39 @@
+@@ -8057,39 +8057,39 @@
    )
  )
  
@@ -263,7 +344,7 @@ index 6590e18..0227efa 100644
    (parameters
      '("gint" "p0")
      '("gint" "p1")
-@@ -7875,21 +7875,21 @@
+@@ -8097,21 +8097,21 @@
      '("GtkTooltip*" "p3")
    )
  )
@@ -286,7 +367,7 @@ index 6590e18..0227efa 100644
  )
  
  (define-signal size-changed
-@@ -8491,53 +8491,53 @@
+@@ -8713,53 +8713,53 @@
    (of-object "GtkTextBuffer")
    (return-type "void")
    (when "last")
@@ -345,7 +426,7 @@ index 6590e18..0227efa 100644
  )
  
  (define-signal end-user-action
-@@ -8631,21 +8631,21 @@
+@@ -8853,21 +8853,21 @@
  
  ;; From GtkTextTag
  
@@ -368,7 +449,7 @@ index 6590e18..0227efa 100644
    (readable #t)
    (writable #t)
    (construct-only #t)
-@@ -9615,21 +9615,21 @@
+@@ -9846,21 +9846,21 @@
    )
  )
  
@@ -391,7 +472,7 @@ index 6590e18..0227efa 100644
    (return-type "void")
    (when "first")
  )
-@@ -10364,30 +10364,30 @@
+@@ -10595,30 +10595,30 @@
    (parameters
      '("gboolean" "p0")
    )
@@ -424,7 +505,7 @@ index 6590e18..0227efa 100644
    (parameters
      '("gboolean" "p0")
    )
-@@ -10442,198 +10442,198 @@
+@@ -10673,198 +10673,198 @@
    (parameters
      '("GdkEvent*" "p0")
    )
@@ -643,7 +724,7 @@ index 6590e18..0227efa 100644
    (parameters
      '("GtkSelectionData*" "p0")
      '("guint" "p1")
-@@ -10649,30 +10649,30 @@
+@@ -10880,30 +10880,30 @@
      '("guint" "p1")
      '("guint" "p2")
    )
@@ -676,7 +757,7 @@ index 6590e18..0227efa 100644
    (parameters
      '("GdkDragContext*" "p0")
      '("guint" "p1")
-@@ -10764,48 +10764,48 @@
+@@ -10995,48 +10995,48 @@
      '("guint" "p4")
      '("guint" "p5")
    )
diff --git a/gtk/src/placessidebar.ccg b/gtk/src/placessidebar.ccg
new file mode 100644
index 0000000..c2424cb
--- /dev/null
+++ b/gtk/src/placessidebar.ccg
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <gtk/gtk.h>
+
+namespace Gtk
+{
+} // namespace Gtk
+
diff --git a/gtk/src/placessidebar.hg b/gtk/src/placessidebar.hg
new file mode 100644
index 0000000..8763339
--- /dev/null
+++ b/gtk/src/placessidebar.hg
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <vector>
+
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/menu.h>
+#include <giomm/file.h>
+#include <giomm/volume.h>
+
+_DEFS(gtkmm,gtk)
+_PINCLUDE(gtkmm/private/scrolledwindow_p.h)
+
+namespace Gtk
+{
+
+/** Sidebar that displays frequently-used places in the file system.
+ *
+ * Gtk::PlacesSidebar is a widget that displays a list of frequently-used places in the
+ * file system:  the user's home directory, the user's bookmarks, and volumes and drives.
+ * This widget is used as a sidebar in Gtk::FileChooser and may be used by file managers
+ * and similar programs.
+ *
+ * The places sidebar displays drives and volumes, and will automatically mount
+ * or unmount them when the user selects them.
+ *
+ * Applications can hook to various signals in the places sidebar to customize
+ * its behavior.  For example, they can add extra commands to the context menu
+ * of the sidebar.
+ *
+ * While bookmarks are completely in control of the user, the places sidebar also
+ * allows individual applications to provide extra shortcut folders that are unique
+ * to each application.  For example, a Paint program may want to add a shortcut
+ * for a Clipart folder.  You can do this with Gtk::PlacesSidebar::add_shortcut().
+ *
+ * To make use of the places sidebar, an application at least needs to connect
+ * to the Gtk::PlacesSidebar::open-location signal.  This is emitted when the
+ * user selects in the sidebar a location to open.  The application should also
+ * call Gtk::PlacesSidebar::set_location() when it changes the currently-viewed
+ * location.
+ *
+ * @ingroup Widgets
+ * @newin{3,10}
+ */
+
+class PlacesSidebar
+  : public ScrolledWindow
+{
+  _CLASS_GTKOBJECT(PlacesSidebar, GtkPlacesSidebar, GTK_PLACES_SIDEBAR, Gtk::ScrolledWindow, 
GtkScrolledWindow)
+public:
+
+  /** Creates a new Gtk::PlacesSidebar widget.
+   *
+   * The application should connect to at least the "open-location" signal to be notified when the user 
makes a selection in the sidebar.
+   *
+   */
+  _CTOR_DEFAULT
+
+
+  _WRAP_METHOD(void set_open_flags(PlacesOpenFlags flags = Gtk::PLACES_OPEN_NORMAL), 
gtk_places_sidebar_set_open_flags)
+  _WRAP_METHOD(PlacesOpenFlags get_open_flags() const, gtk_places_sidebar_get_open_flags)
+
+  _WRAP_METHOD(void set_location(const Glib::RefPtr<const Gio::File>& location), 
gtk_places_sidebar_set_location)
+  // transfer full
+  // get_location returns a new Gio::File; modifiying the returned value does not modify the places sidebar
+  _WRAP_METHOD(Glib::RefPtr<Gio::File> get_location() const, gtk_places_sidebar_get_location) 
+
+  _WRAP_METHOD(void set_show_desktop(bool show_desktop = true), gtk_places_sidebar_set_show_desktop)
+  _WRAP_METHOD(bool get_show_desktop() const, gtk_places_sidebar_get_show_desktop)
+
+  _WRAP_METHOD(void add_shortcut(const Glib::RefPtr<Gio::File>& location), gtk_places_sidebar_add_shortcut)
+  _WRAP_METHOD(void remove_shortcut(const Glib::RefPtr<Gio::File>& location), 
gtk_places_sidebar_remove_shortcut)
+  // transfer full
+  // list_shortcuts returns a copy of the list and its elements; modifiying the returned value does not 
modify the places sidebar
+#m4 _CONVERSION(`GSList*',`std::vector< Glib::RefPtr<Gio::File> >',`Glib::SListHandler< 
Glib::RefPtr<Gio::File> >::slist_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+  _WRAP_METHOD(std::vector< Glib::RefPtr<Gio::File> > list_shortcuts() const, 
gtk_places_sidebar_list_shortcuts)
+
+  // transfer full
+  // get_nth_bookmark returns a new Gio::File; modifiying the returned value does not modify the places 
sidebar
+  _WRAP_METHOD(Glib::RefPtr<Gio::File>  get_nth_bookmark(int n) const, gtk_places_sidebar_get_nth_bookmark)
+
+  _WRAP_METHOD(void set_show_connect_to_server(bool show_connect_to_server = true), 
gtk_places_sidebar_set_show_connect_to_server)
+  _WRAP_METHOD(bool get_show_connect_to_server() const, gtk_places_sidebar_get_show_connect_to_server)
+
+
+// TODO
+// drag_action_requested and drag_perform_drop does not currently work due to an exec error while wrapping 
the
+// GList* argument; apparently execution crashes around Glib::wrap_create_new_wrapper_for_interface
+//#m4 _CONVERSION(`GdkDragContext*',`const Glib::RefPtr<Gdk::DragContext>&',Glib::wrap($3, true))
+//#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Gio::File> >',`Glib::ListHandler< 
Glib::RefPtr<Gio::File> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+//  _WRAP_SIGNAL(int drag_action_requested(const Glib::RefPtr<Gdk::DragContext>& context, const 
Glib::RefPtr<Gio::File>& dest_file, std::vector< Glib::RefPtr<Gio::File> > source_file_list), 
"drag_action_requested", no_default_handler)
+//  _WRAP_SIGNAL(void drag_perform_drop(const Glib::RefPtr<Gio::File>& dest_file, std::vector< 
Glib::RefPtr<Gio::File> > source_file_list, int action), "drag_perform_drop", no_default_handler)
+
+  _WRAP_SIGNAL(int drag_action_ask(int actions), "drag_action_ask", no_default_handler)
+  _WRAP_SIGNAL(void open_location(const Glib::RefPtr<Gio::File>& location, PlacesOpenFlags open_flags), 
"open_location", no_default_handler)
+#m4 _CONVERSION(`GVolume*',`const Glib::RefPtr<Gio::Volume>&',Glib::wrap($3, true))
+  _WRAP_SIGNAL(void populate_popup(Gtk::Menu* menu, const Glib::RefPtr<Gio::File>& selected_item, const 
Glib::RefPtr<Gio::Volume>& selected_volume), "populate_popup", no_default_handler)
+  _WRAP_SIGNAL(void show_connect_to_server(), "show_connect_to_server", no_default_handler)
+  _WRAP_SIGNAL(void show_error_message(const Glib::ustring& primary, const Glib::ustring& secondary), 
"show_error_message", no_default_handler)
+
+
+  _WRAP_PROPERTY("location", Glib::RefPtr<Gio::File>)
+  _WRAP_PROPERTY("open-flags", PlacesOpenFlags)
+  _WRAP_PROPERTY("show-connect-to-server", bool)
+  _WRAP_PROPERTY("show-desktop", bool)
+};
+
+} // namespace Gtk
+
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index d9d1549..4c14b7f 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -141,6 +141,7 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_OFFSCREEN_WINDOW )
             << get_defs( GTK_TYPE_ORIENTABLE )
             << get_defs( GTK_TYPE_PANED )
+            << get_defs( GTK_TYPE_PLACES_SIDEBAR )
 #ifdef GDK_WINDOWING_X11
             << get_defs( GTK_TYPE_PLUG )
 #endif
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index b87b33e..8fb748c 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -90,6 +90,7 @@ _CONV_ENUM(Gtk,NotebookTab)
 _CONV_ENUM(Gtk,Orientation)
 _CONV_ENUM(Gtk,PackType)
 _CONV_ENUM(Gtk,PackDirection)
+_CONV_ENUM(Gtk,PlacesOpenFlags)
 _CONV_ENUM(Gtk,PolicyType)
 _CONV_ENUM(Gtk,PositionType)
 _CONV_ENUM(Gtk,PreviewType)
@@ -201,6 +202,7 @@ _CONVERSION(`GtkWidget*',`Gtk::Widget*',__RP2P)
 _CONVERSION(`GtkWidget*',`Widget*',__RP2P)
 _CONVERSION(`GtkWindow*',`Window*',__RP2P)
 _CONVERSION(`GtkMenu*',`Menu*',__RP2P)
+_CONVERSION(`GtkMenu*',`Gtk::Menu*',__RP2P)
 _CONVERSION(`GtkToolItem*',`ToolItem*',__RP2P)
 _CONVERSION(`GtkToolItemGroup*',`ToolItemGroup*',__RP2P)
 
@@ -684,8 +686,10 @@ _CONVERSION(`const Glib::RefPtr<const Gio::Icon>&',`GIcon*',__CONVERT_CONST_REFP
 _CONVERSION(`GIcon*',`Glib::RefPtr<Gio::Icon>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Gio::Icon>&',`GIcon*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::Icon))
 _CONVERSION(`const Glib::RefPtr<const Gio::File>&',`GFile*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::File))
+_CONVERSION(`const Glib::RefPtr<Gio::File>&',`GFile*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::File))
 _CONVERSION(`GFile*',`Glib::RefPtr<Gio::File>',`Glib::wrap($3)')
 _CONVERSION(`GFile*',`Glib::RefPtr<const Gio::File>',`Glib::wrap($3)')
+_CONVERSION(`GFile*',`const Glib::RefPtr<Gio::File>&',`Glib::wrap($3)')
 
 _CONVERSION(`const Glib::RefPtr<Gio::Cancellable>&',`GCancellable*',__CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Gio::InputStream>&',`GInputStream*',__CONVERT_CONST_REFPTR_TO_P)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]