[gtkmm] gtkmm: CellView: Add natural-size methods.

[Murray Cumming <murrayc src gnome org>]

commit a8582d835859a140259c8f3ef0e829dda74bb49e
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 6 11:29:28 2010 +0200

    gtkmm: CellView: Add natural-size methods.
    
    * gtk/src/cellview.hg: Added get_desired_width_of_row() and
      get_desired_height_for_width_of_row().
    * gtk/src/filechooserbutton.hg: Remove the constructor that lets us set
      the backend, because the C function was removed. This was already not
      generated because it is no longer in the .defs, so this just avoids the
      gmmproc warning.

 ChangeLog                    |   37 ++++++++++++++++++++++++-------------
 gtk/src/cellview.hg          |    3 +++
 gtk/src/filechooserbutton.hg |   36 +++++++++++++-----------------------
 3 files changed, 40 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 243353e..c9090d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-06  Murray Cumming  <murrayc murraycc com>>
+
+	gtkmm: CellView: Add natural-size methods.
+
+	* gtk/src/cellview.hg: Added get_desired_width_of_row() and
+  get_desired_height_for_width_of_row().
+	* gtk/src/filechooserbutton.hg: Remove the constructor that lets us set
+  the backend, because the C function was removed. This was already not
+  generated because it is no longer in the .defs, so this just avoids the
+  gmmproc warning.
+
 2010-09-04  Murray Cumming  <murrayc murrayc com>
 
 	gtkmm: IconInfo, ProgressBar: Added new methods.
@@ -9,8 +20,8 @@
 
 	gdkmm: Window: Added new methods.
 
-	* gdk/src/window.[hg|ccg]: Added set_device_cursor(), get_device_position(), 
-	get_device_events(), set_device_events(), get_support_multidevice(), 
+	* gdk/src/window.[hg|ccg]: Added set_device_cursor(), get_device_position(),
+	get_device_events(), set_device_events(), get_support_multidevice(),
 	set_support_multidevice().
 	* tools/m4/convert_gdk.m4: Added necessary conversion.
 
@@ -34,12 +45,12 @@
 	gtkmm: Regenerated function .defs, fixing the build with latest GTK+.
 
 	* gtk/src/gtk_methods.defs: Regenerate with h2defs.py.
-	* gtk/src/dialog.hg: Remove get/set_has_separator() and property, because 
+	* gtk/src/dialog.hg: Remove get/set_has_separator() and property, because
 	it was removed from GTK+.
 
 2010-09-04  Murray Cumming  <murrayc murrayc com>
 
-	gtkmm: Fix typos to really avoid documentation warnings. 
+	gtkmm: Fix typos to really avoid documentation warnings.
 
 	* gtk/src/gtk_extra_objects.defs: Add a missing quote and add some other
 	definitions.
@@ -50,26 +61,26 @@
 
 	* gtk/src/filelist.am:
 	* gtk/src/gdk.defs:
-	* gtk/src/gdk_extra_objects.defs: Added this *extra_objects.defs file, 
+	* gtk/src/gdk_extra_objects.defs: Added this *extra_objects.defs file,
 	with hand-coded define-object sections, for objects that hide their *Class
-	or *Iface struct declarations, which stops h2defs.py from generating 
+	or *Iface struct declarations, which stops h2defs.py from generating
 	define-object sections.
-	These allows DocsParser.pm to know how to split mentions of C functions into 
-	the object and the method, so it can guess the C++ method name to mention 
+	These allows DocsParser.pm to know how to split mentions of C functions into
+	the object and the method, so it can guess the C++ method name to mention
 	instead.
-	
+
 2010-09-03  Murray Cumming  <murrayc murrayc com>
 
 	gdkmm: Avoid most Documentation warnings from gmmproc.
 
 	* gdk/src/filelist.am:
 	* gdk/src/gdk.defs:
-	* gdk/src/gdk_extra_objects.defs: Added this *extra_objects.defs file, 
+	* gdk/src/gdk_extra_objects.defs: Added this *extra_objects.defs file,
 	with hand-coded define-object sections, for objects that hide their *Class
-	or *Iface struct declarations, which stops h2defs.py from generating 
+	or *Iface struct declarations, which stops h2defs.py from generating
 	define-object sections.
-	These allows DocsParser.pm to know how to split mentions of C functions into 
-	the object and the method, so it can guess the C++ method name to mention 
+	These allows DocsParser.pm to know how to split mentions of C functions into
+	the object and the method, so it can guess the C++ method name to mention
 	instead.
 
 2010-09-02  Murray Cumming  <murrayc murrayc com>
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index 92e99b9..da542d2 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -84,6 +84,9 @@ public:
   _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)
 
