GNOME.org
 

[gtkmm] Regenerate defs and make minor changes.

commit b815a62077f6623bc829796ac46d14d628570793
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 15 11:14:19 2010 +0200

    Regenerate defs and make minor changes.
    
    * gtk/src/gtk_enums.defs:
    * gtk/src/gtk_methods.defs: Regenerated.
    * gtk/src/cellview.hg: Remove (deprecated) get_size_of_row().
      * gtk/src/spinner.hg: Inherit from Widget instead of DrawingWindow, as now
      in the C API.

 ChangeLog                |   10 ++
 gtk/src/cellview.hg      |    2 +-
 gtk/src/gtk_enums.defs   |   88 ++++---------------
 gtk/src/gtk_methods.defs |  215 ++++++++++++++++++++++++++++++++++-----------
 gtk/src/spinner.hg       |    9 +-
 5 files changed, 195 insertions(+), 129 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9c8ff88..edbd0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-15  Murray Cumming  <murrayc murrayc com>
+
+  Regenerate defs and make minor changes.
+
+	* gtk/src/gtk_enums.defs:
+	* gtk/src/gtk_methods.defs: Regenerated.
+	* gtk/src/cellview.hg: Remove (deprecated) get_size_of_row().
+  * gtk/src/spinner.hg: Inherit from Widget instead of DrawingWindow, as now
+  in the C API.
+
 2.90.7:
 
 2010-09-15  Murray Cumming  <murrayc murrayc com>
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index da542d2..2d708ac 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -82,7 +82,7 @@ public:
 
   _WRAP_METHOD(void set_displayed_row(const TreeModel::Path& path), gtk_cell_view_set_displayed_row)
   _WRAP_METHOD(TreeModel::Path get_displayed_row() const, gtk_cell_view_get_displayed_row)
-  _WRAP_METHOD(bool get_size_of_row(const TreeModel::Path& path, Requisition& requisition) const, gtk_cell_view_get_size_of_row)
+  _IGNORE(gtk_cell_view_get_size_of_row) //deprecated
 
   _WRAP_METHOD(void get_desired_width_of_row(const TreeModel::Path& path, int& minimum_size, int& natural_size), gtk_cell_view_get_desired_width_of_row)
   _WRAP_METHOD(void get_desired_height_for_width_of_row(const TreeModel::Path& path, int avail_size,  int& minimum_size,  int& natural_size), gtk_cell_view_get_desired_height_for_width_of_row)
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 7aa9d71..53616ac 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -239,8 +239,7 @@
 ;; typedef enum
 ;; {
 ;;   GTK_DIALOG_MODAL               = 1 << 0, /* call gtk_window_set_modal (win, TRUE) */
-;;   GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1, /* call gtk_window_set_destroy_with_parent () */
-;;   GTK_DIALOG_NO_SEPARATOR        = 1 << 2  /* no separator bar above buttons */
+;;   GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1  /* call gtk_window_set_destroy_with_parent () */
 ;; } GtkDialogFlags;
 
 (define-flags-extended DialogFlags
@@ -249,7 +248,6 @@
   (values
     '("modal" "GTK_DIALOG_MODAL" "1 << 0")
     '("destroy-with-parent" "GTK_DIALOG_DESTROY_WITH_PARENT" "1 << 1")
-    '("no-separator" "GTK_DIALOG_NO_SEPARATOR" "1 << 2")
   )
 )
 
