mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed segfault in log action dialogs - the new log type "pass" was missing

Browse Source
This commit is contained in:
Volker Ruppert 2003-01-04 11:47:00 +00:00
parent 90a0749716
commit 9b57ad6ca8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/gui/wxdialog.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxdialog.cc,v 1.53 2002-12-12 18:31:20 bdenney Exp $
// $Id: wxdialog.cc,v 1.54 2003-01-04 11:46:59 vruppert Exp $
/////////////////////////////////////////////////////////////////
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
@ -1218,7 +1218,7 @@ AdvancedLogOptionsDialog::AdvancedLogOptionsDialog(
// to get the scrollWin geometry right, first build everything on a wxPanel,
// with gridSizer as the main sizer.
scrollPanel = new wxPanel (scrollWin, -1);
gridSizer = new wxGridSizer (5);
gridSizer = new wxGridSizer (ADVLOG_OPTS_N_TYPES + 1);
// add title row
int typemax = ADVLOG_OPTS_N_TYPES;
text = new wxStaticText (scrollPanel, -1, "Device");

10
bochs/gui/wxdialog.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////
// $Id: wxdialog.h,v 1.46 2002-12-08 09:16:18 bdenney Exp $
// $Id: wxdialog.h,v 1.47 2003-01-04 11:47:00 vruppert Exp $
////////////////////////////////////////////////////////////////////
//
// wxWindows dialogs for Bochs
@ -543,8 +543,8 @@ private:
#define LOG_OPTS_LOGFILE "Log file is "
#define LOG_OPTS_DEBUGGER_LOGFILE "Debugger log file is "
#define LOG_OPTS_PROMPT "How should Bochs respond to each type of event?"
#define LOG_OPTS_TYPE_NAMES { "Debug events: ", "Info events: ", "Error events: ", "Panic events: " }
#define LOG_OPTS_N_TYPES 4
#define LOG_OPTS_TYPE_NAMES { "Debug events: ", "Info events: ", "Error events: ", "Panic events: ", "Pass events: " }
#define LOG_OPTS_N_TYPES 5
#define LOG_OPTS_CHOICES { "ignore", "log", "ask user", "end simulation", "no change" }
#define LOG_OPTS_N_CHOICES_NORMAL 4
#define LOG_OPTS_N_CHOICES 5 // number of choices, including "no change"
@ -617,8 +617,8 @@ private:
"from a particular source. For example if you are having problems with\n" \
"the keyboard, you could ask for debug and info events from the keyboard\n" \
"to be reported."
#define ADVLOG_OPTS_TYPE_NAMES { "Debug", "Info", "Error", "Panic" }
#define ADVLOG_OPTS_N_TYPES 4
#define ADVLOG_OPTS_TYPE_NAMES { "Debug", "Info", "Error", "Panic", "Pass" }
#define ADVLOG_OPTS_N_TYPES 5
#define ADVLOG_DEFAULTS "Use defaults for all devices"
void Init (); // called automatically by ShowModal()
void ShowHelp ();