Changeset 6675 for trunk/WINDOW/AW_button.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_button.cxx (modified) (17 diffs)

trunk/WINDOW/AW_button.cxx

@@ -15 +15 @@
 #include "aw_size.hxx"
 #include "aw_select.hxx"
-#include "aw_awar.hxx"
+#include "aw_nawar.hxx"
 #include "aw_window_Xm.hxx"
 
@@ -39 +39 @@
 #endif // DEBUG
 
-static void aw_cp_awar_2_widget_cb(AW_root *root, AW_widget_list_for_variable *widgetlist) {
-    if (widgetlist->widget == (int *)root->changer_of_variable) {
+struct AW_widget_refresh_cb {
+    AW_widget_refresh_cb(AW_widget_refresh_cb *previous, AW_awar *vs, AW_CL cd1, Widget w, AW_widget_type type, AW_window *awi);
+    ~AW_widget_refresh_cb();
+
+    AW_CL           cd;
+    AW_awar        *awar;
+    Widget          widget;
+    AW_widget_type  widget_type;
+    AW_window      *aw;
+
+    AW_widget_refresh_cb *next;
+};
+
+static void aw_cp_awar_2_widget_cb(AW_root *root, AW_CL cl_widget_refresh_cb) {
+    AW_widget_refresh_cb *widgetlist = (AW_widget_refresh_cb*)cl_widget_refresh_cb;
+    if (widgetlist->widget == root->changer_of_variable) {
         root->changer_of_variable = 0;
         root->value_changed = false;
@@ -81 +95 @@
 }
 
-
-AW_widget_list_for_variable::AW_widget_list_for_variable(AW_awar *vs, AW_CL cd1, int *widgeti, AW_widget_type type, AW_window *awi) {
+AW_widget_refresh_cb::AW_widget_refresh_cb(AW_widget_refresh_cb *previous, AW_awar *vs, AW_CL cd1, Widget w, AW_widget_type type, AW_window *awi) {
     cd          = cd1;
-    widget      = widgeti;
+    widget      = w;
     widget_type = type;
     awar        = vs;
     aw          = awi;
-    next        = 0;
-    awar->add_callback((AW_RCB1)aw_cp_awar_2_widget_cb, (AW_CL)this);
-}
+    next        = previous;
+
+    awar->add_callback(aw_cp_awar_2_widget_cb, (AW_CL)this);
+}
+
+AW_widget_refresh_cb::~AW_widget_refresh_cb() {
+    if (next) delete next;
+    awar->remove_callback(aw_cp_awar_2_widget_cb, (AW_CL)this);
+}
+
+void AW_awar::tie_widget(AW_CL cd1, Widget widget, AW_widget_type type, AW_window *aww) {
+    refresh_list = new AW_widget_refresh_cb(refresh_list, this, cd1, widget, type, aww);
+}
+void AW_awar::untie_all_widgets() {
+    delete refresh_list; refresh_list = NULL;
+}
+
 
 struct AW_variable_update_struct { // used to refresh single items on change
@@ -139 +166 @@
 
     if (root->value_changed) {
-        root->changer_of_variable = (long)vus->widget;
+        root->changer_of_variable = vus->widget;
     }
 
@@ -847 +874 @@
 }
 
-void AW_window::update_label(int *widget, const char *var_value) {
-    Widget w = (Widget) widget;
-
-    if (get_root()->changer_of_variable != (long)widget) {
-        XtVaSetValues(w, RES_CONVERT(XmNlabelString, var_value), NULL);
+void AW_window::update_label(Widget widget, const char *var_value) {
+    if (get_root()->changer_of_variable != widget) {
+        XtVaSetValues(widget, RES_CONVERT(XmNlabelString, var_value), NULL);
     }
     else {
@@ -867 +892 @@
 };
 
-void AW_window::update_toggle(int *wgt, const char *var, AW_CL cd_toggle_data)
-{
+void AW_window::update_toggle(Widget widget, const char *var, AW_CL cd_toggle_data) {
     aw_toggle_data *tdata = (aw_toggle_data*)cd_toggle_data;
     const char     *text  = tdata->bitmapOrText[(var[0] == '0' || var[0] == 'n') ? 0 : 1];
 
     if (tdata->isTextToggle) {
-        XtVaSetValues((Widget)wgt, RES_CONVERT(XmNlabelString, text), NULL);
+        XtVaSetValues(widget, RES_CONVERT(XmNlabelString, text), NULL);
     }
     else {
         char *path = pixmapPath(text+1);
-        XtVaSetValues((Widget)wgt, RES_CONVERT(XmNlabelPixmap, path), NULL);
+        XtVaSetValues(widget, RES_CONVERT(XmNlabelPixmap, path), NULL);
         free(path);
     }
@@ -913 +937 @@
         char *var_value = vs->read_as_string();
 
-        this->update_toggle((int*)p_w->toggle_field, var_value, (AW_CL)tdata);
+        this->update_toggle(p_w->toggle_field, var_value, (AW_CL)tdata);
         free(var_value);
     }
@@ -924 +948 @@
                   (XtPointer) vus);
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, (AW_CL)tdata, p_w->toggle_field, AW_WIDGET_TOGGLE, this);
+    vs->tie_widget((AW_CL)tdata, p_w->toggle_field, AW_WIDGET_TOGGLE, this);
 }
 
@@ -1060 +1084 @@
                   (XtPointer) root);
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, 0, textField, AW_WIDGET_INPUT_FIELD, this);
+    vs->tie_widget(0, textField, AW_WIDGET_INPUT_FIELD, this);
     root->make_sensitive(textField, _at->widget_mask);
 
@@ -1088 +1112 @@
 }
 
-
-void AW_window::update_input_field(int *widget, const char *var_value) {
-    Widget w = (Widget) widget;
-
-    XtVaSetValues(w, XmNvalue, var_value, NULL);
-}
-
-
-
+void AW_window::update_input_field(Widget widget, const char *var_value) {
+    XtVaSetValues(widget, XmNvalue, var_value, NULL);
+}
 
 void AW_window::create_text_field(const char *var_name, int columns, int rows) {
@@ -1224 +1242 @@
     XtAddCallback(scrolledText, XmNvalueChangedCallback, (XtCallbackProc) AW_value_changed_callback, (XtPointer) root);
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, 0, scrolledText, AW_WIDGET_TEXT_FIELD, this);
+    vs->tie_widget(0, scrolledText, AW_WIDGET_TEXT_FIELD, this);
     root->make_sensitive(scrolledText, _at->widget_mask);
 
@@ -1232 +1250 @@
 
 
-void AW_window::update_text_field(int *widget, const char *var_value) {
-    Widget w = (Widget) widget;
-
-    XtVaSetValues(w, XmNvalue, var_value, NULL);
+void AW_window::update_text_field(Widget widget, const char *var_value) {
+    XtVaSetValues(widget, XmNvalue, var_value, NULL);
 }
 
@@ -1399 +1415 @@
                           (XtPointer) _d_callback);
         }
