[sawfish] merged widget-dialog.jl into simple-dialog.jl

[Christopher Bratusek <chrisb src gnome org>]

commit 36a094864a21219c6fb391affbbaee5f7e51e3bd
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sat Sep 18 22:59:48 2010 +0200

    merged widget-dialog.jl into simple-dialog.jl

 ChangeLog                                 |    4 ++
 lisp/sawfish/gtk/Makefile.in              |    3 +-
 lisp/sawfish/gtk/widget-dialog.jl         |   46 -----------------------------
 lisp/sawfish/gtk/widgets/alist.jl         |    2 +-
 lisp/sawfish/gtk/widgets/list.jl          |    2 +-
 lisp/sawfish/gtk/widgets/simple-dialog.jl |   23 +++++++++++++-
 man/news.texi                             |    4 ++-
 7 files changed, 31 insertions(+), 53 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 789a052..e328ce0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
 	* lisp/sawfish/cfg/widgets/match-window.jl
 	* lisp/sawfish/gtk/widget-dialog.jl: updated for above change
 
+	* lisp/sawfish/gtk/widget-dialog.jl
+	* lisp/sawfish/gtk/widgets/simple-dialog.jl: merged widget-dialog.jl
+	into simple-dialog.jl
+
 2010-09-17  Christopher Brautsek <zanghar freenet de>
 	* lisp/sawfish/wm/ext/match-window.jl
 	* lisp/sawfish/wm/windows.jl: added `never-delete' window-matcher.
diff --git a/lisp/sawfish/gtk/Makefile.in b/lisp/sawfish/gtk/Makefile.in
index c62f6ef..71ad348 100644
--- a/lisp/sawfish/gtk/Makefile.in
+++ b/lisp/sawfish/gtk/Makefile.in
@@ -30,7 +30,6 @@ VPATH= srcdir@:@top_srcdir@
 REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
 
 SRCS :=	widget.jl		\
-	widget-dialog.jl	\
 	widget-test.jl
 
 W_SRCS := widgets/alist.jl	\
@@ -74,7 +73,7 @@ installdirs : $(top_srcdir)/mkinstalldirs
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)/sawfish/gtk \
 	  $(DESTDIR)$(lispdir)/sawfish/gtk/widgets
 
-clean : 
+clean :
 	rm -f *.jlc *~ core
 	rm -f widgets/*~ widgets/*.jlc
 
diff --git a/lisp/sawfish/gtk/widgets/alist.jl b/lisp/sawfish/gtk/widgets/alist.jl
index a67ad3e..48bc926 100644
--- a/lisp/sawfish/gtk/widgets/alist.jl
+++ b/lisp/sawfish/gtk/widgets/alist.jl
@@ -25,7 +25,7 @@
     (open rep
           gui.gtk-2.gtk
           sawfish.gtk.widget
-          sawfish.gtk.widget-dialog)
+          sawfish.gtk.widgets.simple-dialog)
 
   ;; (alist (KEY-SPEC "KEY-TITLE") (VALUE-SPEC "VALUE-TITLE"))
 
diff --git a/lisp/sawfish/gtk/widgets/list.jl b/lisp/sawfish/gtk/widgets/list.jl
index 26df35d..aec007e 100644
--- a/lisp/sawfish/gtk/widgets/list.jl
+++ b/lisp/sawfish/gtk/widgets/list.jl
@@ -25,7 +25,7 @@
     (open rep
           gui.gtk-2.gtk
           sawfish.gtk.widget
-          sawfish.gtk.widget-dialog)
+          sawfish.gtk.widgets.simple-dialog)
 
   ;; (list SPEC-OR-FUNCTION [TITLE])
 
diff --git a/lisp/sawfish/gtk/widgets/simple-dialog.jl b/lisp/sawfish/gtk/widgets/simple-dialog.jl
index ff8fc9f..5d62697 100644
--- a/lisp/sawfish/gtk/widgets/simple-dialog.jl
+++ b/lisp/sawfish/gtk/widgets/simple-dialog.jl
@@ -24,7 +24,8 @@
 
 (define-structure sawfish.gtk.simple-dialog
 
-    (export simple-dialog)
+    (export simple-dialog
+            widget-dialog)
 
     (open rep
           gui.gtk-2.gtk
@@ -71,4 +72,22 @@
       (gtk-window-set-modal window t)
       (gtk-widget-grab-focus widget)
 
-      window)))
+      window))
+
+  (define (widget-dialog title spec callback
+			 #!optional initial-value main-window)
+
+    (let* ((widget (make-widget spec))
+	   (vbox (gtk-vbox-new nil box-spacing))
+	   (hbox (gtk-hbox-new nil 0)))
+
+      (when initial-value
+	(widget-set widget initial-value))
+
+      (gtk-box-pack-start hbox (gtk-label-new title))
+      (gtk-container-add vbox hbox)
+      (gtk-container-add vbox (widget-gtk-widget widget))
+      (gtk-widget-show-all vbox)
+      (simple-dialog title vbox
+		     (lambda () (callback (widget-ref widget)))
+		     main-window))))
diff --git a/man/news.texi b/man/news.texi
index 381d2ba..ba132f2 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -288,7 +288,9 @@ menu-entries have been improved.
 If you run the configurator but the Sawfish window manager is absent,
 then an alert window is displayed before abortion.
 
- item Module @code{3d-hack} is not autoloaded anymore.
+ item Module @code{3d-hack} is not autoloaded anymore. [Teika Kazura]
+
+ item widget-dialog.jl was merged into simple-dialog.jl [Christopher Bratusek]
 
 @item @code{sawfish-config} is now minimal, moving most of the contents to @code{sawfish.cfg.shell} [Teika Kazura]