[gtkmm/spread-table: 5/5] Fix merge.

[Murray Cumming <murrayc src gnome org>]

commit f594b10c641233df189ac62b9b1ae8d5a2b02d86
Merge: edf0efe 55d4851
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 14 12:49:44 2010 +0200

    Fix merge.

 ChangeLog                                          |   45 +++
 gtk/gtkmm/comboboxentrytext.cc                     |  118 ------
 gtk/gtkmm/comboboxentrytext.h                      |   99 -----
 gtk/gtkmm/filelist.am                              |    2 -
 gtk/src/combobox.ccg                               |   15 +-
 gtk/src/combobox.hg                                |   59 ++--
 gtk/src/comboboxentry.ccg                          |   50 ---
 gtk/src/comboboxentry.hg                           |  107 -----
 gtk/src/filelist.am                                |    4 +-
 gtk/src/gtk_methods.defs                           |  328 ++++++++++++----
 gtk/src/statusbar.hg                               |    5 +-
 gtk/src/window.hg                                  |    7 +
 gtk/src/wrapbox.ccg                                |   34 --
 gtk/src/wrapbox.hg                                 |   88 -----
 tools/extra_defs_gen/generate_defs_gtk.cc          |    3 +-
 win32_installer/build-installer                    |  100 -----
 win32_installer/build-installer.sh                 |  154 ++++++++
 win32_installer/gtkmm-installer.nsi.in             |  405 ++++++++++++--------
 win32_installer/gtkmm-vc100-2_4.props              |   19 +
 win32_installer/gtkmm-vc100-d-2_4.props            |   19 +
 win32_installer/gtkmm-vc80-2_4.vsprops             |    4 +-
 win32_installer/gtkmm-vc80-d-2_4.vsprops           |    4 +-
 win32_installer/gtkmm-vc90-2_4.vsprops             |    4 +-
 win32_installer/gtkmm-vc90-d-2_4.vsprops           |    4 +-
 ...{install-msvc-module => install-msvc-module.sh} |  282 ++++++++-------
 25 files changed, 938 insertions(+), 1021 deletions(-)
---
diff --cc ChangeLog
index b93c817,cf4578a..be44d88
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,48 +1,67 @@@
 +2010-10-11  Murray Cumming  <murrayc murrayc com>
 +
 +	SpreadTable: Add get_child_line().
 +
 +	* gtk/src/gtk_methods.defs: Added the generated part for the new function.
 +	* gtk/src/spreadtable.hg: Added get_child_line().
 +
 +2010-10-08  Murray Cumming  <murrayc murrayc com>
 +
 +	Add SpreadTable
 +
 +	* tools/extra_defs_gen/generate_defs_gtk.cc: Use GTK_SPREAD_TABLE.
 +  * gtk/src/gtk_signas.defs: Add the generated GtkSpreadTable parts.
 +
 +	* gtk/src/gtk_methods.defs: Added parts for GtkSpreadTable, from h2defs.py.
 +	* gtk/gtkmm.h: Include gtkmm/spreadtable.h.
 +  * gtk/src/spreadtable.[hg|ccg]: New files, wrapping GtkSpreadTable.
 +	* gtk/src/filelist.am: Mention the new files.
 +
+ 2010-10-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Move resize_grip methods from Statusbar to Window.
+ 
+ 	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+ 	* gtk/src/statusbar.hg: Remove get/set_has_resize_grip().
+ 	* gtk/src/window.hg: Added get/set_has_resize_grip(),
+   get_resize_grip_is_visible(), get_resize_grip_area().
+ 
+ 2010-10-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Remove ComboBoxEntry and ComboBoxEntryText.
+ 
+ 	* gtk/src/comboboxentry.[h|ccg]: Remove this because it has been replaced
+   with a has-entry construct-time property.
+ 	* gtk/gtkmm/comboboxentrytext.[h|cc]: Remove this because it derives
+   from ComboBoxEntry. People should use ComboBoxText instead.
+   * gtk/src/combobox.hg: Changed constructors to add an optional has_entry
+   parameter.
+ 
+ 2010-10-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Remove WrapBox.
+ 
+   * gtk/src/filelist.am:
+ 	* gtk/src/wrapbox.[hg|ccg]: Remove WrapBox because GtkWrapBox has moved to
+   libegg instead.
+ 
+ 2010-10-13  Armin Burgmeier  <armin arbur net>
+ 
+ 	* win32_installer/gtkmm-vc100-2_4.props:
+ 	* win32_installer/gtkmm-vc100-d-2_4.props: Add property sheets for
+ 	MSVC 2010.
+ 
+ 	* win32_installer/gtkmm-vc80-2_4.vsprops:
+ 	* win32_installer/gtkmm-vc80-d-2_4.vsprops:
+ 	* win32_installer/gtkmm-vc90-2_4.vsprops:
+ 	* win32_installer/gtkmm-vc90-d-2_4.vsprops: Add Win32 to the property
+ 	sheet name so that it can be distinguished from the Win64 variant.
+ 
+ 	* win32_installer/gtkmm-installer.nsi.in:
+ 	* win32_installer/install-msvc-module.sh:
+ 	* win32_installer/build-installer.sh: Update installer for gtkmm 2.22,
+ 	64 bit and MSVC 2010.
+ 
  2010-10-06  Murray Cumming  <murrayc murrayc com>>
  
  	Fix the build with latest GTK+ from git master.
