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

- wxMutexGuiEnter() / wxMutexGuiLeave() calls are required at status bar updates

Browse Source 
(fixes gui display problems in the wxGTK port)
- fixed floppy dialog title and label
This commit is contained in:
Volker Ruppert 2006-09-03 05:52:53 +00:00
parent a3908d6e86
commit 5afe0efe08
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/gui/wx.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wx.cc,v 1.85 2006-08-29 20:10:27 vruppert Exp $
// $Id: wx.cc,v 1.86 2006-09-03 05:52:52 vruppert Exp $
/////////////////////////////////////////////////////////////////
//
// wxWidgets VGA display for Bochs. wx.cc implements a custom
@ -1045,6 +1045,7 @@ bx_wx_gui_c::statusbar_setitem(int element, bx_bool active)
char status_text[10];
#endif
wxMutexGuiEnter();
if (element < 0) {
for (unsigned i = 0; i < statusitem_count; i++) {
if (active) {
@ -1073,6 +1074,7 @@ bx_wx_gui_c::statusbar_setitem(int element, bx_bool active)
theFrame->SetStatusText(wxT(""), element+1);
}
}
wxMutexGuiLeave();
}
// ::FLUSH()
@ -1637,8 +1639,10 @@ bx_wx_gui_c::set_clipboard_text(char *text_snapshot, Bit32u len)
void bx_wx_gui_c::show_ips(Bit32u ips_count)
{
char ips_text[40];
wxMutexGuiEnter();
sprintf(ips_text, "IPS: %9u", ips_count);
theFrame->SetStatusText(wxString(ips_text, wxConvUTF8), 0);
wxMutexGuiLeave();
}
#endif

6
bochs/gui/wxdialog.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////
// $Id: wxdialog.h,v 1.64 2006-03-26 15:52:31 vruppert Exp $
// $Id: wxdialog.h,v 1.65 2006-09-03 05:52:53 vruppert Exp $
////////////////////////////////////////////////////////////////////
//
// wxWidgets dialogs for Bochs
@ -168,8 +168,8 @@ DECLARE_EVENT_TABLE()
class FloppyConfigDialog: public wxDialog
{
public:
#define FLOPPY_CONFIG_TITLE wxT("Configure %s")
#define FLOPPY_CONFIG_INSTRS wxT("Select the device or image to use when simulating %s.")
#define FLOPPY_CONFIG_TITLE wxT("Configure ")
#define FLOPPY_CONFIG_INSTRS wxT("Select the device or image to use when simulating ")
#define FLOPPY_CONFIG_CAP wxT("What is the capacity of this disk?")
#define FLOPPY_CONFIG_HINT wxT("To create a disk image, choose the file name and capacity, then click on \"Create Image\".\n\n" \
"Clicking OK signals a media change for this drive.")