GNOME.org
 

[gtkmm] Fix build with latest GTK+.

commit 4bf1e9adea555cb5ecf7b12a8725f6b7f84f30dc
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 2 12:58:53 2010 +0200

    Fix build with latest GTK+.
    
    	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
    	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    	* gtk/src/iconview.hg: Rename get/set_orientation() (and property) to
      get/set_item_orientation().
    	* gtk/src/progressbar.hg: Remove get/set_orientation(), deriving (and
      implementing) from Orientable instead.
    	* gtk/src/wrapbox.[hg|ccg]: Adapted to minor API changes in GtkWrapBox.
    	* tools/m4/convert_gtk.m4: Mention the new enum.

 ChangeLog                |   13 ++++++++
 gtk/src/gtk_enums.defs   |   46 ++++++++++++++----------------
 gtk/src/gtk_methods.defs |   69 ++++++++++++++++++++++------------------------
 gtk/src/iconview.hg      |   41 +++++++++++++--------------
 gtk/src/progressbar.hg   |   12 +++----
 gtk/src/wrapbox.ccg      |    4 +-
 gtk/src/wrapbox.hg       |    9 +++--
 tools/m4/convert_gtk.m4  |    1 +
 8 files changed, 101 insertions(+), 94 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 52e1dc0..a2c32b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-02  Murray Cumming  <murrayc murrayc com>
+
+	Fix build with latest GTK+.
+
+	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/iconview.hg: Rename get/set_orientation() (and property) to
+  get/set_item_orientation().
+	* gtk/src/progressbar.hg: Remove get/set_orientation(), deriving (and
+  implementing) from Orientable instead.
+	* gtk/src/wrapbox.[hg|ccg]: Adapted to minor API changes in GtkWrapBox.
+	* tools/m4/convert_gtk.m4: Mention the new enum.
+
 2010-09-02  Murray Cumming  <murrayc murrayc-desktop>
 
 	gdkmm: Pixbuf: Add constructor (and create) that takes a Cairo::Surface.
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 11d545f..7aa9d71 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -1444,7 +1444,7 @@
 
 ;; Original typedef:
 ;; typedef enum {
-;;   GTK_WRAP_BOX_SPREAD_BEGIN = 0,
+;;   GTK_WRAP_BOX_SPREAD_START = 0,
 ;;   GTK_WRAP_BOX_SPREAD_END,
 ;;   GTK_WRAP_BOX_SPREAD_EVEN,
 ;;   GTK_WRAP_BOX_SPREAD_EXPAND
@@ -1454,13 +1454,33 @@
   (in-module "Gtk")
   (c-name "GtkWrapBoxSpreading")
   (values
-    '("begin" "GTK_WRAP_BOX_SPREAD_BEGIN" "0")
+    '("start" "GTK_WRAP_BOX_SPREAD_START" "0")
     '("end" "GTK_WRAP_BOX_SPREAD_END" "1")
     '("even" "GTK_WRAP_BOX_SPREAD_EVEN" "2")
     '("expand" "GTK_WRAP_BOX_SPREAD_EXPAND" "3")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_WRAP_BOX_H_EXPAND = 1 << 0,
+;;   GTK_WRAP_BOX_H_FILL   = 1 << 1,
+;;   GTK_WRAP_BOX_V_EXPAND = 1 << 2,
+;;   GTK_WRAP_BOX_V_FILL   = 1 << 3
+;; } GtkWrapBoxPacking;
+
+(define-flags-extended WrapBoxPacking
+  (in-module "Gtk")
+  (c-name "GtkWrapBoxPacking")
+  (values
+    '("h-expand" "GTK_WRAP_BOX_H_EXPAND" "1 << 0")
+    '("h-fill" "GTK_WRAP_BOX_H_FILL" "1 << 1")
+    '("v-expand" "GTK_WRAP_BOX_V_EXPAND" "1 << 2")
+    '("v-fill" "GTK_WRAP_BOX_V_FILL" "1 << 3")
+  )
+)
+
 ;; From gtkfilechooser.h
 
 ;; Original typedef:
@@ -1833,28 +1853,6 @@
   )
 )
 
