From a08289a7faeba54291c70a793b52bac00459ce7e Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Tue, 9 Sep 2003 16:41:25 +0000
Subject: [PATCH] - button "Advanced" removed and description changed

---
 bochs/gui/wxdialog.cc | 8 +-------
 bochs/gui/wxdialog.h  | 7 +++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/bochs/gui/wxdialog.cc b/bochs/gui/wxdialog.cc
index f20a2e1b3..77715ed38 100644
--- a/bochs/gui/wxdialog.cc
+++ b/bochs/gui/wxdialog.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////
-// $Id: wxdialog.cc,v 1.66 2003-09-05 22:07:54 vruppert Exp $
+// $Id: wxdialog.cc,v 1.67 2003-09-09 16:41:24 vruppert Exp $
 /////////////////////////////////////////////////////////////////
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -405,7 +405,6 @@ void FloppyConfigDialog::ShowHelp ()
 //       debuggerlogfile
 //       browse button
 //     buttonSizer:
-//       advanced
 //       help
 //       cancel
 //       ok
@@ -466,8 +465,6 @@ LogOptionsDialog::LogOptionsDialog(
   }
 
   // buttonSizer contents
-  btn = new wxButton (this, ID_Advanced, BTNLABEL_ADVANCED);
-  buttonSizer->Add (btn, 0, wxALL, 5);
   btn = new wxButton (this, wxID_HELP, BTNLABEL_HELP);
   buttonSizer->Add (btn, 0, wxALL, 5);
   // use wxID_CANCEL because pressing ESC produces this same code
@@ -526,9 +523,6 @@ void LogOptionsDialog::OnEvent(wxCommandEvent& event)
     case ID_Browse2:
       BrowseTextCtrl (debuggerlogfile);
       break;
-    case ID_Advanced:
-      wxMessageBox ("The advanced dialog is not implemented yet.", "Info", wxOK, this);
-      break;
     case wxID_OK:
       EndModal (wxID_OK);
       break;
diff --git a/bochs/gui/wxdialog.h b/bochs/gui/wxdialog.h
index d96ecc084..fd2ff98a4 100644
--- a/bochs/gui/wxdialog.h
+++ b/bochs/gui/wxdialog.h
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////
-// $Id: wxdialog.h,v 1.52 2003-09-05 22:07:54 vruppert Exp $
+// $Id: wxdialog.h,v 1.53 2003-09-09 16:41:25 vruppert Exp $
 ////////////////////////////////////////////////////////////////////
 //
 // wxWindows dialogs for Bochs
@@ -16,7 +16,6 @@
 #define BTNLABEL_CANCEL "Cancel"
 #define BTNLABEL_OK "Ok"
 #define BTNLABEL_CREATE_IMG "Create Image"
-#define BTNLABEL_ADVANCED "Advanced"
 #define BTNLABEL_BROWSE "<--Browse"
 #define BTNLABEL_DEBUG_CONTINUE "Continue"
 #define BTNLABEL_DEBUG_STOP "Stop"
@@ -227,7 +226,7 @@ DECLARE_EVENT_TABLE()
 // |            Panic events: [ask   ]                       |
 // |                                                         |
 // | For additional control over how each device responds    |
-// | to events, press the "Advanced" button.                 |
+// | to events, use the menu option "Log ... By Device".     |
 // |                                                         |
 // | Debugger log file is [____________________]  [ Browse ] |
 // |                                                         |
@@ -263,7 +262,7 @@ private:
    /* can't ignore panics or errors */ \
    || (type >= 2 && choice==0) \
    )
-#define LOG_OPTS_ADV "For additional control over how each device responds to events, press the \"Advanced\" button."
+#define LOG_OPTS_ADV "For additional control over how each device responds to events, use the menu option \"Log ... By Device\"."
   void Init ();  // called automatically by ShowModal()
   void ShowHelp ();
   wxBoxSizer *vertSizer, *logfileSizer, *debuggerlogfileSizer, *buttonSizer;