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

- clean up extra ^M's I introduced when playing in win32 land. They are

Browse Source 
mostly harmless EXCEPT if they appear after a '\' that's used for line
  continuation.  Then they are a disaster.
This commit is contained in:
Bryce Denney 2002-09-03 19:04:17 +00:00
parent f2398d7daa
commit 33eefab657
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.29 2002-09-03 17:50:12 bdenney Exp $
// $Id: wxmain.cc,v 1.30 2002-09-03 19:04:17 bdenney Exp $
/////////////////////////////////////////////////////////////////
//
// wxmain.cc implements the wxWindows frame, toolbar, menus, and dialogs.
@ -296,12 +296,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
CreateStatusBar();
SetStatusText( "Welcome to wxWindows!" );
CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT);
CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT);
wxToolBar *tb = GetToolBar();
tb->SetToolBitmapSize(wxSize(32, 32));
#define BX_ADD_TOOL(id, xpm_name, tooltip) do { \
tb->AddTool(id, wxBitmap(xpm_name), tooltip); \
tb->AddTool(id, wxBitmap(xpm_name), tooltip); \
} while (0)
BX_ADD_TOOL(ID_Edit_FD_0, floppya_xpm, "Change Floppy A");
@ -1010,10 +1010,10 @@ void MyFrame::editHDConfig (int drive)
&& heads->get_type () == BXT_PARAM_NUM
&& spt->get_type() == BXT_PARAM_NUM
&& present->get_type() == BXT_PARAM_BOOL);
dlg.SetFilename (fname->getptr ());
dlg.SetGeomRange (0, cyl->get_min(), cyl->get_max ());
dlg.SetGeomRange (1, heads->get_min(), heads->get_max ());
dlg.SetGeomRange (2, spt->get_min(), spt->get_max ());
dlg.SetFilename (fname->getptr ());
dlg.SetGeomRange (0, cyl->get_min(), cyl->get_max ());
dlg.SetGeomRange (1, heads->get_min(), heads->get_max ());
dlg.SetGeomRange (2, spt->get_min(), spt->get_max ());
dlg.SetGeom (0, cyl->get ());
dlg.SetGeom (1, heads->get ());
dlg.SetGeom (2, spt->get ());

6
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.133 2002-09-03 15:59:52 bdenney Exp $
// $Id: main.cc,v 1.134 2002-09-03 19:04:17 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -262,7 +262,7 @@ char *bx_param_string_handler (bx_param_string_c *param, int set, char *val, int
void bx_init_options ()
{
{
int i;
bx_list_c *menu;
bx_list_c *deplist;
@ -534,7 +534,7 @@ void bx_init_options ()
bx_options.memory.Osize->set_ask_format ("Enter memory size (MB): [%d] ");
// initialize serial and parallel port options
#define PAR_SER_INIT_LIST_MAX \
#define PAR_SER_INIT_LIST_MAX \
((BXP_PARAMS_PER_PARALLEL_PORT * BX_N_PARALLEL_PORTS) \
+ (BXP_PARAMS_PER_SERIAL_PORT * BX_N_SERIAL_PORTS))
bx_param_c *par_ser_init_list[1+PAR_SER_INIT_LIST_MAX];