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

- fixed compilation errors

Browse Source
This commit is contained in:
Volker Ruppert 2007-11-02 16:58:46 +00:00
parent 9481924b35
commit 018484006b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/gui/wxdialog.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxdialog.cc,v 1.102 2006-12-17 08:17:28 vruppert Exp $
// $Id: wxdialog.cc,v 1.103 2007-11-02 16:58:46 vruppert Exp $
/////////////////////////////////////////////////////////////////
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
@ -251,7 +251,7 @@ void FloppyConfigDialog::SetDriveName(wxString name)
wxT("."));
}
void FloppyConfigDialog::SetCapacityChoices(char *choices[])
void FloppyConfigDialog::SetCapacityChoices(const char *choices[])
{
int i = 0;
while (choices[i] != NULL) {
@ -989,7 +989,7 @@ void ParamDialog::AddParam (
if (!plain) sizer->Add (1, 1); // spacer
// fill in the choices
int i=0;
char *ptr;
const char *ptr;
while (NULL != (ptr = param->get_choice(i++)))
choice->Append(wxString(ptr, wxConvUTF8));
choice->SetSelection (param->get() - param->get_min());

4
bochs/gui/wxdialog.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////
// $Id: wxdialog.h,v 1.68 2006-12-17 08:17:28 vruppert Exp $
// $Id: wxdialog.h,v 1.69 2007-11-02 16:58:46 vruppert Exp $
////////////////////////////////////////////////////////////////////
//
// wxWidgets dialogs for Bochs
@ -198,7 +198,7 @@ public:
void SetFilename(wxString f);
// Use char* instead of wxString because the array we use is already
// expressed as a char *[].
void SetCapacityChoices(char *choices[]);
void SetCapacityChoices(const char *choices[]);
void SetCapacity(int cap);
int GetRadio();
int GetCapacity() { return capacity->GetSelection(); }

4
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.153 2007-09-28 19:51:58 sshwarts Exp $
// $Id: wxmain.cc,v 1.154 2007-11-02 16:58:46 vruppert Exp $
/////////////////////////////////////////////////////////////////
//
// wxmain.cc implements the wxWidgets frame, toolbar, menus, and dialogs.
@ -1023,7 +1023,7 @@ void MyFrame::OnStartSim(wxCommandEvent& event)
// with the wx config interface, but there are still some significant
// problems.
bx_param_enum_c *gui_param = SIM->get_param_enum(BXPN_SEL_DISPLAY_LIBRARY);
char *gui_name = gui_param->get_selected();
const char *gui_name = gui_param->get_selected();
if (strcmp(gui_name, "wx") != 0) {
wxMessageBox(wxT(
"The display library was not set to wxWidgets. When you use the\n"