Changeset 7479

Timestamp:

27/04/11 15:35:38 (13 months ago)

Author:

westram

Message:

• removed dead code (macro related)

Location:

branches/dev

Files:

• WINDOW/AW_window.cxx (modified) (4 diffs)
• WINDOW/aw_root.hxx (modified) (2 diffs)
• WINDOW/aw_window_Xm.hxx (modified) (1 diff)
• lib/pictures/macro_message.fig (deleted)

branches/dev/WINDOW/AW_window.cxx

@@ -686 +686 @@
 #endif // DEBUG
 }
-
-static void macro_message_cb(AW_window *aw, AW_CL);
 
 bool AW_cb_struct::is_equal(const AW_cb_struct& other) const {
@@ -737 +735 @@
 
         bool isModalCallback = (f == AW_CB(message_cb) ||
-                                f == AW_CB(macro_message_cb) ||
                                 f == AW_CB(input_history_cb) ||
                                 f == AW_CB(input_cb) ||
@@ -3457 +3454 @@
 }
 
-
-#define AW_MESSAGE_AWAR "tmp/message/macro"
-
-static void macro_message_cb(AW_window *aw, AW_CL) {
-    AW_root *root = aw->get_root();
-    aw->hide();
-
-    if (root->prvt->recording_macro_file) {
-        char *s = root->awar(AW_MESSAGE_AWAR)->read_string();
-        fprintf(root->prvt->recording_macro_file, "MESSAGE\t");
-        GBS_fwrite_string(s, root->prvt->recording_macro_file);
-        fprintf(root->prvt->recording_macro_file, "\n");
-        delete s;
-    }
-
-    if (root->prvt->executing_macro_file) {
-        // root->enable_execute_macro(); @@@@
-    }
-
-    return;
-}
-
-static void aw_clear_macro_message_cb(AW_window *aww) {
-    aww->get_root()->awar(AW_MESSAGE_AWAR)->write_string("");
-}
-
-void aw_macro_message(const char *templat, ...)
-// @@@ this function is unused.
-{
-
-    AW_root *root = AW_root::SINGLETON;
-    char buffer[10000];
-    {
-        va_list parg;
-        va_start(parg, templat);
-        vsprintf(buffer, templat, parg);
-    }
-    static AW_window_message *aw_msg = 0;
-
-    root->awar_string(AW_MESSAGE_AWAR)->write_string(buffer);
-
-    if (!aw_msg) {
-        aw_msg = new AW_window_message;
-
-        aw_msg->init(root, "MESSAGE", false);
-        aw_msg->load_xfig("macro_message.fig");
-
-        aw_msg->at("clear");
-        aw_msg->callback(aw_clear_macro_message_cb);
-        aw_msg->create_button("OK", "OK", "O");
-
-        aw_msg->at("Message");
-        aw_msg->create_text_field(AW_MESSAGE_AWAR);
-
-        aw_msg->at("hide");
-        aw_msg->callback(macro_message_cb, 0);
-        aw_msg->create_button("OK", "OK", "O");
-    }
-
-    aw_msg->show();
-    if (root->prvt->executing_macro_file) {
-        root->stop_execute_macro();
-    }
-}
-
 GB_ERROR AW_root::start_macro_recording(const char *file,
         const char *application_id, const char *stop_action_name) {
@@ -3589 +3521 @@
     free(path);
     return 0;
-}
-
-void AW_root::stop_execute_macro() {
-
 }
 

branches/dev/WINDOW/aw_root.hxx

@@ -40 +40 @@
 
 void aw_set_local_message(); // no message window, AWAR_ERROR_MESSAGES instead (used by EDIT4)
-
-void aw_macro_message(const char *temp, ...) __ATTR__FORMAT(1); // gives control to the user
 
 // Read a string from the user :
@@ -162 +160 @@
     GB_ERROR stop_macro_recording();
     GB_ERROR execute_macro(const char *file);
-    void     stop_execute_macro(); // Starts macro window main loop, delayed return
-    GB_ERROR enable_execute_macro(FILE *mfile, const char *mname); // leave macro window main loop, returns stop_execute_macro
 
     void define_remote_command(struct AW_cb_struct *cbs);

branches/dev/WINDOW/aw_window_Xm.hxx

@@ -262 +262 @@
     char    *application_name_for_macros;
     char    *stop_action_name;
-    FILE    *executing_macro_file;
     GB_HASH *action_hash;