Changeset 6675 for trunk/WINDOW/AW_window.cxx

Timestamp:

02/06/10 09:01:31 (2 years ago)

Author:

westram

Message:

• AW_awar / widget interaction
  • replaced AW_INSERT_BUTTON_IN_AWAR_LIST by AW_awar/tie_widget
  • link AW_widget_refresh_cb in AW_awar (leak)
  • use Widget type instead of void*
  • untie_all_widgets() in dtor
• removed deprecated header aw_awar.hxx
• AW_root
  • delete focus_callback_list (leak)
  • method remove_button_from_sens_list replaces AW_remove_button_from_sens_list
  • moved member 'button_list' from AW_root_Motif, renamed it into 'button_sens_list' and destroy it in dtor
  • use Widget type instead of void*

Files:

• trunk/WINDOW/AW_window.cxx (modified) (9 diffs)

trunk/WINDOW/AW_window.cxx

@@ -11 +11 @@
 #include "aw_commn.hxx"
 #include "aw_at.hxx"
-#include "aw_awar.hxx"
+#include "aw_nawar.hxx"
 #include "aw_xfig.hxx"
 #include "aw_Xm.hxx"
@@ -84 +84 @@
 
     if (mask != AWM_ALL) { // no need to make widget sensitive, if its shown unconditionally
-        prvt->button_list = new AW_buttons_struct(mask, w, prvt->button_list);
+        button_sens_list = new AW_buttons_struct(mask, w, button_sens_list);
         if (!(mask & global_mask)) XtSetSensitive(w, False); // disable widget if mask doesn't match
     }
@@ -99 +99 @@
 
 AW_buttons_struct::~AW_buttons_struct() {
-    aw_assert(next == 0); // has to be removed from global list before calling dtor
-}
-
-bool AW_remove_button_from_sens_list(AW_root *root, Widget w) {
+    delete next;
+}
+
+bool AW_root::remove_button_from_sens_list(Widget button) {
     bool removed = false;
-    if (p_global->button_list) {
+    if (button_sens_list) {
         AW_buttons_struct *prev = 0;
-        AW_buttons_struct *bl   = p_global->button_list;
+        AW_buttons_struct *bl   = button_sens_list;
 
         while (bl) {
-            if (bl->button == w) break; // found wanted widget
+            if (bl->button == button) break; // found wanted widget
             prev = bl;
             bl = bl->next;
@@ -116 +116 @@
         if (bl) {
             // remove from list
-            if (prev) prev->next       = bl->next;
-            else p_global->button_list = bl->next;
+            if (prev) prev->next  = bl->next;
+            else button_sens_list = bl->next;
 
             bl->next = 0;
@@ -129 +129 @@
 
 AW_option_struct::AW_option_struct(const char *variable_valuei,
-        Widget choice_widgeti) :
+                                   Widget choice_widgeti) :
     variable_value(strdup(variable_valuei)), choice_widget(choice_widgeti),
             next(0) {
@@ -273 +273 @@
 
 AW_root::~AW_root() {
+    delete focus_callback_list; focus_callback_list = NULL;
+    delete button_sens_list;    button_sens_list    = NULL;
+
     exit_root();
     exit_variables();
     aw_assert(this == AW_root::SINGLETON);
 
-    
     delete prvt;
 
@@ -1464 +1466 @@
     p_r->fontlist = XmFontListCreate(fontstruct, XmSTRING_DEFAULT_CHARSET);
 
-    p_r->button_list = 0;
+    button_sens_list = 0;
 
     p_r->last_option_menu = p_r->current_option_menu = p_r->option_menu_list = NULL;
@@ -1773 +1775 @@
         char *var_value = is_awar->read_as_string();
         if (var_value) {
-            aww->update_label((int*)widget, var_value);
+            aww->update_label(widget, var_value);
         }
         else {
             AW_ERROR("AW_label_in_awar_list:: AWAR %s not found\n", str);
-            aww->update_label((int*)widget, str);
+            aww->update_label(widget, str);
         }
         free(var_value);
-        AW_INSERT_BUTTON_IN_AWAR_LIST(is_awar, 0, widget, AW_WIDGET_LABEL_FIELD, aww);
+        is_awar->tie_widget(0, widget, AW_WIDGET_LABEL_FIELD, aww);
     }
 }
@@ -2654 +2656 @@
 
     global_mask = mask;
-    for (list = p_r->button_list; list; list = list->next) {
+    for (list = button_sens_list; list; list = list->next) {
         XtSetSensitive(list->button, (list->mask & mask) ? True : False);
     }