Change guard constants.

[mgLib] / msg.c

diff --git a/msg.c b/msg.c
index ff317e952f8ec1e4fcf3e83104c9f7d331cfd1bf..7ec62a10494fd2f9ce9d757af498c7de614af17a 100644 (file)
--- a/msg.c
+++ b/msg.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: msg.c,v 1.3 1999/03/25 23:36:10 mdw Exp $
+ * $Id: msg.c,v 1.8 1999/11/11 19:54:37 mdw Exp $
  *
  * Display a message and get an answer
  *
@@ -12,23 +12,39 @@
  * This file is part of the mgLib GTK utilities library.
  *
  * mgLib is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  * 
  * mgLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Library General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with mgLib; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General Public
+ * License along with mgLib; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
  */
 
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: msg.c,v $
+ * Revision 1.8  1999/11/11 19:54:37  mdw
+ * Prep for standalone release.
+ *
+ * Revision 1.7  1999/05/21 22:08:20  mdw
+ * Take advantage of new dynamic string macros.
+ *
+ * Revision 1.6  1999/05/06 19:51:48  mdw
+ * Reformatted the LGPL notice a little bit.
+ *
+ * Revision 1.5  1999/05/05 18:52:45  mdw
+ * Change licensing conditions to LGPL.
+ *
+ * Revision 1.4  1999/04/29 20:48:13  mdw
+ * Add documentation for `msg'.
+ *
  * Revision 1.3  1999/03/25 23:36:10  mdw
  * Compile to nothing in absence of GTK, for the benefit of parent packages
  * which contain non-GTK-dependent parts.
@@ -41,8 +57,6 @@
  *
  */
 
-#ifdef HAVE_GTK
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdarg.h>
@@ -75,6 +89,14 @@ static int creply;
  *
  * Use:                Displays a message to the user in a nice dialogue box and
  *             returns the index of the button selected.
+ *
+ *             The @msg@ argument is a @printf@-style format string, which
+ *             contains the message to actually be shown.  The @buttons@
+ *             argument is a comma-separated list of buttons to be drawn,
+ *             from right to left.  A button name can be preceded with `:'
+ *             to indicate that it's the default, or `~' if it's the
+ *             `cancel' button.  The return value is the zero-based index
+ *             of the button selected.
  */
 
 static int close(GtkWidget *w, gpointer p)
@@ -104,11 +126,10 @@ int msg(const char *buttons, const char *msg, ...)
   /* --- Set up the message string --- */
 
   {
-    dstr d;
+    dstr d = DSTR_INIT;
     va_list ap;
 
     va_start(ap, msg);
-    dstr_create(&d);
     dstr_vputf(&d, msg, ap);
     va_end(ap);
     w = gtk_label_new(d.buf);
@@ -182,7 +203,3 @@ int msg(const char *buttons, const char *msg, ...)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
-
-#else
-  int mgLib_msg = 0;
-#endif