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

- changed wxWindows to wxWidgets (includes SF patch #1094407 by Alexander Schuch)

Browse Source
This commit is contained in:
Volker Ruppert 2005-01-05 19:54:32 +00:00
parent 3502150e22
commit f98ecd09b1
10 changed files with 2144 additions and 4600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/Makefile.in
View File

@ -244,7 +244,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h:
$(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.169 2004-12-13 19:10:28 vruppert Exp $$' >> bxversion.h
echo '// $$Id: Makefile.in,v 1.170 2005-01-05 19:50:52 vruppert Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -300,7 +300,7 @@ libbochs_cpu.a: @DEBUGGER_VAR@ $(BX_OBJS)
ar rv libbochs_cpu.a $(BX_OBJS)
$(RANLIB) libbochs_cpu.a
# for wxWindows port, on win32 platform
# for wxWidgets port, on win32 platform
wxbochs_resources.o: wxbochs.rc
windres $(srcdir)/wxbochs.rc -o $@ --include-dir=`@WX_CONFIG@ --prefix`/include

4
bochs/aclocal.m4 vendored
View File

@ -1,10 +1,10 @@
#####################################################################
# $Id: aclocal.m4,v 1.4 2003-08-28 00:09:21 cbothamy Exp $
# $Id: aclocal.m4,v 1.5 2005-01-05 19:50:53 vruppert Exp $
#####################################################################
dnl -------------------------------------------------------------------
dnl This test for largefile support was written by Vadim Zeitlin for
dnl wxWindows. He has given permission for Bochs to use it.
dnl wxWidgets. He has given permission for Bochs to use it.
dnl -------------------------------------------------------------------
dnl WX_SYS_LARGEFILE_TEST

4
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.12 2004-11-15 10:43:39 akrisak Exp $
// $Id: dbg_main.cc,v 1.13 2005-01-05 19:50:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -543,7 +543,7 @@ bx_get_command(void)
sprintf(prompt, "<bochs:%d> ", bx_infile_stack[bx_infile_stack_index].lineno);
}
if (SIM->is_wx_selected() && bx_infile_stack_index == 0) {
// wait for wxWindows to send another debugger command
// wait for wxWidgets to send another debugger command
charptr_ret = SIM->debug_get_next_command ();
if (charptr_ret) {
strncpy (tmp_buf, charptr_ret, sizeof(tmp_buf));

2
bochs/config.h.in
View File

@ -396,7 +396,7 @@
#define BX_WITH_WX 0
// BX_USE_TEXTCONFIG should be set to 1 unless Bochs is compiled
// for wxWindows only.
// for wxWidgets only.
#define BX_USE_TEXTCONFIG 1
// add special export symbols for win32 DLL building. The main code must

6646
bochs/configure vendored
View File

File diff suppressed because it is too large Load Diff

34
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.266 2004-10-23 19:31:13 sshwarts Exp $]])
AC_REVISION([[$Id: configure.in,v 1.267 2005-01-05 19:50:53 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -162,13 +162,13 @@ AC_CHECK_FUNCS(mktime, AC_DEFINE(BX_HAVE_MKTIME))
dnl As of autoconf 2.53, the standard largefile test fails for Linux/gcc.
dnl It does not put the largefiles arguments into CFLAGS, even though Linux/gcc
dnl does need them. Since wxWindows had already solved this exact problem,
dnl Bryce asked Vadim Zeitlin of the wxWindows project if Bochs could grab
dnl does need them. Since wxWidgets had already solved this exact problem,
dnl Bryce asked Vadim Zeitlin of the wxWidgets project if Bochs could grab
dnl their largefile test, and he said it was fine. The re-implemented
dnl AC_SYS_LARGEFILE test can be found in aclocal.m4.
AC_SYS_LARGEFILE
dnl This logic came from wxWindows as well. Bryce added the CFLAGS and
dnl This logic came from wxWidgets as well. Bryce added the CFLAGS and
dnl CXXFLAGS lines, since Bochs makefiles don't use CPPFLAGS at all.
dnl
dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
@ -1999,7 +1999,7 @@ AC_ARG_WITH(svga,
)
AC_ARG_WITH(wx,
[ --with-wx use wxWindows libraries],
[ --with-wx use wxWidgets libraries],
)
AC_ARG_WITH(all-libs,
@ -2038,16 +2038,16 @@ CD_UP_THREE="echo done"
INSTALL_TARGET=install_unix
INSTALL_LIST_FOR_PLATFORM=
# check for existence of and usable version of wxWindows. This comes
# check for existence of and usable version of wxWidgets. This comes
# early so that it could affect which one gets chosen.
if test x$WX_CONFIG = x; then
AC_CHECK_PROG(WX_CONFIG, [ wx-config --version ], wx-config, not_found)
fi
AC_MSG_CHECKING(for wxWindows configuration script)
AC_MSG_CHECKING(for wxWidgets configuration script)
AC_MSG_RESULT($WX_CONFIG)
ok_wx_version=0
AC_MSG_CHECKING(for wxWindows library version)
AC_MSG_CHECKING(for wxWidgets library version)
if test x$WX_CONFIG != xnot_found; then
WX_VERSION=`$WX_CONFIG --version`
[
@ -2071,7 +2071,7 @@ if test "$cross_configure" = 0; then
with_wx=yes
fi
else
AC_MSG_WARN([Bochs for wxWindows cannot be compiled here, disabling it])
AC_MSG_WARN([Bochs for wxWidgets cannot be compiled here, disabling it])
with_wx=no
fi
fi
@ -2231,12 +2231,12 @@ if test "$with_term" = yes; then
fi
if test "$with_wx" = yes; then
display_libs="$display_libs wxWindows"
display_libs="$display_libs wxWidgets"
if test "$cross_configure" = 1; then
true # do not insist, if configuring for another machine
else
if test x$ok_wx_version != x1; then
echo ERROR: A usable version of wxWindows was not found.
echo ERROR: A usable version of wxWidgets was not found.
echo Upgrade the library or choose another gui.
exit 1
fi
@ -2286,17 +2286,17 @@ if test "$display_libs" = ""; then
exit 1
fi
dnl To use wxWindows you must select it as both the configuration interface
dnl To use wxWidgets you must select it as both the configuration interface
dnl and the display library. In the simplest case where the user has
dnl only configured with --with-wx, set both defaults to wxWindows.
dnl only configured with --with-wx, set both defaults to wxWidgets.
dnl Without this setting, the config interface would default to the text
dnl mode config interface, and then the wxWindows display library would not
dnl mode config interface, and then the wxWidgets display library would not
dnl be usable.
if test "$display_libs" = " wxWindows"; then
if test "$display_libs" = " wxWidgets"; then
AC_MSG_CHECKING(for default configuration interface)
AC_MSG_RESULT(wxWindows)
AC_MSG_RESULT(wxWidgets)
AC_MSG_CHECKING(for default display library)
AC_MSG_RESULT(wxWindows)
AC_MSG_RESULT(wxWidgets)
AC_DEFINE(BX_DEFAULT_CONFIG_INTERFACE, "wx")
AC_DEFINE(BX_DEFAULT_DISPLAY_LIBRARY, "wx")
AC_DEFINE(BX_USE_TEXTCONFIG, 0)

2
bochs/doc/man/bochsrc.5
View File

@ -78,7 +78,7 @@ The choices are:
sdl SDL library, cross platform
term text only, uses curses/ncurses library, cross platform
rfb provides an interface to AT&T's VNC viewer, cross platform
wx wxWindows library, cross platform
wx wxWidgets library, cross platform
nogui no display at all
.B NOTE:

10
bochs/gui/siminterface.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.cc,v 1.108 2004-10-16 15:44:00 vruppert Exp $
// $Id: siminterface.cc,v 1.109 2005-01-05 19:50:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// See siminterface.h for description of the siminterface concept.
@ -327,7 +327,7 @@ bx_real_sim_c::quit_sim (int code) {
BX_PANIC (("in bx_real_sim_c::quit_sim, longjmp should never return"));
}
if (SIM->is_wx_selected ()) {
// in wxWindows, the whole simulator is running in a separate thread.
// in wxWidgets, the whole simulator is running in a separate thread.
// our only job is to end the thread as soon as possible, NOT to shut
// down the whole application with an exit.
BX_CPU(0)->async_event = 1;
@ -586,7 +586,7 @@ bx_real_sim_c::periodic ()
// the image could not be opened, or -3 if there are failures during
// write, e.g. disk full.
//
// wxWindows: This may be called from the gui thread.
// wxWidgets: This may be called from the gui thread.
int
bx_real_sim_c::create_disk_image (
const char *filename,
@ -641,7 +641,7 @@ bx_real_sim_c::create_disk_image (
void bx_real_sim_c::refresh_ci () {
if (SIM->is_wx_selected ()) {
// presently, only wxWindows interface uses these events
// presently, only wxWidgets interface uses these events
// It's an async event, so allocate a pointer and send it.
// The event will be freed by the recipient.
BxEvent *event = new BxEvent ();
@ -698,7 +698,7 @@ char *bx_real_sim_c::debug_get_next_command ()
void bx_real_sim_c::debug_puts (const char *text)
{
if (SIM->is_wx_selected ()) {
// send message to the wxWindows debugger
// send message to the wxWidgets debugger
BxEvent *event = new BxEvent ();
event->type = BX_ASYNC_EVT_DBG_MSG;
event->u.logmsg.msg = text;

22
bochs/gui/siminterface.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.h,v 1.133 2004-12-30 14:50:37 vruppert Exp $
// $Id: siminterface.h,v 1.134 2005-01-05 19:50:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Before I can describe what this file is for, I have to make the
@ -87,15 +87,15 @@
// kind of parameter to ask the user to edit the value.
//
// I have been considering whether to use the same strategy for the
// wxWindows interface, but I'm not sure if I like it. One problem is
// wxWidgets interface, but I'm not sure if I like it. One problem is
// that in order to declare member functions that are useful for
// wxWindows, the wxWindows header files would have to be included
// wxWidgets, the wxWidgets header files would have to be included
// before the param object definitions. That means that all the
// wxwindows headers would have be included when compiling every
// wxWidgets headers would have be included when compiling every
// single bochs file. One of the things I like about the separation
// between the simulator and CI is that the two parts can be
// compiled without any knowledge of the other. Bochs doesn't include
// <wx.h>, and the wxwindows CI (wxmain.cc) doesn't need to include <bochs.h>.
// <wx.h>, and the wxWidgets CI (wxmain.cc) doesn't need to include <bochs.h>.
// Aside from making compiles faster, this enforces the use of the siminterface
// so it keeps the interface clean (important when we may have multiple UI
// implementations for example). This argues for keeping UI-specific
@ -605,13 +605,13 @@ typedef enum {
//
// Examples:
//
// async event: In the wxWindows implementation, both the CI and the
// VGAW operate in the wxWindows GUI thread. When the user presses a
// key, wxWindows sends a wxKeyEvent to the VGAW event handler code in
// async event: In the wxWidgets implementation, both the CI and the
// VGAW operate in the wxWidgets GUI thread. When the user presses a
// key, wxWidgets sends a wxKeyEvent to the VGAW event handler code in
// wx.cc. The VGAW handler then builds a BxEvent with
// type=BX_ASYNC_EVT_KEY, and fills in the bx_key and raw_scancode
// fields. The asynchronous event is placed on the event_queue for
// the simulator, then the VGAW handler returns. (With wxWindows and
// the simulator, then the VGAW handler returns. (With wxWidgets and
// many other graphical libaries, the event handler must return
// quickly because the window will not be updated until it's done.)
// Some time later, the simulator reaches the point where it checks
@ -692,7 +692,7 @@ typedef struct {
//
// A mouse event can be sent from the VGA window to the Bochs
// simulator. It is asynchronous. Currently unused because mouse
// events aren't implemented in our wxWindows code yet.
// events aren't implemented in our wxWidgets code yet.
typedef struct {
// type is BX_EVT_MOUSE
Bit16s dx, dy; // mouse motion delta
@ -1529,7 +1529,7 @@ typedef struct BOCHSAPI {
char initial_dir[MAX_PATH];
#endif
#ifdef __WXMSW__
// these are only used when compiling with wxWindows. This gives us a
// these are only used when compiling with wxWidgets. This gives us a
// place to store the data that was passed to WinMain.
HINSTANCE hInstance;
HINSTANCE hPrevInstance;

16
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.283 2004-12-13 19:10:31 vruppert Exp $
// $Id: main.cc,v 1.284 2005-01-05 19:50:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -362,9 +362,9 @@ void RedirectIOToConsole ()
#endif /* if defined(__WXMSW__) || (BX_WITH_SDL && defined(WIN32)) */
#if defined(__WXMSW__)
// only used for wxWindows/win32.
// This works ok in Cygwin with a standard wxWindows compile. In
// VC++ wxWindows must be compiled with -DNOMAIN=1.
// only used for wxWidgets/win32.
// This works ok in Cygwin with a standard wxWidgets compile. In
// VC++ wxWidgets must be compiled with -DNOMAIN=1.
int WINAPI WinMain(
HINSTANCE hInstance,
HINSTANCE hPrevInstance,
@ -384,7 +384,7 @@ int WINAPI WinMain(
#if !defined(__WXMSW__)
// normal main function, presently in for all cases except for
// wxWindows under win32.
// wxWidgets under win32.
int main (int argc, char *argv[])
{
bx_startup_flags.argc = argc;
@ -631,8 +631,8 @@ bx_bool load_and_init_display_lib () {
if (bx_gui != NULL) {
// bx_gui has already been filled in. This happens when you start
// the simulation for the second time.
// Also, if you load wxWindows as the configuration interface. Its
// plugin_init will install wxWindows as the bx_gui.
// Also, if you load wxWidgets as the configuration interface. Its
// plugin_init will install wxWidgets as the bx_gui.
return true;
}
BX_ASSERT (bx_gui == NULL);
@ -646,7 +646,7 @@ bx_bool load_and_init_display_lib () {
if (!strcmp (gui_name, "wx")) {
// they must not have used wx as the configuration interface, or bx_gui
// would already be initialized. Sorry, it doesn't work that way.
BX_ERROR (("wxWindows was not used as the configuration interface, so it cannot be used as the display library"));
BX_ERROR (("wxWidgets was not used as the configuration interface, so it cannot be used as the display library"));
// choose another, hopefully different!
gui_param->set (0);
gui_name = gui_param->get_choice (gui_param->get ());