spinbutton: don't override initial text in non-numeric-only spin buttons

[~andy/gtk] / gtk / gtkmarshalers.list

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 77873cb022047cf29777dc6e56b23ab46ae8005f..14d05190235d8c5447b6cc5449c05a4ef88f431d 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -50,6 +50,7 @@ ENUM:VOID
 INT:POINTER
 OBJECT:VOID
 STRING:DOUBLE
+STRING:STRING
 VOID:DOUBLE
 VOID:BOOLEAN
 VOID:BOOLEAN,BOOLEAN,BOOLEAN
@@ -68,7 +69,10 @@ VOID:ENUM,FLOAT
 VOID:ENUM,FLOAT,BOOLEAN
 VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
+VOID:ENUM,INT,INT
 VOID:ENUM,BOXED
+VOID:ENUM,STRING
+VOID:FLAGS
 VOID:INT
 VOID:INT,BOOLEAN
 VOID:INT,INT
@@ -78,17 +82,21 @@ VOID:OBJECT
 VOID:OBJECT,BOOLEAN
 VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,BOXED,UINT,UINT
+VOID:OBJECT,BOXED,BOOLEAN,BOOLEAN
 VOID:OBJECT,INT
 VOID:OBJECT,INT,OBJECT
 VOID:OBJECT,INT,INT
 VOID:OBJECT,INT,INT,BOXED,UINT,UINT
 VOID:OBJECT,OBJECT
+VOID:OBJECT,POINTER
 VOID:OBJECT,STRING
 VOID:OBJECT,STRING,STRING
 VOID:OBJECT,UINT
 VOID:OBJECT,UINT,FLAGS
 VOID:OBJECT,STRING
+VOID:OBJECT,OBJECT,STRING
 VOID:OBJECT,OBJECT,OBJECT
+VOID:OBJECT,OBJECT,BOXED,STRING
 VOID:POINTER
 VOID:POINTER,INT
 VOID:POINTER,BOOLEAN