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

[ion3.git] / mod_query / input.c

diff --git a/mod_query/input.c b/mod_query/input.c
index 7f8ac99faa9f1b3bbab30adc8614c1516dbf6aaa..57a23c53ee26b07db2292bd8dc84bd51b2f135dd 100644 (file)
--- a/mod_query/input.c
+++ b/mod_query/input.c
@@ -161,8 +161,7 @@ void input_deinit(WInput *input)
 EXTL_EXPORT_MEMBER
 void input_cancel(WInput *input)
 {
-    if(region_manager_allows_destroying((WRegion*)input))
-        region_dispose_((WRegion*)input);
+    region_defer_rqdispose((WRegion*)input);
 }
 
 
@@ -187,6 +186,29 @@ static void input_activated(WInput *input)
 /*}}}*/
 
 
+/*{{{{ Misc */
+
+
+void mod_query_get_minimum_extents(GrBrush *brush, bool with_spacing, 
+                                   int *w, int *h)
+{
+    GrBorderWidths bdw;
+    GrFontExtents fnte;
+    int spc;
+    
+    grbrush_get_border_widths(brush, &bdw);
+    grbrush_get_font_extents(brush, &fnte);
+    
+    spc=(with_spacing ? bdw.spacing : 0);
+    
+    *h=(fnte.max_height+bdw.top+bdw.bottom+spc);
+    *w=(bdw.left+bdw.right+spc);
+}
+
+
+/*}}}*/
+
+
 /*{{{ Dynamic function table and class implementation */