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

Execute this code only if the wx gui is selected.

Browse Source
This commit is contained in:
Volker Ruppert 2014-05-01 08:42:04 +00:00
parent 3d1d2f5acc
commit c7a72484c8
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bochs/iodev/usb/usb_hub.cc
View File

@ -205,10 +205,10 @@ usb_hub_device_c::usb_hub_device_c(Bit8u ports)
device->set_handler(hub_param_handler);
new bx_param_string_c(port, "options", "Options", "", "", BX_PATHNAME_LEN);
}
#if BX_WITH_WX
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->add(hub.config);
#endif
if (SIM->is_wx_selected()) {
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->add(hub.config);
}
put("usb_hub", "USBHUB");
}
@ -218,10 +218,10 @@ usb_hub_device_c::~usb_hub_device_c(void)
for (int i=0; i<hub.n_ports; i++) {
remove_device(i);
}
#if BX_WITH_WX
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->remove(hub.config->get_name());
#endif
if (SIM->is_wx_selected()) {
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->remove(hub.config->get_name());
}
bx_list_c *usb_rt = (bx_list_c*)SIM->get_param(BXPN_MENU_RUNTIME_USB);
usb_rt->remove(hub.config->get_name());
}

16
bochs/iodev/usb/usb_msd.cc
View File

@ -184,10 +184,10 @@ usb_msd_device_c::usb_msd_device_c(usbdev_type type, const char *filename)
BX_EJECTED);
status->set_handler(cd_param_handler);
status->set_ask_format("Is the device inserted or ejected? [%s] ");
#if BX_WITH_WX
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->add(s.config);
#endif
if (SIM->is_wx_selected()) {
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->add(s.config);
}
}
put("usb_msd", "USBMSD");
@ -201,10 +201,10 @@ usb_msd_device_c::~usb_msd_device_c(void)
delete s.hdimage;
} else if (s.cdrom != NULL) {
delete s.cdrom;
#if BX_WITH_WX
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->remove(s.config->get_name());
#endif
if (SIM->is_wx_selected()) {
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->remove(s.config->get_name());
}
bx_list_c *usb_rt = (bx_list_c*)SIM->get_param(BXPN_MENU_RUNTIME_USB);
usb_rt->remove(s.config->get_name());
}

24
bochs/logio.cc
View File

@ -561,14 +561,14 @@ static void carbonFatalDialog(const char *error, const char *exposition)
void logfunctions::fatal(const char *prefix, const char *fmt, va_list ap, int exit_status)
{
#if !BX_WITH_WX
// store prefix and message in 'exit_msg' before unloading device plugins
char tmpbuf[1024];
char exit_msg[1024];
vsprintf(tmpbuf, fmt, ap);
sprintf(exit_msg, "%s %s", prefix, tmpbuf);
#endif
if (!SIM->is_wx_selected()) {
// store prefix and message in 'exit_msg' before unloading device plugins
vsnprintf(tmpbuf, sizeof(tmpbuf), fmt, ap);
sprintf(exit_msg, "%s %s", prefix, tmpbuf);
}
#if !BX_DEBUGGER
bx_atexit();
#endif
@ -583,13 +583,13 @@ void logfunctions::fatal(const char *prefix, const char *fmt, va_list ap, int ex
"For more information, try running Bochs within Terminal by clicking on \"bochs.scpt\".");
}
#endif
#if !BX_WITH_WX
static const char *divider = "========================================================================";
fprintf(stderr, "%s\n", divider);
fprintf(stderr, "Bochs is exiting with the following message:\n");
fprintf(stderr, "%s", exit_msg);
fprintf(stderr, "\n%s\n", divider);
#endif
if (!SIM->is_wx_selected()) {
static const char *divider = "========================================================================";
fprintf(stderr, "%s\n", divider);
fprintf(stderr, "Bochs is exiting with the following message:\n");
fprintf(stderr, "%s", exit_msg);
fprintf(stderr, "\n%s\n", divider);
}
#if !BX_DEBUGGER
BX_EXIT(exit_status);
#else