[gtkmm] CellEditable: Added editing_canceled property.

[Murray Cumming <murrayc src gnome org>]

commit 2c48e507cce695f075d1e54c617edddb1a5ee848
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 24 23:33:48 2010 +0200

    CellEditable: Added editing_canceled property.
    
    * tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkCellEditable.
    * gtk/src/gtk_signals.defs: Added the GtkCellEditable entries.
    * gtk/src/gtk_other.defs: Remove entries that are no longer needed,
    because they are now in gtk_signals.defs or gtk_methods.defs
    * gtk/src/gtk_methods.defs: Hand-edit some GtkAboutDialog entries to correct
    the constness of some return types.
    * gtk/src/celleditable.hg: Added editing_canceled property.

 ChangeLog                                 |   12 +++
 gtk/src/celleditable.hg                   |    2 +
 gtk/src/gtk_methods.defs                  |    6 +-
 gtk/src/gtk_other.defs                    |  104 -----------------------------
 gtk/src/gtk_signals.defs                  |   24 +++++++
 tools/extra_defs_gen/generate_defs_gtk.cc |    1 +
 6 files changed, 42 insertions(+), 107 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0e9ec76..87d96c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-09-24  Murray Cumming  <murrayc murrayc com>
 
+	CellEditable: Added editing_canceled property.
+
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkCellEditable.
+	* gtk/src/gtk_signals.defs: Added the GtkCellEditable entries.
+	* gtk/src/gtk_other.defs: Remove entries that are no longer needed, 
+	because they are now in gtk_signals.defs or gtk_methods.defs
+	* gtk/src/gtk_methods.defs: Hand-edit some GtkAboutDialog entries to correct 
+	the constness of some return types.
+	* gtk/src/celleditable.hg: Added editing_canceled property.
+
+2010-09-24  Murray Cumming  <murrayc murrayc com>
+
 	gtkmm: Added some missing properties.
 
 	* gtk/src/accelgroup.hg: Added is_locked and modifier_mask properties.
diff --git a/gtk/src/celleditable.hg b/gtk/src/celleditable.hg
index a19e47d..ef0eebf 100644
--- a/gtk/src/celleditable.hg
+++ b/gtk/src/celleditable.hg
@@ -47,6 +47,8 @@ public:
 
   _WRAP_SIGNAL(void editing_done(), "editing_done")
   _WRAP_SIGNAL(void remove_widget(), "remove_widget")
+  
+  _WRAP_PROPERTY("editing-canceled", bool)
 
 protected:
   _WRAP_VFUNC(void start_editing(GdkEvent* event), start_editing)
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index e2278d0..9d1e42f 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -2710,7 +2710,7 @@
 (define-method get_authors
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_authors")
-  (return-type "const-gchar**")
+  (return-type "gchar-const-*-const-*")
 )
 
 (define-method set_authors
@@ -2725,7 +2725,7 @@
 (define-method get_documenters
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_documenters")
-  (return-type "const-gchar**")
+  (return-type "gchar-const-*-const-*")
 )
 
 (define-method set_documenters
@@ -2740,7 +2740,7 @@
 (define-method get_artists
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_artists")
-  (return-type "const-gchar**")
+  (return-type "gchar-const-*-const-*")
 )
 
 (define-method set_artists
diff --git a/gtk/src/gtk_other.defs b/gtk/src/gtk_other.defs
index 69d5b64..d89ab7a 100644
--- a/gtk/src/gtk_other.defs
+++ b/gtk/src/gtk_other.defs
@@ -1,60 +1,3 @@
-
-; GtkCellEditable  (written by hand because we can't instantiate an interface):
-
-(define-signal editing_done
-  (of-object "GtkCellEditable")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal remove_widget
-  (of-object "GtkCellEditable")
-  (return-type "void")
-  (when "last")
-)
-
-; GtkEditable
-(define-signal insert_text
-  (of-object "GtkEditable")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "text")
-    '("gint" "length")
-    '("gint*" "position")
-  )
-)
-
-(define-signal delete_text
-  (of-object "GtkEditable")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "start_pos")
-    '("gint" "end_pos")
-  )
-)
-
-(define-signal changed
-  (of-object "GtkEditable")
-  (return-type "void")
-  (when "last")
-)
-
-;; For some reason h2defs.py doesn't provide this:
-
-(define-function gtk_drag_get_data
-  (c-name "gtk_drag_get_data")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("GdkDragContext*" "context")
-    '("GdkAtom" "target")
-    '("guint32" "time")
-  )
-)
-
-
 ;; GtkSettings properties that are only installed when GtkSettings is used by other objects.
 
 (define-property gtk-toolbar-style
@@ -105,50 +48,3 @@
   (construct-only #f)
 )
 
-
-
-
-
-
-;; From GtkPrintOperationPreview (TODO: vfuncs):
-
-(define-signal ready
-  (of-object "GtkPrintOperationPreview")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkPrintContext*" "p0")
-  )
-)
-
-(define-signal got-page-size
-  (of-object "GtkPrintOperationPreview")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkPrintContext*" "p0")
-    '("GtkPageSetup*" "p1")
-  )
-)
-
-
-
-; h2defs.py does not seem to get these:
-
-(define-method get_authors
-  (of-object "GtkAboutDialog")
-  (c-name "gtk_about_dialog_get_authors")
-  (return-type "gchar-const-*-const-*")
-)
-
-(define-method get_documenters
-  (of-object "GtkAboutDialog")
-  (c-name "gtk_about_dialog_get_documenters")
-  (return-type "gchar-const-*-const-*")
-)
-
-(define-method get_artists
-  (of-object "GtkAboutDialog")
-  (c-name "gtk_about_dialog_get_artists")
-  (return-type "gchar-const-*-const-*")
-)
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 66fc019..db25671 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -6118,6 +6118,30 @@
   (construct-only #f)
 )
 
+;; From GtkCellEditable
+
+(define-signal editing-done
+  (of-object "GtkCellEditable")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal remove-widget
+  (of-object "GtkCellEditable")
+  (return-type "void")
+  (when "last")
+)
+
+(define-property editing-canceled
+  (of-object "GtkCellEditable")
+  (prop-type "GParamBoolean")
+  (docs "Indicates that editing has been canceled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+>>>>>>> f195434... CellEditable: Added editing_canceled property.
 ;; From GtkCellLayout
 
 ;; From GtkCellRenderer
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 892818c..16b546a 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -71,6 +71,7 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_CALENDAR )
             << get_defs( GTK_TYPE_CHECK_BUTTON )
             << get_defs( GTK_TYPE_CHECK_MENU_ITEM )
+            << get_defs( GTK_TYPE_CELL_EDITABLE )
             << get_defs( GTK_TYPE_CELL_LAYOUT )
             << get_defs( GTK_TYPE_CELL_RENDERER )
             << get_defs( GTK_TYPE_CELL_RENDERER_ACCEL )