-;; From gtkprogressbar.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PROGRESS_LEFT_TO_RIGHT,
-;;   GTK_PROGRESS_RIGHT_TO_LEFT,
-;;   GTK_PROGRESS_BOTTOM_TO_TOP,
-;;   GTK_PROGRESS_TOP_TO_BOTTOM
-;; } GtkProgressBarOrientation;
-
-(define-enum-extended ProgressBarOrientation
-  (in-module "Gtk")
-  (c-name "GtkProgressBarOrientation")
-  (values
-    '("left-to-right" "GTK_PROGRESS_LEFT_TO_RIGHT" "0")
-    '("right-to-left" "GTK_PROGRESS_RIGHT_TO_LEFT" "1")
-    '("bottom-to-top" "GTK_PROGRESS_BOTTOM_TO_TOP" "2")
-    '("top-to-bottom" "GTK_PROGRESS_TOP_TO_BOTTOM" "3")
-  )
-)
-
 ;; From gtkrc.h
 
 ;; Original typedef:
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index ea480c1..4c9cd82 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -2035,13 +2035,25 @@
   (c-name "GtkWrapBoxSpreading")
   (gtype-id "GTK_TYPE_WRAP_BOX_SPREADING")
   (values
-    '("begin" "GTK_WRAP_BOX_SPREAD_BEGIN")
+    '("start" "GTK_WRAP_BOX_SPREAD_START")
     '("end" "GTK_WRAP_BOX_SPREAD_END")
     '("even" "GTK_WRAP_BOX_SPREAD_EVEN")
     '("expand" "GTK_WRAP_BOX_SPREAD_EXPAND")
   )
 )
 
+(define-flags WrapBoxPacking
+  (in-module "Gtk")
+  (c-name "GtkWrapBoxPacking")
+  (gtype-id "GTK_TYPE_WRAP_BOX_PACKING")
+  (values
+    '("h-expand" "GTK_WRAP_BOX_H_EXPAND")
+    '("h-fill" "GTK_WRAP_BOX_H_FILL")
+    '("v-expand" "GTK_WRAP_BOX_V_EXPAND")
+    '("v-fill" "GTK_WRAP_BOX_V_FILL")
+  )
+)
+
 (define-enum FileChooserAction
   (in-module "Gtk")
   (c-name "GtkFileChooserAction")
@@ -2253,18 +2265,6 @@
   )
 )
 
-(define-enum ProgressBarOrientation
-  (in-module "Gtk")
-  (c-name "GtkProgressBarOrientation")
-  (gtype-id "GTK_TYPE_PROGRESS_BAR_ORIENTATION")
-  (values
-    '("left-to-right" "GTK_PROGRESS_LEFT_TO_RIGHT")
-    '("right-to-left" "GTK_PROGRESS_RIGHT_TO_LEFT")
-    '("bottom-to-top" "GTK_PROGRESS_BOTTOM_TO_TOP")
-    '("top-to-bottom" "GTK_PROGRESS_TOP_TO_BOTTOM")
-  )
-)
-
 (define-flags RcFlags
   (in-module "Gtk")
   (c-name "GtkRcFlags")
@@ -10794,18 +10794,18 @@
   (return-type "gint")
 )
 
-(define-method set_orientation
+(define-method set_item_orientation
   (of-object "GtkIconView")
-  (c-name "gtk_icon_view_set_orientation")
+  (c-name "gtk_icon_view_set_item_orientation")
   (return-type "none")
   (parameters
     '("GtkOrientation" "orientation")
   )
 )
 
-(define-method get_orientation
+(define-method get_item_orientation
   (of-object "GtkIconView")
-  (c-name "gtk_icon_view_get_orientation")
+  (c-name "gtk_icon_view_get_item_orientation")
   (return-type "GtkOrientation")
 )
 
@@ -15806,12 +15806,12 @@
   )
 )
 
-(define-method set_orientation
+(define-method set_inverted
   (of-object "GtkProgressBar")
-  (c-name "gtk_progress_bar_set_orientation")
+  (c-name "gtk_progress_bar_set_inverted")
   (return-type "none")
   (parameters
-    '("GtkProgressBarOrientation" "orientation")
+    '("gboolean" "inverted")
   )
 )
 
@@ -15833,10 +15833,10 @@
   (return-type "gdouble")
 )
 
