[gtkmm] gtkmm: Widget: Rename x/y_align to x/yalign, as in GTK+.

[Murray Cumming <murrayc src gnome org>]

commit 143a995f61170d69dde44e216bc7529029765f09
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 16 18:38:52 2010 +0200

    gtkmm: Widget: Rename x/y_align to x/yalign, as in GTK+.
    
    * gtk/src/gtk_methods.defs: Regenerated.
    * gtk/src/widget.hg: Match the change in the GTK+ API.

 ChangeLog                |    7 +++++++
 gtk/src/gtk_methods.defs |   46 +++++++++++++++++++++++-----------------------
 gtk/src/widget.hg        |   12 ++++++------
 3 files changed, 36 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e47ce01..9068fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-16  Murray Cumming  <murrayc murrayc com>
+
+	gtkmm: Widget: Rename x/y_align to x/yalign, as in GTK+.
+
+	* gtk/src/gtk_methods.defs: Regenerated.
+	* gtk/src/widget.hg: Match the change in the GTK+ API.
+
 2010-09-15  Murray Cumming  <murrayc murrayc com>
 
 	gtkmm: SizeRequest: get_size(): Make this const.
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 61617f3..e2278d0 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -447,6 +447,13 @@
   (gtype-id "GTK_TYPE_WIDGET")
 )
 
+(define-object Spinner
+  (in-module "Gtk")
+  (parent "GtkWidget")
+  (c-name "GtkSpinner")
+  (gtype-id "GTK_TYPE_SPINNER")
+)
+
 (define-object Separator
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -615,13 +622,6 @@
   (gtype-id "GTK_TYPE_DRAWING_AREA")
 )
 
-(define-object Spinner
-  (in-module "Gtk")
-  (parent "GtkDrawingArea")
-  (c-name "GtkSpinner")
-  (gtype-id "GTK_TYPE_SPINNER")
-)
-
 (define-object Container
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -28009,30 +28009,30 @@
   (return-type "AtkObject*")
 )
 
-(define-method get_h_align
+(define-method get_halign
   (of-object "GtkWidget")
-  (c-name "gtk_widget_get_h_align")
+  (c-name "gtk_widget_get_halign")
   (return-type "GtkAlign")
 )
 
-(define-method set_h_align
+(define-method set_halign
   (of-object "GtkWidget")
-  (c-name "gtk_widget_set_h_align")
+  (c-name "gtk_widget_set_halign")
   (return-type "none")
   (parameters
     '("GtkAlign" "align")
   )
 )
 
-(define-method get_v_align
+(define-method get_valign
   (of-object "GtkWidget")
-  (c-name "gtk_widget_get_v_align")
+  (c-name "gtk_widget_get_valign")
   (return-type "GtkAlign")
 )
 
-(define-method set_v_align
+(define-method set_valign
   (of-object "GtkWidget")
-  (c-name "gtk_widget_set_v_align")
+  (c-name "gtk_widget_set_valign")
   (return-type "none")
   (parameters
     '("GtkAlign" "align")
@@ -28042,7 +28042,7 @@
 (define-method get_margin_left
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_left")
-  (return-type "int")
+  (return-type "gint")
 )
 
 (define-method set_margin_left
@@ -28050,14 +28050,14 @@
   (c-name "gtk_widget_set_margin_left")
   (return-type "none")
   (parameters
-    '("int" "margin")
+    '("gint" "margin")
   )
 )
 
 (define-method get_margin_right
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_right")
-  (return-type "int")
+  (return-type "gint")
 )
 
 (define-method set_margin_right
@@ -28065,14 +28065,14 @@
   (c-name "gtk_widget_set_margin_right")
   (return-type "none")
   (parameters
-    '("int" "margin")
+    '("gint" "margin")
   )
 )
 
 (define-method get_margin_top
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_top")
-  (return-type "int")
+  (return-type "gint")
 )
 
 (define-method set_margin_top
@@ -28080,14 +28080,14 @@
   (c-name "gtk_widget_set_margin_top")
   (return-type "none")
   (parameters
-    '("int" "margin")
+    '("gint" "margin")
   )
 )
 
 (define-method get_margin_bottom
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_bottom")
-  (return-type "int")
+  (return-type "gint")
 )
 
 (define-method set_margin_bottom
@@ -28095,7 +28095,7 @@
   (c-name "gtk_widget_set_margin_bottom")
   (return-type "none")
   (parameters
-    '("int" "margin")
+    '("gint" "margin")
   )
 )
 
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 8adee70..750a020 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -327,10 +327,10 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Atk::Object> get_accessible(), gtk_widget_get_accessible, refreturn, ifdef GTKMM_ATKMM_ENABLED)
   _WRAP_METHOD(Glib::RefPtr<const Atk::Object> get_accessible() const, gtk_widget_get_accessible, refreturn, constversion, ifdef GTKMM_ATKMM_ENABLED)
 
-  _WRAP_METHOD(Align get_h_align() const, gtk_widget_get_h_align)
-  _WRAP_METHOD(void set_h_align(Align align), gtk_widget_set_h_align)
-  _WRAP_METHOD(Align get_v_align() const,gtk_widget_get_v_align)
-  _WRAP_METHOD(void set_v_align(Align align), gtk_widget_set_v_align)
+  _WRAP_METHOD(Align get_halign() const, gtk_widget_get_halign)
+  _WRAP_METHOD(void set_halign(Align align), gtk_widget_set_halign)
+  _WRAP_METHOD(Align get_valign() const,gtk_widget_get_valign)
+  _WRAP_METHOD(void set_valign(Align align), gtk_widget_set_valign)
   _WRAP_METHOD(int get_margin_left() const, gtk_widget_get_margin_left)
   _WRAP_METHOD(void set_margin_left(int margin), gtk_widget_set_margin_left)
   _WRAP_METHOD(int get_margin_right() const, gtk_widget_get_margin_right)
@@ -919,8 +919,8 @@ dnl
   _WRAP_PROPERTY("window", Glib::RefPtr<Gdk::Window>)
   _WRAP_PROPERTY("no-show-all", bool)
 
-  _WRAP_PROPERTY("h-align", Align)
-  _WRAP_PROPERTY("v-align", Align)
+  _WRAP_PROPERTY("halign", Align)
+  _WRAP_PROPERTY("valign", Align)
   _WRAP_PROPERTY("margin-left", int)
   _WRAP_PROPERTY("margin-right", int)
   _WRAP_PROPERTY("margin-top", int)