- moved log action definitions to siminterface.h

- wxdialog: use symbols and allow log action ACT_IGNORE for LOGLEV_ERROR
- wxdialog: removed obsolete pass event
- TODO: fix win32dialog stuff in a similar way

bochs/bochs.h

@@ -250,12 +250,6 @@ typedef class BOCHSAPI logfunctions
 {
   char *name;
   char *prefix;
-// values of onoff: 0=ignore, 1=report, 2=ask, 3=fatal
-#define ACT_IGNORE 0
-#define ACT_REPORT 1
-#define ACT_ASK    2
-#define ACT_FATAL  3
-#define N_ACT      4
   int onoff[N_LOGLEV];
   class iofunctions *logio;
   // default log actions for all devices, declared and initialized

bochs/gui/siminterface.h

@@ -164,6 +164,15 @@ typedef enum {
   N_LOGLEV
 } bx_log_levels;
 
+// Log action defines
+typedef enum {
+  ACT_IGNORE = 0,
+  ACT_REPORT,
+  ACT_ASK,
+  ACT_FATAL,
+  N_ACT
+} bx_log_actions;
+
 // boot devices (using the same values as the rombios)
 enum {
   BX_BOOT_NONE,

bochs/gui/wxdialog.h

@@ -370,8 +370,8 @@ class LogOptionsDialog : public ParamDialog
 private:
 #define LOG_OPTS_TITLE wxT("Configure Log Events")
 #define LOG_OPTS_PROMPT wxT("How should Bochs respond to each type of event?")
-#define LOG_OPTS_TYPE_NAMES { wxT("Debug events: "), wxT("Info events: "), wxT("Error events: "), wxT("Panic events: "), wxT("Pass events: ") }
-#define LOG_OPTS_N_TYPES 5
+#define LOG_OPTS_TYPE_NAMES { wxT("Debug events: "), wxT("Info events: "), wxT("Error events: "), wxT("Panic events: ") }
+#define LOG_OPTS_N_TYPES 4
 #define LOG_OPTS_CHOICES { wxT("ignore"), wxT("log"), wxT("ask user"), wxT("end simulation"), wxT("no change") }
 #define LOG_OPTS_N_CHOICES_NORMAL 4
 #define LOG_OPTS_N_CHOICES 5   // number of choices, including "no change"
@@ -381,9 +381,9 @@ private:
 // sense.  For example, it would be stupid to ignore a panic.
 #define LOG_OPTS_EXCLUDE(type,choice)  ( \
    /* can't die or ask, on debug or info events */   \
-   (type <= 1 && (choice==2 || choice==3)) \
+   (type <= LOGLEV_INFO && (choice == ACT_ASK || choice == ACT_FATAL)) \
    /* can't ignore panics or errors */ \
-   || (type >= 2 && choice==0) \
+   || (type == LOGLEV_PANIC && choice == ACT_IGNORE) \
    )
 #define LOG_OPTS_ADV wxT("For additional control over how each device responds to events, use the menu option \"Log ... By Device\".")
   wxFlexGridSizer *gridSizer;