-        AW_INSERT_BUTTON_IN_AWAR_LIST(vs, (AW_CL)p_global->last_selection_list, scrolledList, AW_WIDGET_SELECTION_LIST, this);
+        vs->tie_widget((AW_CL)p_global->last_selection_list, scrolledList, AW_WIDGET_SELECTION_LIST, this);
         root->make_sensitive(scrolledList, _at->widget_mask);
     }
@@ -2209 +2225 @@
     p_global->current_option_menu = p_global->last_option_menu;
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, (AW_CL)p_global->current_option_menu, optionMenu, AW_WIDGET_CHOICE_MENU, this);
+    vs->tie_widget((AW_CL)p_global->current_option_menu, optionMenu, AW_WIDGET_CHOICE_MENU, this);
     root->make_sensitive(optionMenu1, _at->widget_mask);
 
@@ -2216 +2232 @@
 
 static void remove_option_from_option_menu(AW_root *aw_root, AW_option_struct *os) {
-    AW_remove_button_from_sens_list(aw_root, os->choice_widget);
+    aw_root->remove_button_from_sens_list(os->choice_widget);
     XtDestroyWidget(os->choice_widget);
 }
@@ -2352 +2368 @@
 
 void AW_window::update_option_menu(AW_option_menu_struct *oms) {
-    if (get_root()->changer_of_variable != (long)oms->label_widget) {
+    if (get_root()->changer_of_variable != oms->label_widget) {
         AW_option_struct *active_choice = oms->first_choice;
         {
@@ -2518 +2534 @@
     }
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, get_root()->number_of_toggle_fields, toggle_field, AW_WIDGET_TOGGLE_FIELD, this);
+    vs->tie_widget(get_root()->number_of_toggle_fields, toggle_field, AW_WIDGET_TOGGLE_FIELD, this);
     root->make_sensitive(toggle_field, _at->widget_mask);
 }