diff --cc gtk/src/gtk_methods.defs
index 61ff77b,fa03f8a..686b10f
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@@ -18607,88 -18590,92 +18590,172 @@@
    (return-type "none")
  )
  
 +;; From gtkspreadtable.h
 +
 +(define-function gtk_spread_table_get_type
 +  (c-name "gtk_spread_table_get_type")
 +  (return-type "GType")
 +)
 +
 +(define-function gtk_spread_table_new
 +  (c-name "gtk_spread_table_new")
 +  (is-constructor-of "GtkSpreadTable")
 +  (return-type "GtkWidget*")
 +  (parameters
 +    '("GtkOrientation" "orientation")
 +    '("guint" "lines")
 +  )
 +)
 +
 +(define-method insert_child
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_insert_child")
 +  (return-type "none")
 +  (parameters
 +    '("GtkWidget*" "child")
 +    '("gint" "index")
 +  )
 +)
 +
 +(define-method get_child_line
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_get_child_line")
 +  (return-type "guint")
 +  (parameters
 +    '("GtkWidget*" "child")
 +    '("gint" "size")
 +  )
 +)
 +
 +(define-method set_lines
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_set_lines")
 +  (return-type "none")
 +  (parameters
 +    '("guint" "lines")
 +  )
 +)
 +
 +(define-method get_lines
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_get_lines")
 +  (return-type "guint")
 +)
 +
 +(define-method set_horizontal_spacing
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_set_horizontal_spacing")
 +  (return-type "none")
 +  (parameters
 +    '("guint" "spacing")
 +  )
 +)
 +
 +(define-method get_horizontal_spacing
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_get_horizontal_spacing")
 +  (return-type "guint")
 +)
 +
 +(define-method set_vertical_spacing
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_set_vertical_spacing")
 +  (return-type "none")
 +  (parameters
 +    '("guint" "spacing")
 +  )
 +)
  
 +(define-method get_vertical_spacing
 +  (of-object "GtkSpreadTable")
 +  (c-name "gtk_spread_table_get_vertical_spacing")
 +  (return-type "guint")
 +)
  
+ ;; From gtkspreadtable.h
+ 
+ (define-function gtk_spread_table_get_type
+   (c-name "gtk_spread_table_get_type")
+   (return-type "GType")
+ )
+ 
+ (define-function gtk_spread_table_new
+   (c-name "gtk_spread_table_new")
+   (is-constructor-of "GtkSpreadTable")
+   (return-type "GtkWidget*")
+   (parameters
+     '("GtkOrientation" "orientation")
+     '("guint" "lines")
+   )
+ )
+ 
+ (define-method insert_child
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_insert_child")
+   (return-type "none")
+   (parameters
+     '("GtkWidget*" "child")
+     '("gint" "index")
+   )
+ )
+ 
+ (define-method get_child_line
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_get_child_line")
+   (return-type "guint")
+   (parameters
+     '("GtkWidget*" "child")
+     '("gint" "size")
+   )
+ )
+ 
+ (define-method set_lines
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_set_lines")
+   (return-type "none")
+   (parameters
+     '("guint" "lines")
+   )
+ )
+ 
+ (define-method get_lines
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_get_lines")
+   (return-type "guint")
+ )
+ 
+ (define-method set_horizontal_spacing
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_set_horizontal_spacing")
+   (return-type "none")
+   (parameters
+     '("guint" "spacing")
+   )
+ )
+ 
+ (define-method get_horizontal_spacing
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_get_horizontal_spacing")
+   (return-type "guint")
+ )
+ 
+ (define-method set_vertical_spacing
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_set_vertical_spacing")
+   (return-type "none")
+   (parameters
+     '("guint" "spacing")
+   )
+ )
+ 
+ (define-method get_vertical_spacing
+   (of-object "GtkSpreadTable")
+   (c-name "gtk_spread_table_get_vertical_spacing")
+   (return-type "guint")
+ )
+ 
+ 
+ 
  ;; From gtkstatusbar.h
  
  (define-function gtk_statusbar_get_type