Changeset 6675 for trunk/WINDOW/aw_root.hxx

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_root.hxx (modified) (8 diffs)

trunk/WINDOW/aw_root.hxx

@@ -75 +75 @@
 } AW_VARIABLE_TYPE;
 
+
+typedef enum {
+    AW_WIDGET_INPUT_FIELD,
+    AW_WIDGET_TEXT_FIELD,
+    AW_WIDGET_LABEL_FIELD,
+    AW_WIDGET_CHOICE_MENU,
+    AW_WIDGET_TOGGLE_FIELD,
+    AW_WIDGET_SELECTION_LIST,
+    AW_WIDGET_TOGGLE
+} AW_widget_type;
+
+
 typedef struct {
     int t, b, l, r;
@@ -168 +180 @@
 class  AW_root_Motif;
 class  AW_awar;
+struct AW_buttons_struct;
 struct AW_var_callback;
 
@@ -177 +190 @@
 
 class AW_root {
-    AW_default application_database;
-    
+    AW_default         application_database;
+    AW_buttons_struct *button_sens_list;
+
     void init_variables(AW_default database);
     void exit_variables();
@@ -191 +205 @@
     AW_root_Motif *prvt;                            // Do not use !!!
     bool           value_changed;
-    long           changer_of_variable;
+    Widget         changer_of_variable;
     int            y_correction_for_input_labels;
     AW_active      global_mask;
@@ -266 +280 @@
     void apply_sensitivity(AW_active mask);
     void make_sensitive(Widget w, AW_active mask);
+    bool remove_button_from_sens_list(Widget button);
 
     GB_ERROR start_macro_recording(const char *file, const char *application_id, const char *stop_action_name);
@@ -293 +308 @@
 struct AW_var_callback;
 struct AW_var_target;
+struct AW_widget_refresh_cb;
 
 typedef void (*Awar_CB)(AW_root *, AW_CL, AW_CL);
@@ -308 +324 @@
     } pp;
 
-    struct AW_var_callback *callback_list;
-    struct AW_var_target   *target_list;
+    struct AW_var_callback      *callback_list;
+    struct AW_var_target        *target_list;
+    struct AW_widget_refresh_cb *refresh_list;
 
 #if defined(DEBUG)
@@ -342 +359 @@
     AW_awar(AW_VARIABLE_TYPE var_type, const char *var_name, const char *var_value, double var_double_value, AW_default default_file, AW_root *root);
     ~AW_awar();
+
+    void tie_widget(AW_CL cd1, Widget widget, AW_widget_type type, AW_window *aww);
+    void untie_all_widgets();
 
     AW_awar *add_callback(Awar_CB2 f, AW_CL cd1, AW_CL cd2);