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

[ion3.git] / ioncore / frame.h

diff --git a/ioncore/frame.h b/ioncore/frame.h
index 7aa50140702ca2cff9f617666f2c42f1d29b4e36..c8827a53791dcdc90679e91928156d77488af634 100644 (file)
--- a/ioncore/frame.h
+++ b/ioncore/frame.h
@@ -3,10 +3,7 @@
  *
  * 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.
  */
 
 #ifndef ION_IONCORE_FRAME_H
@@ -36,7 +33,6 @@
 /*#define FRAME_SZH_USEMINMAX 0x1000 */
 /*#define FRAME_FWD_CWIN_RQGEOM 0x2000 */
 
-#define FRAME_SHOW_NUMBERS 0x4000
 
 typedef enum{
     FRAME_MODE_UNKNOWN,
@@ -64,10 +60,11 @@ DECLCLASS(WFrame){
     int saved_x, saved_y;
     
     int tab_dragged_idx;
-    uint quasiactive_count;
+    void *quasiact_source;
     
     GrBrush *brush;
     GrBrush *bar_brush;
+    GrStyleSpec baseattr;
     GrTransparency tr_mode;
     GrTextElem *titles;
     int titles_n;
@@ -121,6 +118,13 @@ extern bool frame_managed_rqdispose(WFrame *frame, WRegion *reg);
 
 extern void ioncore_frame_quasiactivation_notify(WRegion *reg, WRegionNotify how);
 
+extern WPHolder *frame_prepare_manage_transient(WFrame *frame,
+                                                const WClientWin *transient,
+                                                const WManageParams *param,
+                                                int unused);
+
+extern bool frame_rescue_clientwins(WFrame *frame, WRescueInfo *info);
+
 /* Save/load */
 extern ExtlTab frame_get_configuration(WFrame *frame);
 extern WRegion *frame_load(WWindow *par, const WFitParams *fp, ExtlTab tab);