summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am2
-rw-r--r--gtk/gtk.defs2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b2de054..cd31e4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-05-04 James Henstridge <james@daa.com.au>
+ * Makefile.am (EXTRA_DIST): add extra files to dist (from bug
+ #79872).
+
+ * gtk/gtk.defs (set_from_pixmap): allow NULL pointer passed for
+ mask.
+
* gtk/gtk.override (pygtk_tree_foreach_marshal): pass model, path
and iter to the callback.
(_wrap_gtk_tree_model_foreach): implement.
diff --git a/Makefile.am b/Makefile.am
index d3b25469..6ad5f6b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,6 +80,8 @@ EXTRA_DIST += \
examples/pygtk-demo/demos/__init__.py \
examples/pygtk-demo/demos/appwindow.py \
examples/pygtk-demo/demos/buttonbox.py \
+ examples/pygtk-demo/demos/colorsel.py \
+ examples/pygtk-demo/demos/draw.py \
examples/pygtk-demo/demos/dndpixmap.py \
examples/pygtk-demo/demos/dnd.py \
examples/pygtk-demo/demos/itemfactory.py \
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 15d673c3..be2ca24c 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -5169,7 +5169,7 @@
(return-type "none")
(parameters
'("GdkPixmap*" "pixmap")
- '("GdkBitmap*" "mask")
+ '("GdkBitmap*" "mask" (null-ok))
)
)