+  _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)
+
   _WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color)
 
   _IGNORE(gtk_cell_view_get_cell_renderers) //deprecated
diff --git a/gtk/src/filechooserbutton.hg b/gtk/src/filechooserbutton.hg
index ab0ef45..ad9f8fa 100644
--- a/gtk/src/filechooserbutton.hg
+++ b/gtk/src/filechooserbutton.hg
@@ -1,7 +1,7 @@
 /* $Id: filechooserbutton.hg,v 1.7 2005/12/12 08:14:21 murrayc Exp $ */
 
 /* filechooserbutton.h
- * 
+ *
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,15 +29,15 @@ namespace Gtk
 {
 
 /** A button to launch a file chooser dialog.
- * 
- * This widget lets the user select a file. It implements the FileChooser interface. Visually, it is a file name with a 
- * button to bring up a FileChooserDialog. The user can then use that dialog to change the file associated with that 
+ *
+ * This widget lets the user select a file. It implements the FileChooser interface. Visually, it is a file name with a
+ * button to bring up a FileChooserDialog. The user can then use that dialog to change the file associated with that
  * button. This widget does not support setting the "select_multiple" property to true.
  *
  * The FileChooserButton supports the FileChooserActions FILE_CHOOSER_ACTION_OPEN and FILE_CHOOSER_ACTION_SELECT_FOLDER.
  *
- * The FileChooserButton will ellipsize the label, and will thus request little horizontal space. To give the button more 
- * space, you should call size_request(), set_width_chars(), or pack the button in such a way that other interface 
+ * The FileChooserButton will ellipsize the label, and will thus request little horizontal space. To give the button more
+ * space, you should call size_request(), set_width_chars(), or pack the button in such a way that other interface
  * elements give space to the widget.
  *
  * The FileChooserButton widget looks like this:
@@ -56,49 +56,39 @@ public:
   /** Creates a new file-selecting button widget with the default title.
    * @param title The title of the browse dialog.
    * @param action The open mode for the widget.
-   * @param backend The name of the Gtk::FileSystem backend to use.
    */
   explicit FileChooserButton(FileChooserAction action = FILE_CHOOSER_ACTION_OPEN);
-  
+
   /** Creates a new file-selecting button widget.
    *
    * @param title The title of the browse dialog.
    * @param action The open mode for the widget.
    */
   _WRAP_CTOR(FileChooserButton(const Glib::ustring& title, FileChooserAction action = FILE_CHOOSER_ACTION_OPEN), gtk_file_chooser_button_new)
-  
-  /** Creates a new file-selecting button widget using backend.
-   *
-   * @param title The title of the browse dialog.
-   * @param action The open mode for the widget.
-   * @param backend The name of the Gtk::FileSystem backend to use.
-   */ 
-  _WRAP_CTOR(FileChooserButton(const Glib::ustring& title, FileChooserAction action, const Glib::ustring& backend), gtk_file_chooser_button_new_with_backend)
-  
+
   /** Creates a new file-selecting button widget which uses dialog as its file-picking window.
    *
    * @param dialog The dialog to use.
    */
   _WRAP_CTOR(FileChooserButton(FileChooserDialog& dialog), gtk_file_chooser_button_new_with_dialog)
-  
+
   _WRAP_METHOD(Glib::ustring get_title() const, gtk_file_chooser_button_get_title)
   _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_file_chooser_button_set_title)
- 
+
   _WRAP_METHOD(int get_width_chars() const, gtk_file_chooser_button_get_width_chars)
   _WRAP_METHOD(void set_width_chars(int n_chars), gtk_file_chooser_button_set_width_chars)
 
   _WRAP_METHOD(bool get_focus_on_click() const, gtk_file_chooser_button_get_focus_on_click)
-  _WRAP_METHOD(void set_focus_on_click(gboolean focus_on_click = true), gtk_file_chooser_button_set_focus_on_click)   
+  _WRAP_METHOD(void set_focus_on_click(gboolean focus_on_click = true), gtk_file_chooser_button_set_focus_on_click)
 
   //This is a G_SIGNAL_ACTION signal, but it seems to be public API for applications.
   //See http://bugzilla.gnome.org/show_bug.cgi?id=353196
   _WRAP_SIGNAL(void file_set(), "file-set")
 
   _WRAP_PROPERTY("focus-on-click", bool)
-  _WRAP_PROPERTY("title", Glib::ustring)                                          
-  _WRAP_PROPERTY("width-chars", int)    
+  _WRAP_PROPERTY("title", Glib::ustring)
+  _WRAP_PROPERTY("width-chars", int)
 };
 
 
 } // namespace Gtk
-