[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / mod_query / fwarn.c

diff --git a/mod_query/fwarn.c b/mod_query/fwarn.c
index 7280f85c8cddd2fa383e916aaf5bec5c389f5147..32eb49769b6c04ff3d70a01c8108623a5eed294b 100644 (file)
--- a/mod_query/fwarn.c
+++ b/mod_query/fwarn.c
@@ -1,12 +1,9 @@
 /*
  * ion/mod_query/query.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 
@@ -14,16 +11,17 @@
 #include <ioncore/global.h>
 #include <ioncore/focus.h>
 #include <ioncore/frame.h>
+#include <ioncore/stacking.h>
 #include <libtu/objp.h>
 #include "wmessage.h"
 #include "fwarn.h"
 
 
-/*EXTL_DOC
+/*(internal) EXTL_DOC
  * Display an error message box in the multiplexer \var{mplex}.
  */
 EXTL_EXPORT
-WMessage *mod_query_warn(WMPlex *mplex, const char *p)
+WMessage *mod_query_do_warn(WMPlex *mplex, const char *p)
 {
     char *p2;
     WMessage *wmsg;
@@ -36,18 +34,19 @@ WMessage *mod_query_warn(WMPlex *mplex, const char *p)
     if(p2==NULL)
         return NULL;
     
-    wmsg=mod_query_message(mplex, p2);
+    wmsg=mod_query_do_message(mplex, p2);
     
     free(p2);
     
     return wmsg;
 }
 
-/*EXTL_DOC
+
+/*(internal) EXTL_DOC
  * Display a message in the \var{mplex}.
  */
 EXTL_EXPORT
-WMessage *mod_query_message(WMPlex *mplex, const char *p)
+WMessage *mod_query_do_message(WMPlex *mplex, const char *p)
 {
     WMPlexAttachParams par;
 
@@ -55,10 +54,11 @@ WMessage *mod_query_message(WMPlex *mplex, const char *p)
         return NULL;
     
     par.flags=(MPLEX_ATTACH_SWITCHTO|
-               MPLEX_ATTACH_MODAL|
+               MPLEX_ATTACH_LEVEL|
                MPLEX_ATTACH_UNNUMBERED|
                MPLEX_ATTACH_SIZEPOLICY);
     par.szplcy=SIZEPOLICY_FULL_BOUNDS;
+    par.level=STACKING_LEVEL_MODAL1+1;
 
     return (WMessage*)mplex_do_attach_new(mplex, &par,
                                           (WRegionCreateFn*)create_wmsg,