@@ -364,46 +362,20 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GTK_ANCHOR_CENTER,
-;;   GTK_ANCHOR_NORTH,
-;;   GTK_ANCHOR_NORTH_WEST,
-;;   GTK_ANCHOR_NORTH_EAST,
-;;   GTK_ANCHOR_SOUTH,
-;;   GTK_ANCHOR_SOUTH_WEST,
-;;   GTK_ANCHOR_SOUTH_EAST,
-;;   GTK_ANCHOR_WEST,
-;;   GTK_ANCHOR_EAST,
-;;   GTK_ANCHOR_N		= GTK_ANCHOR_NORTH,
-;;   GTK_ANCHOR_NW		= GTK_ANCHOR_NORTH_WEST,
-;;   GTK_ANCHOR_NE		= GTK_ANCHOR_NORTH_EAST,
-;;   GTK_ANCHOR_S		= GTK_ANCHOR_SOUTH,
-;;   GTK_ANCHOR_SW		= GTK_ANCHOR_SOUTH_WEST,
-;;   GTK_ANCHOR_SE		= GTK_ANCHOR_SOUTH_EAST,
-;;   GTK_ANCHOR_W		= GTK_ANCHOR_WEST,
-;;   GTK_ANCHOR_E		= GTK_ANCHOR_EAST
-;; } GtkAnchorType;
+;;   GTK_ALIGN_FILL,
+;;   GTK_ALIGN_START,
+;;   GTK_ALIGN_END,
+;;   GTK_ALIGN_CENTER
+;; } GtkAlign;
 
-(define-enum-extended AnchorType
+(define-enum-extended Align
   (in-module "Gtk")
-  (c-name "GtkAnchorType")
+  (c-name "GtkAlign")
   (values
-    '("center" "GTK_ANCHOR_CENTER" "0")
-    '("north" "GTK_ANCHOR_NORTH" "1")
-    '("north-west" "GTK_ANCHOR_NORTH_WEST" "2")
-    '("north-east" "GTK_ANCHOR_NORTH_EAST" "3")
-    '("south" "GTK_ANCHOR_SOUTH" "4")
-    '("south-west" "GTK_ANCHOR_SOUTH_WEST" "5")
-    '("south-east" "GTK_ANCHOR_SOUTH_EAST" "6")
-    '("west" "GTK_ANCHOR_WEST" "7")
-    '("east" "GTK_ANCHOR_EAST" "8")
-    '("n" "GTK_ANCHOR_N" "1")
-    '("nw" "GTK_ANCHOR_NW" "2")
-    '("ne" "GTK_ANCHOR_NE" "3")
-    '("s" "GTK_ANCHOR_S" "4")
-    '("sw" "GTK_ANCHOR_SW" "5")
-    '("se" "GTK_ANCHOR_SE" "6")
-    '("w" "GTK_ANCHOR_W" "7")
-    '("e" "GTK_ANCHOR_E" "8")
+    '("fill" "GTK_ALIGN_FILL" "0")
+    '("start" "GTK_ALIGN_START" "1")
+    '("end" "GTK_ALIGN_END" "2")
+    '("center" "GTK_ALIGN_CENTER" "3")
   )
 )
 
@@ -1076,24 +1048,6 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GTK_VISIBILITY_NONE,
-;;   GTK_VISIBILITY_PARTIAL,
-;;   GTK_VISIBILITY_FULL
-;; } GtkVisibility;
-
-(define-enum-extended Visibility
-  (in-module "Gtk")
-  (c-name "GtkVisibility")
-  (values
-    '("none" "GTK_VISIBILITY_NONE" "0")
-    '("partial" "GTK_VISIBILITY_PARTIAL" "1")
-    '("full" "GTK_VISIBILITY_FULL" "2")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
 ;;   GTK_WIN_POS_NONE,
 ;;   GTK_WIN_POS_CENTER,
 ;;   GTK_WIN_POS_MOUSE,
@@ -1465,9 +1419,7 @@
 ;; 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
+;;   GTK_WRAP_BOX_V_EXPAND = 1 << 1
 ;; } GtkWrapBoxPacking;
 
 (define-flags-extended WrapBoxPacking
@@ -1475,9 +1427,7 @@
   (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")
+    '("v-expand" "GTK_WRAP_BOX_V_EXPAND" "1 << 1")
   )
 )
 
@@ -1826,9 +1776,8 @@
 ;;   PRIVATE_GTK_CHILD_VISIBLE         = 1 <<  10,  /* If widget should be mapped when parent is mapped */
 ;;   PRIVATE_GTK_REDRAW_ON_ALLOC       = 1 <<  11,  /* If we should queue a draw on the entire widget when it is reallocated */
 ;;   PRIVATE_GTK_ALLOC_NEEDED          = 1 <<  12,  /* If we we should allocate even if the allocation is the same */
-;;   PRIVATE_GTK_REQUEST_NEEDED        = 1 <<  13,  /* Whether we need to call gtk_widget_size_request */
-;;   PRIVATE_GTK_WIDTH_REQUEST_NEEDED  = 1 <<  14,  /* Whether we need to call gtk_extended_layout_get_desired_width */
-;;   PRIVATE_GTK_HEIGHT_REQUEST_NEEDED = 1 <<  15   /* Whether we need to call gtk_extended_layout_get_desired_height */
+;;   PRIVATE_GTK_WIDTH_REQUEST_NEEDED  = 1 <<  13,  /* Whether we need to call gtk_extended_layout_get_desired_width */
+;;   PRIVATE_GTK_HEIGHT_REQUEST_NEEDED = 1 <<  14   /* Whether we need to call gtk_extended_layout_get_desired_height */
 ;; } GtkPrivateFlags;
 
 (define-flags-extended PrivateFlags
@@ -1847,9 +1796,8 @@
     '("child-visible" "PRIVATE_GTK_CHILD_VISIBLE" "1 << 10")
     '("redraw-on-alloc" "PRIVATE_GTK_REDRAW_ON_ALLOC" "1 << 11")
     '("alloc-needed" "PRIVATE_GTK_ALLOC_NEEDED" "1 << 12")
-    '("request-needed" "PRIVATE_GTK_REQUEST_NEEDED" "1 << 13")
-    '("width-request-needed" "PRIVATE_GTK_WIDTH_REQUEST_NEEDED" "1 << 14")
-    '("height-request-needed" "PRIVATE_GTK_HEIGHT_REQUEST_NEEDED" "1 << 15")
+    '("width-request-needed" "PRIVATE_GTK_WIDTH_REQUEST_NEEDED" "1 << 13")
+    '("height-request-needed" "PRIVATE_GTK_HEIGHT_REQUEST_NEEDED" "1 << 14")
   )
 )
 
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index d8e8ba5..61617f3 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -818,16 +818,9 @@
   (gtype-id "GTK_TYPE_SCROLLED_WINDOW")
 )
 
