[gtkmm] Partly ix the build against GTK+ git master.

[Murray Cumming <murrayc src gnome org>]

commit 45f8a06420cf60d03d5aa9ed50ad80248ff74e49
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Sep 26 11:45:43 2010 +0200

    Partly ix the build against GTK+ git master.
    
    * gtk/src/gtk_methods.defs: Regenerated.
    * gtk/src/notebook.[hg|ccg]: Removed get/set_group(), replacing them with
    get/set_group_name().
    * gtk/src/progressbar.hg: Removed the orientation property, which is now
    in the Orientable base class.
    * gtk/src/gtk_extra_objects.defs: Added GtkEditable to help the documentation
    parser.

 ChangeLog                      |   12 ++++++
 gtk/src/gtk_extra_objects.defs |    6 +++
 gtk/src/gtk_methods.defs       |   85 +++++++++++++---------------------------
 gtk/src/notebook.ccg           |   36 -----------------
 gtk/src/notebook.hg            |   16 +------
 gtk/src/progressbar.hg         |    1 -
 6 files changed, 49 insertions(+), 107 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 12a87c0..7ff8238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-09-26  Murray Cumming  <murrayc murrayc com>
 
+	Partly ix the build against GTK+ git master.
+
+	* gtk/src/gtk_methods.defs: Regenerated.
+	* gtk/src/notebook.[hg|ccg]: Removed get/set_group(), replacing them with 
+	get/set_group_name().
+	* gtk/src/progressbar.hg: Removed the orientation property, which is now 
+	in the Orientable base class.
+	* gtk/src/gtk_extra_objects.defs: Added GtkEditable to help the documentation 
+	parser.
+	
+2010-09-26  Murray Cumming  <murrayc murrayc com>
+
 	gtkmm: SeparatorToolItem: Added get/set_draw().
 
 	* gtk/src/separatortoolitem.hg: Added get/set_draw().
diff --git a/gtk/src/gtk_extra_objects.defs b/gtk/src/gtk_extra_objects.defs
index cb93182..fbf13c1 100644
--- a/gtk/src/gtk_extra_objects.defs
+++ b/gtk/src/gtk_extra_objects.defs
@@ -18,6 +18,12 @@
   (gtype-id "GTK_TYPE_CLIPBOARD")
 )
 
+(define-object Editable
+  (in-module "Gtk")
+  (c-name "GtkEditable")
+  (gtype-id "GTK_TYPE_EDITABLE")
+)
+
 (define-object FileChooser
   (in-module "Gtk")
   (c-name "GtkFileChooser")
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 9d1e42f..7c43e5b 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -72,12 +72,6 @@
   (gtype-id "GTK_TYPE_CELL_SIZE_REQUEST")
 )
 
-(define-object Editable
-  (in-module "Gtk")
-  (c-name "GtkEditable")
-  (gtype-id "GTK_TYPE_EDITABLE")
-)
-
 (define-object EntryBuffer
   (in-module "Gtk")
   (parent "GObject")
@@ -2797,26 +2791,6 @@
   )
 )
 