-(define-method get_orientation
+(define-method get_inverted
   (of-object "GtkProgressBar")
-  (c-name "gtk_progress_bar_get_orientation")
-  (return-type "GtkProgressBarOrientation")
+  (c-name "gtk_progress_bar_get_inverted")
+  (return-type "gboolean")
 )
 
 (define-method set_ellipsize
@@ -26606,6 +26606,11 @@
   (return-type "GType")
 )
 
+(define-function gtk_wrap_box_packing_get_type
+  (c-name "gtk_wrap_box_packing_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_file_chooser_action_get_type
   (c-name "gtk_file_chooser_action_get_type")
   (return-type "GType")
@@ -26686,11 +26691,6 @@
   (return-type "GType")
 )
 
-(define-function gtk_progress_bar_orientation_get_type
-  (c-name "gtk_progress_bar_orientation_get_type")
-  (return-type "GType")
-)
-
 (define-function gtk_rc_flags_get_type
   (c-name "gtk_rc_flags_get_type")
   (return-type "GType")
@@ -29551,19 +29551,16 @@
   (return-type "guint")
 )
 
-(define-method insert_child
+(define-method insert_child_with_padding
   (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_insert_child")
+  (c-name "gtk_wrap_box_insert_child_with_padding")
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
     '("gint" "index")
-    '("guint" "xpad")
-    '("guint" "ypad")
-    '("gboolean" "xexpand")
-    '("gboolean" "yexpand")
-    '("gboolean" "xfill")
-    '("gboolean" "yfill")
+    '("guint" "horizontal_padding")
+    '("guint" "vertical_padding")
+    '("GtkWrapBoxPacking" "packing")
   )
 )
 
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index d2772e1..9aa73f1 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -1,7 +1,7 @@
 /* $Id: iconview.hg,v 1.11 2006/07/08 16:31:38 murrayc Exp $ */
 
 /* iconview.h
- * 
+ *
  * Copyright (C) 1998-2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -35,8 +35,8 @@ namespace Gtk
 _WRAP_ENUM(IconViewDropPosition, GtkIconViewDropPosition)
 
 /** The IconView provides an alternative view of a list model.
- * It displays the model as a grid of icons with labels. 
- * Like the TreeView, it allows the user to select one or multiple items 
+ * It displays the model as a grid of icons with labels.
+ * Like the TreeView, it allows the user to select one or multiple items
  * (depending on the selection mode - see set_selection_mode()).
  * In addition to selection with the arrow keys, the IconView supports
  * rubberband selection, by dragging the pointer.
@@ -72,14 +72,14 @@ public:
   _WRAP_METHOD(void set_text_column(const TreeModelColumnBase& model_column), gtk_icon_view_set_text_column)
   _WRAP_METHOD(int get_text_column() const, gtk_icon_view_get_text_column)
   _WRAP_METHOD(void set_markup_column(int column), gtk_icon_view_set_markup_column)
-  _WRAP_METHOD(void set_markup_column(const TreeModelColumnBase& column), gtk_icon_view_set_markup_column) 
+  _WRAP_METHOD(void set_markup_column(const TreeModelColumnBase& column), gtk_icon_view_set_markup_column)
   _WRAP_METHOD(int get_markup_column() const, gtk_icon_view_get_markup_column )
   _WRAP_METHOD(void set_pixbuf_column(int column), gtk_icon_view_set_pixbuf_column)
-  _WRAP_METHOD(void set_pixbuf_column(const TreeModelColumnBase& column), gtk_icon_view_set_pixbuf_column)  
+  _WRAP_METHOD(void set_pixbuf_column(const TreeModelColumnBase& column), gtk_icon_view_set_pixbuf_column)
   _WRAP_METHOD(int get_pixbuf_column() const, gtk_icon_view_get_pixbuf_column)
 
-  _WRAP_METHOD(void set_orientation(Orientation orientation), gtk_icon_view_set_orientation)
-  _WRAP_METHOD(Orientation get_orientation() const, gtk_icon_view_get_orientation)
+  _WRAP_METHOD(void set_item_orientation(Orientation orientation), gtk_icon_view_set_item_orientation)
+  _WRAP_METHOD(Orientation get_item_orientation() const, gtk_icon_view_get_item_orientation)
 
   _WRAP_METHOD(void set_columns(int columns), gtk_icon_view_set_columns)
   _WRAP_METHOD(int get_columns() const, gtk_icon_view_get_columns)
@@ -104,7 +104,7 @@ public:
    * @param y The y position to be identified.
    * @param path The path.
    * @param cell The renderer responsible for the cell at (@a x, @a y).
-   * 
+   *
    * @result true if an item exists at the specified position.
    *
    * @newin{2,6}
@@ -116,7 +116,7 @@ public:
    * @param x The x position to be identified.
    * @param y The y position to be identified.
    * @param path The path.
-   * 
+   *
    * @result true if an item exists at the specified position.
    *
    * @newin{2,6}
@@ -128,7 +128,7 @@ public:
    * @param x The x position to be identified.
    * @param y The y position to be identified.
    * @param path The path.
-   * 
+   *
    * @result true if an item exists at the specified position.
    *
    * @newin{2,6}
@@ -140,7 +140,7 @@ public:
   _IGNORE(gtk_icon_view_get_visible_range)
 
 
-  /** For instance, 
+  /** For instance,
    * void on_foreach(const Gtk::TreeModel::Path& path);
    */
   typedef sigc::slot<void, const TreeModel::Path&> SlotForeach;
@@ -188,7 +188,7 @@ public:
   //TODO: Add a version with no cell parameter.
   _WRAP_METHOD(void set_cursor(const TreeModel::Path& path, CellRenderer& cell, bool start_editing), gtk_icon_view_set_cursor)
 
-  /** Fills in @a path and @a cell with the current cursor path and cell. 
+  /** Fills in @a path and @a cell with the current cursor path and cell.
    * If the cursor isn't currently set, then @a path will be empty.
    * If no cell currently has focus, then @a cell will be NULL.
    *
@@ -200,7 +200,7 @@ public:
    */
   bool get_cursor(TreeModel::Path& path, CellRenderer*& cell) const;
 
-  /** Fills in @a path and @a cell with the current cursor path and cell. 
+  /** Fills in @a path and @a cell with the current cursor path and cell.
    * If the cursor isn't currently set, then @a path will be empty.
    * If no cell currently has focus, then @a cell will be NULL.
    *
@@ -211,7 +211,7 @@ public:
    */
   bool get_cursor(TreeModel::Path& path) const;
 
-  /** Fills in @a path and @a cell with the current cursor path and cell. 
+  /** Fills in @a path and @a cell with the current cursor path and cell.
    * If the cursor isn't currently set, then @a path will be empty.
    * If no cell currently has focus, then @a cell will be NULL.
    *
@@ -307,7 +307,7 @@ public:
   bool get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path) const;
 
   /** Determines the destination item for a given position.
-   * 
+   *
    * @param drag_x The position to determine the destination item for.
    * @param drag_y the position to determine the destination item for.
    * @param pos: The drop position.
@@ -325,9 +325,9 @@ public:
   _WRAP_METHOD(void set_tooltip_item(const Glib::RefPtr<Tooltip>& tooltip, const TreeModel::Path& path), gtk_icon_view_set_tooltip_item)
   _WRAP_METHOD(void set_tooltip_cell(const Glib::RefPtr<Tooltip>& tooltip, const TreeModel::Path& path, CellRenderer& cell), gtk_icon_view_set_tooltip_cell)
 
-  /** Sets the tip area of @a tooltip to the area occupied by 
+  /** Sets the tip area of @a tooltip to the area occupied by
    * the item pointed to by @a path. See also Tooltip::set_tip_area().
-   * 
+   *
    * @newin{2,12}
    * @param tooltip A Gtk::Tooltip.
    * @param path A Gtk::TreePath.
@@ -392,7 +392,7 @@ public:
   _WRAP_METHOD(int get_tooltip_column() const, gtk_icon_view_get_tooltip_column)
 
 
-  _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), set_scroll_adjustments) 
+  _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), set_scroll_adjustments)
   _WRAP_SIGNAL(void item_activated(const TreeModel::Path& path), item_activated)
   _WRAP_SIGNAL(void selection_changed(), selection_changed)
 
@@ -403,12 +403,12 @@ public:
   _IGNORE_SIGNAL(toggle_cursor_item)
   _IGNORE_SIGNAL(move_cursor)
   _IGNORE_SIGNAL(activate_cursor_item)
-  
+
   _WRAP_PROPERTY("pixbuf-column", int)
   _WRAP_PROPERTY("text-column", int)
   _WRAP_PROPERTY("markup-column", int)
   _WRAP_PROPERTY("selection-mode", SelectionMode)
-  _WRAP_PROPERTY("orientation", Orientation)
+  _WRAP_PROPERTY("item-orientation", Orientation)
   _WRAP_PROPERTY("model", Glib::RefPtr<TreeModel>)
   _WRAP_PROPERTY("columns", int)
   _WRAP_PROPERTY("item-width", int)
@@ -419,4 +419,3 @@ public:
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/progressbar.hg b/gtk/src/progressbar.hg
index ddd37de..c8e8b7d 100644
--- a/gtk/src/progressbar.hg
+++ b/gtk/src/progressbar.hg
@@ -20,6 +20,7 @@
  */
 
 #include <gtkmm/widget.h>
+#include <gtkmm/orientable.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/widget_p.h)
@@ -30,7 +31,6 @@ namespace Gtk
 {
 
 _CC_INCLUDE(gtk/gtk.h)
-_WRAP_ENUM(ProgressBarOrientation, GtkProgressBarOrientation)
 
 
 /** A widget which indicates progress visually.
@@ -63,9 +63,12 @@ _WRAP_ENUM(ProgressBarOrientation, GtkProgressBarOrientation)
  *
  * @ingroup Widgets
  */
-class ProgressBar : public Widget
+class ProgressBar
+ : public Widget,
+   public Orientable
 {
   _CLASS_GTKOBJECT(ProgressBar,GtkProgressBar,GTK_PROGRESS_BAR,Gtk::Widget,GtkWidget,GtkProgressBar)
+  _IMPLEMENTS_INTERFACE(Orientable)
   _IGNORE(gtk_progress_bar_new_with_adjustment, gtk_progress_bar_set_bar_style, gtk_progress_bar_set_discrete_blocks,
           gtk_progress_bar_set_activity_step, gtk_progress_bar_set_activity_blocks, gtk_progress_bar_update)
 public:
@@ -82,16 +85,11 @@ public:
   _WRAP_METHOD(double get_pulse_step() const, gtk_progress_bar_get_pulse_step)
   _WRAP_METHOD(void set_pulse_step(double fraction), gtk_progress_bar_set_pulse_step)
 
-  _WRAP_METHOD(void set_orientation(ProgressBarOrientation orientation = PROGRESS_LEFT_TO_RIGHT),
-               gtk_progress_bar_set_orientation)
-  _WRAP_METHOD(ProgressBarOrientation get_orientation() const, gtk_progress_bar_get_orientation)
-
   _WRAP_METHOD(void set_ellipsize(Pango::EllipsizeMode mode), gtk_progress_bar_set_ellipsize)
   _WRAP_METHOD(Pango::EllipsizeMode get_ellipsize() const, gtk_progress_bar_get_ellipsize)
 
   _WRAP_PROPERTY("fraction", double)
   _WRAP_PROPERTY("pulse-step", double)
-  _WRAP_PROPERTY("orientation", ProgressBarOrientation)
   _WRAP_PROPERTY("text", Glib::ustring)
   _WRAP_PROPERTY("ellipsize", bool)
 };
diff --git a/gtk/src/wrapbox.ccg b/gtk/src/wrapbox.ccg
index a455a67..9f6590e 100644
--- a/gtk/src/wrapbox.ccg
+++ b/gtk/src/wrapbox.ccg
@@ -26,10 +26,10 @@
 namespace Gtk
 {
 
-void WrapBox::append_child(Widget& widget, guint xpad, guint ypad, bool xexpand, bool yexpand,  bool xfill, bool yfill)
+void WrapBox::append_child(Widget& widget, guint horizontal_padding, guint vertical_padding, WrapBoxPacking packing)
 {
   insert_child(widget, -1, /* see the C documentation */
-    xpad, ypad, xexpand, yexpand, xfill, yfill);
+    horizontal_padding, vertical_padding, packing);
 }
 
 } // namespace Gtk
diff --git a/gtk/src/wrapbox.hg b/gtk/src/wrapbox.hg
index 1124498..fe6dab5 100644
--- a/gtk/src/wrapbox.hg
+++ b/gtk/src/wrapbox.hg
@@ -29,6 +29,7 @@ namespace Gtk
 
 _WRAP_ENUM(WrapAllocationMode, GtkWrapAllocationMode)
 _WRAP_ENUM(WrapBoxSpreading, GtkWrapBoxSpreading)
+_WRAP_ENUM(WrapBoxPacking, GtkWrapBoxPacking)
 
 /** TODO
  *
@@ -43,7 +44,7 @@ class WrapBox
   _CLASS_GTKOBJECT(WrapBox, GtkWrapBox, GTK_WRAP_BOX, Gtk::Container, GtkContainer)
   _IMPLEMENTS_INTERFACE(Orientable)
 public:
-  _WRAP_CTOR(WrapBox(WrapAllocationMode mode = WRAP_ALLOCATE_FREE, WrapBoxSpreading spreading = WRAP_BOX_SPREAD_BEGIN, guint horizontal_spacing = 0, guint vertical_spacing = 0), gtk_wrap_box_new)
+  _WRAP_CTOR(WrapBox(WrapAllocationMode mode = WRAP_ALLOCATE_FREE, WrapBoxSpreading spreading = WRAP_BOX_SPREAD_START, guint horizontal_spacing = 0, guint vertical_spacing = 0), gtk_wrap_box_new)
 
   _WRAP_METHOD(void set_allocation_mode(WrapAllocationMode mode), gtk_wrap_box_set_allocation_mode)
   _WRAP_METHOD(WrapAllocationMode get_allocation_mode() const, gtk_wrap_box_get_allocation_mode)
@@ -63,11 +64,11 @@ public:
   _WRAP_METHOD(void set_natural_line_children(guint n_children), gtk_wrap_box_set_natural_line_children)
   _WRAP_METHOD(guint get_natural_line_children() const, gtk_wrap_box_get_natural_line_children)
 
-  //TODO: Use -1 for append().
-  _WRAP_METHOD(void insert_child(Widget& widget, int index, guint xpad  = 0, guint ypad = 0, bool xexpand = false, bool yexpand = false,  bool xfill = 0, bool yfill = 0), gtk_wrap_box_insert_child)
+  //TODO: Is the default packing appropriate (and like the default for a Box::pack_start())?
+  _WRAP_METHOD(void insert_child(Widget& widget, int index, guint horizontal_padding = 0, guint vertical_padding = 0, WrapBoxPacking packing = WrapBoxPacking(0)), gtk_wrap_box_insert_child_with_padding)
 
   //TODO: Documentation
-  void append_child(Widget& widget, guint xpad  = 0, guint ypad = 0, bool xexpand = false, bool yexpand = false,  bool xfill = 0, bool yfill = 0);
+  void append_child(Widget& widget, guint horizontal_padding = 0, guint vertical_padding = 0, WrapBoxPacking packing = WrapBoxPacking(0));
 
   _WRAP_METHOD(void reorder_child(Widget& widget, guint index), gtk_wrap_box_reorder_child)
 
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index fd7feca..f460c5d 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -146,6 +146,7 @@ _CONV_ENUM(Gtk,DragResult)
 _CONV_ENUM(Gtk,NumberUpLayout)
 _CONV_ENUM(Gtk,EntryIconPosition)
 _CONV_ENUM(Gtk,WrapAllocationMode)
+_CONV_ENUM(Gtk,WrapBoxPacking)
 _CONV_ENUM(Gtk,WrapBoxSpreading)
 _CONV_ENUM(Gtk,SizeRequestMode)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]