-(define-object Item
-  (in-module "Gtk")
-  (parent "GtkBin")
-  (c-name "GtkItem")
-  (gtype-id "GTK_TYPE_ITEM")
-)
-
 (define-object MenuItem
   (in-module "Gtk")
-  (parent "GtkItem")
+  (parent "GtkBin")
   (c-name "GtkMenuItem")
   (gtype-id "GTK_TYPE_MENU_ITEM")
 )
@@ -867,6 +860,13 @@
   (gtype-id "GTK_TYPE_IMAGE_MENU_ITEM")
 )
 
+(define-object Item
+  (in-module "Gtk")
+  (parent "GtkBin")
+  (c-name "GtkItem")
+  (gtype-id "GTK_TYPE_ITEM")
+)
+
 (define-object HandleBox
   (in-module "Gtk")
   (parent "GtkBin")
@@ -1387,28 +1387,15 @@
   )
 )
 
-(define-enum AnchorType
+(define-enum Align
   (in-module "Gtk")
-  (c-name "GtkAnchorType")
-  (gtype-id "GTK_TYPE_ANCHOR_TYPE")
+  (c-name "GtkAlign")
+  (gtype-id "GTK_TYPE_ALIGN")
   (values
-    '("center" "GTK_ANCHOR_CENTER")
-    '("north" "GTK_ANCHOR_NORTH")
-    '("north-west" "GTK_ANCHOR_NORTH_WEST")
-    '("north-east" "GTK_ANCHOR_NORTH_EAST")
-    '("south" "GTK_ANCHOR_SOUTH")
-    '("south-west" "GTK_ANCHOR_SOUTH_WEST")
-    '("south-east" "GTK_ANCHOR_SOUTH_EAST")
-    '("west" "GTK_ANCHOR_WEST")
-    '("east" "GTK_ANCHOR_EAST")
-    '("n" "GTK_ANCHOR_N")
-    '("nw" "GTK_ANCHOR_NW")
-    '("ne" "GTK_ANCHOR_NE")
-    '("s" "GTK_ANCHOR_S")
-    '("sw" "GTK_ANCHOR_SW")
-    '("se" "GTK_ANCHOR_SE")
-    '("w" "GTK_ANCHOR_W")
-    '("e" "GTK_ANCHOR_E")
+    '("fill" "GTK_ALIGN_FILL")
+    '("start" "GTK_ALIGN_START")
+    '("end" "GTK_ALIGN_END")
+    '("center" "GTK_ALIGN_CENTER")
   )
 )
 
@@ -1806,17 +1793,6 @@
   )
 )
 
