summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@daa.com.au>2002-07-10 13:53:10 +0000
committerJames Henstridge <jamesh@src.gnome.org>2002-07-10 13:53:10 +0000
commitc1f0a29520ff2cdbb07fec196df0100020e42760 (patch)
tree9c340d0efd7ddd00b09cbe7e2dcd28000652367a
parentb14626a44149a914bbd5a55b820877ff15617c30 (diff)
downloadpygtk-c1f0a29520ff2cdbb07fec196df0100020e42760.tar.gz
add arg type. This one also from Thomas Leonard.
2002-07-10 James Henstridge <james@daa.com.au> * codegen/argtypes.py (GdkNativeWindow): add arg type. This one also from Thomas Leonard. * gtk/gtk.defs (set_tip): allow tip_private to be NULL, and allow it to be omitted. Fix suggested by Thomas Leonard <tal00r@ecs.soton.ac.uk>
-rw-r--r--ChangeLog7
-rw-r--r--codegen/argtypes.py2
-rw-r--r--gtk/gtk.defs2
-rw-r--r--gtk/gtkmodule.c4
4 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d41ad082..0fed34f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2002-07-10 James Henstridge <james@daa.com.au>
+ * codegen/argtypes.py (GdkNativeWindow): add arg type. This one
+ also from Thomas Leonard.
+
+ * gtk/gtk.defs (set_tip): allow tip_private to be NULL, and allow
+ it to be omitted. Fix suggested by Thomas Leonard
+ <tal00r@ecs.soton.ac.uk>
+
* gtk/gtkmodule.c (init_gtk): make sure LC_NUMERIC is set to C
after gtk_init_check().
diff --git a/codegen/argtypes.py b/codegen/argtypes.py
index deae2445..92fa3434 100644
--- a/codegen/argtypes.py
+++ b/codegen/argtypes.py
@@ -777,6 +777,8 @@ matcher.register('GdkRectangle*', GdkRectanglePtrArg())
matcher.register('GtkAllocation*', GdkRectanglePtrArg())
matcher.register('GdkRectangle', GdkRectangleArg())
+matcher.register('GdkNativeWindow', ULongArg())
+
matcher.register_object('GObject', None, 'G_TYPE_OBJECT')
del arg
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index e5d06bcd..2859b570 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -13408,7 +13408,7 @@
(parameters
'("GtkWidget*" "widget")
'("const-gchar*" "tip_text")
- '("const-gchar*" "tip_private")
+ '("const-gchar*" "tip_private" (null-ok) (default "NULL"))
)
)
diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
index 246f87ae..62e054e0 100644
--- a/gtk/gtkmodule.c
+++ b/gtk/gtkmodule.c
@@ -61,9 +61,13 @@ init_gtk(void)
g_free(argv);
}
PyErr_SetString(PyExc_RuntimeError, "could not open display");
+ /* set the LC_NUMERIC locale back to "C", as Python requires
+ * that it be set that way. */
setlocale(LC_NUMERIC, "C");
return;
}
+ /* set the LC_NUMERIC locale back to "C", as Python requires that
+ * it be set that way. */
setlocale(LC_NUMERIC, "C");
if (argv != NULL) {
PySys_SetArgv(argc, argv);