-(define-function gtk_about_dialog_set_email_hook
-  (c-name "gtk_about_dialog_set_email_hook")
-  (return-type "GtkAboutDialogActivateLinkFunc")
-  (parameters
-    '("GtkAboutDialogActivateLinkFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
-(define-function gtk_about_dialog_set_url_hook
-  (c-name "gtk_about_dialog_set_url_hook")
-  (return-type "GtkAboutDialogActivateLinkFunc")
-  (parameters
-    '("GtkAboutDialogActivateLinkFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
 
 
 ;; From gtkaccelgroup.h
@@ -12386,16 +12360,6 @@
   )
 )
 
-(define-function gtk_link_button_set_uri_hook
-  (c-name "gtk_link_button_set_uri_hook")
-  (return-type "GtkLinkButtonUriFunc")
-  (parameters
-    '("GtkLinkButtonUriFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
 (define-method get_visited
   (of-object "GtkLinkButton")
   (c-name "gtk_link_button_get_visited")
@@ -13041,6 +13005,7 @@
     '("GtkWidget*" "parent_menu_item")
     '("GtkMenuPositionFunc" "func")
     '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
     '("guint" "button")
     '("guint32" "activate_time")
   )
@@ -13807,29 +13772,19 @@
   )
 )
 
-(define-function gtk_notebook_set_window_creation_hook
-  (c-name "gtk_notebook_set_window_creation_hook")
-  (return-type "none")
-  (parameters
-    '("GtkNotebookWindowCreationFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
-(define-method set_group
+(define-method set_group_name
   (of-object "GtkNotebook")
-  (c-name "gtk_notebook_set_group")
+  (c-name "gtk_notebook_set_group_name")
   (return-type "none")
   (parameters
-    '("gpointer" "group")
+    '("const-gchar*" "group_name")
   )
 )
 
-(define-method get_group
+(define-method get_group_name
   (of-object "GtkNotebook")
-  (c-name "gtk_notebook_get_group")
-  (return-type "gpointer")
+  (c-name "gtk_notebook_get_group_name")
+  (return-type "const-gchar*")
 )
 
 (define-method get_current_page
@@ -29535,7 +29490,8 @@
   (return-type "GtkWidget*")
   (parameters
     '("GtkWrapAllocationMode" "mode")
-    '("GtkWrapBoxSpreading" "spreading")
+    '("GtkWrapBoxSpreading" "horizontal_spreading")
+    '("GtkWrapBoxSpreading" "vertical_spreading")
     '("guint" "horizontal_spacing")
     '("guint" "vertical_spacing")
   )
@@ -29556,18 +29512,33 @@
   (return-type "GtkWrapAllocationMode")
 )
 
-(define-method set_spreading
+(define-method set_horizontal_spreading
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_horizontal_spreading")
+  (return-type "none")
+  (parameters
+    '("GtkWrapBoxSpreading" "spreading")
+  )
+)
+
+(define-method get_horizontal_spreading
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_horizontal_spreading")
+  (return-type "GtkWrapBoxSpreading")
+)
+
+(define-method set_vertical_spreading
   (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_spreading")
+  (c-name "gtk_wrap_box_set_vertical_spreading")
   (return-type "none")
   (parameters
     '("GtkWrapBoxSpreading" "spreading")
   )
 )
 
-(define-method get_spreading
+(define-method get_vertical_spreading
   (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_spreading")
+  (c-name "gtk_wrap_box_get_vertical_spreading")
   (return-type "GtkWrapBoxSpreading")
 )
 
diff --git a/gtk/src/notebook.ccg b/gtk/src/notebook.ccg
index 83ca1d3..c5490d0 100644
--- a/gtk/src/notebook.ccg
+++ b/gtk/src/notebook.ccg
@@ -22,34 +22,6 @@
 #include <gtkmm/label.h>
 #include <algorithm>
 
-namespace
-{
-extern "C"
-{
-static GtkNotebook* SignalProxy_WindowCreation_gtk_callback(GtkNotebook*, GtkWidget* page,
-                                                            int x, int y, void* data)
-{
-  Gtk::Notebook::SlotWindowCreation *const
-    slot = static_cast<Gtk::Notebook::SlotWindowCreation*>(data);
-  try
-  {
-    return Glib::unwrap((*slot)(Glib::wrap(page), x, y));
-  }
-  catch (...)
-  {
-    Glib::exception_handlers_invoke();
-  }
-  return 0;
-}
-
-static void SignalProxy_WindowCreation_gtk_callback_destroy(void* data)
-{
-  delete static_cast<Gtk::Notebook::SlotWindowCreation*>(data);
-}
-
-} // extern "C"
-} // anonymous namespace
-
 namespace Gtk
 {
 
@@ -114,12 +86,4 @@ int Notebook::insert_page(Widget& child, int position)
   return gtk_notebook_insert_page(gobj(), child.gobj(), 0 /* see GTK+ docs */, position);
 }
 
-typedef sigc::slot<Widget*, int, int> SlotWindowCreation;
-
-void Notebook::set_window_creation_hook(const SlotWindowCreation& slot)
-{
-  SlotWindowCreation* slot_copy = new SlotWindowCreation(slot);
-  gtk_notebook_set_window_creation_hook(&SignalProxy_WindowCreation_gtk_callback, slot_copy, &SignalProxy_WindowCreation_gtk_callback_destroy);
-}
-
 } //namespace Gtk
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 11acac8..fd4600c 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -82,20 +82,10 @@ public:
   _WRAP_METHOD(void remove_page(int page_num = 0), gtk_notebook_remove_page)
   void remove_page(Widget& child);
 
-  /** For instance,
-   * Notebook* on_window_creation(Widget* page, int x, int y);
-   */
-  typedef sigc::slot<Notebook*, Widget*, int, int> SlotWindowCreation;
-
-  static void set_window_creation_hook(const SlotWindowCreation& slot);
-  _IGNORE(gtk_notebook_set_window_creation_hook)
-
   _IGNORE(gtk_notebook_set_group_id, gtk_notebook_get_group_id) //deprecated
 
-  //TODO: Use something nicer than void*/gpointer?
-  _WRAP_METHOD(void set_group(void* group), gtk_notebook_set_group)
-  _WRAP_METHOD(void* get_group(), gtk_notebook_get_group)
-  _WRAP_METHOD(const void* get_group() const, gtk_notebook_get_group, constversion)
+  _WRAP_METHOD(void set_group_name(const Glib::ustring& group_name), gtk_notebook_set_group_name)
+  _WRAP_METHOD(Glib::ustring get_group_name() const, gtk_notebook_get_group_name)
 
   _WRAP_METHOD(int get_current_page() const, gtk_notebook_get_current_page)
   _WRAP_METHOD(Widget* get_nth_page(int page_num), gtk_notebook_get_nth_page)
@@ -171,7 +161,7 @@ public:
   _WRAP_PROPERTY("show-border", bool)
   _WRAP_PROPERTY("scrollable", bool)
   _WRAP_PROPERTY("page", int)
-  _WRAP_PROPERTY("group", void*) //TODO: What is this?
+  _WRAP_PROPERTY("group-name", Glib::ustring)
 
   //TODO: Wrap the child properties, such as tab-fill and tab-expand.
 };
diff --git a/gtk/src/progressbar.hg b/gtk/src/progressbar.hg
index 36da219..8cee651 100644
--- a/gtk/src/progressbar.hg
+++ b/gtk/src/progressbar.hg
@@ -95,7 +95,6 @@ public:
 
   _WRAP_PROPERTY("fraction", double)
   _WRAP_PROPERTY("pulse-step", double)
-  _WRAP_PROPERTY("orientation", ProgressBarOrientation)
   _WRAP_PROPERTY("text", Glib::ustring)
   _WRAP_PROPERTY("ellipsize", bool)
 };