-(define-enum Visibility
-  (in-module "Gtk")
-  (c-name "GtkVisibility")
-  (gtype-id "GTK_TYPE_VISIBILITY")
-  (values
-    '("none" "GTK_VISIBILITY_NONE")
-    '("partial" "GTK_VISIBILITY_PARTIAL")
-    '("full" "GTK_VISIBILITY_FULL")
-  )
-)
-
 (define-enum WindowPosition
   (in-module "Gtk")
   (c-name "GtkWindowPosition")
@@ -2047,9 +2023,7 @@
   (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")
   )
 )
 
@@ -2258,7 +2232,6 @@
     '("child-visible" "PRIVATE_GTK_CHILD_VISIBLE")
     '("redraw-on-alloc" "PRIVATE_GTK_REDRAW_ON_ALLOC")
     '("alloc-needed" "PRIVATE_GTK_ALLOC_NEEDED")
-    '("request-needed" "PRIVATE_GTK_REQUEST_NEEDED")
     '("width-request-needed" "PRIVATE_GTK_WIDTH_REQUEST_NEEDED")
     '("height-request-needed" "PRIVATE_GTK_HEIGHT_REQUEST_NEEDED")
   )
@@ -7113,10 +7086,29 @@
   )
 )
 
+(define-method handle_border_width
+  (of-object "GtkContainerClass")
+  (c-name "gtk_container_class_handle_border_width")
+  (return-type "none")
+)
+
 
 
 ;; From gtkdebug.h
 
+(define-function gtk_get_debug_flags
+  (c-name "gtk_get_debug_flags")
+  (return-type "guint")
+)
+
+(define-function gtk_set_debug_flags
+  (c-name "gtk_set_debug_flags")
+  (return-type "none")
+  (parameters
+    '("guint" "flags")
+  )
+)
+
 
 
 ;; From gtkdialog.h
@@ -12639,6 +12631,31 @@
 
 ;; From gtkmain.h
 
+(define-function gtk_get_major_version
+  (c-name "gtk_get_major_version")
+  (return-type "guint")
+)
+
+(define-function gtk_get_minor_version
+  (c-name "gtk_get_minor_version")
+  (return-type "guint")
+)
+
+(define-function gtk_get_micro_version
+  (c-name "gtk_get_micro_version")
+  (return-type "guint")
+)
+
+(define-function gtk_get_binary_age
+  (c-name "gtk_get_binary_age")
+  (return-type "guint")
+)
+
+(define-function gtk_get_interface_age
+  (c-name "gtk_get_interface_age")
+  (return-type "guint")
+)
+
 (define-function gtk_check_version
   (c-name "gtk_check_version")
   (return-type "const-gchar*")
@@ -15989,6 +16006,15 @@
   )
 )
 
+(define-method join_group
+  (of-object "GtkRadioButton")
+  (c-name "gtk_radio_button_join_group")
+  (return-type "none")
+  (parameters
+    '("GtkRadioButton*" "group_source")
+  )
+)
+
 
 
 ;; From gtkradiomenuitem.h
@@ -26315,8 +26341,8 @@
   (return-type "GType")
 )
 
-(define-function gtk_anchor_type_get_type
-  (c-name "gtk_anchor_type_get_type")
+(define-function gtk_align_get_type
+  (c-name "gtk_align_get_type")
   (return-type "GType")
 )
 
@@ -26475,11 +26501,6 @@
   (return-type "GType")
 )
 
-(define-function gtk_visibility_get_type
-  (c-name "gtk_visibility_get_type")
-  (return-type "GType")
-)
-
 (define-function gtk_window_position_get_type
   (c-name "gtk_window_position_get_type")
   (return-type "GType")
@@ -27988,6 +28009,96 @@
   (return-type "AtkObject*")
 )
 
+(define-method get_h_align
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_h_align")
+  (return-type "GtkAlign")
+)
+
+(define-method set_h_align
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_set_h_align")
+  (return-type "none")
+  (parameters
+    '("GtkAlign" "align")
+  )
+)
+
+(define-method get_v_align
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_v_align")
+  (return-type "GtkAlign")
+)
+
+(define-method set_v_align
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_set_v_align")
+  (return-type "none")
+  (parameters
+    '("GtkAlign" "align")
+  )
+)
+
+(define-method get_margin_left
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_margin_left")
+  (return-type "int")
+)
+
+(define-method set_margin_left
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_set_margin_left")
+  (return-type "none")
+  (parameters
+    '("int" "margin")
+  )
+)
+
+(define-method get_margin_right
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_margin_right")
+  (return-type "int")
+)
+
+(define-method set_margin_right
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_set_margin_right")
+  (return-type "none")
+  (parameters
+    '("int" "margin")
+  )
+)
+
+(define-method get_margin_top
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_margin_top")
+  (return-type "int")
+)
+
+(define-method set_margin_top
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_set_margin_top")
+  (return-type "none")
+  (parameters
+    '("int" "margin")
+  )
+)
+
+(define-method get_margin_bottom
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_margin_bottom")
+  (return-type "int")
+)
+
+(define-method set_margin_bottom
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_set_margin_bottom")
+  (return-type "none")
+  (parameters
+    '("int" "margin")
+  )
+)
+
 (define-method set_colormap
   (of-object "GtkWidget")
   (c-name "gtk_widget_set_colormap")
@@ -29520,15 +29631,13 @@
   (return-type "guint")
 )
 
-(define-method insert_child_with_padding
+(define-method insert_child
   (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_insert_child_with_padding")
+  (c-name "gtk_wrap_box_insert_child")
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
     '("gint" "index")
-    '("guint" "horizontal_padding")
-    '("guint" "vertical_padding")
     '("GtkWrapBoxPacking" "packing")
   )
 )
diff --git a/gtk/src/spinner.hg b/gtk/src/spinner.hg
index cf414ee..608136a 100644
--- a/gtk/src/spinner.hg
+++ b/gtk/src/spinner.hg
@@ -17,9 +17,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtkmm/drawingarea.h>
+#include <gtkmm/widget.h>
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/drawingarea_p.h)
+_PINCLUDE(gtkmm/private/widget_p.h)
 
 
 namespace Gtk
@@ -32,9 +32,9 @@ _CC_INCLUDE(gtk/gtk.h)
  * @newin{2,20}
  * @ingroup Widgets
  */
-class Spinner : public DrawingArea
+class Spinner : public Wodget
 {
-  _CLASS_GTKOBJECT(Spinner,GtkSpinner,GTK_SPINNER,Gtk::DrawingArea,GtkDrawingArea)
+  _CLASS_GTKOBJECT(Spinner,GtkSpinner,GTK_SPINNER,Gtk::Widget,GtkWidget)
 public:
 
   _CTOR_DEFAULT
@@ -46,4 +46,3 @@ public:
 };
 
 } /* namespace Gtk */
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]