[prev in list] [next in list] [prev in thread] [next in thread]
List: bochs-cvs
Subject: [Bochs-cvs] [12072] trunk/bochs/gui
From: vruppert () users ! sourceforge ! net
Date: 2013-12-26 20:51:48
Message-ID: E1VwHuK-0001pj-Hk () sfs-ml-3 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 12072
Author: vruppert
Date: 2013-12-26 20:51:46 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
Removed obsolete stuff from the gui code
Modified Paths:
--------------
trunk/bochs/gui/rfb.cc
trunk/bochs/gui/win32.cc
trunk/bochs/gui/wxdialog.cc
trunk/bochs/gui/wxdialog.h
trunk/bochs/gui/wxmain.h
Modified: trunk/bochs/gui/rfb.cc
===================================================================
--- trunk/bochs/gui/rfb.cc 2013-12-26 08:37:51 UTC (rev 12071)
+++ trunk/bochs/gui/rfb.cc 2013-12-26 20:51:46 UTC (rev 12072)
@@ -288,8 +288,6 @@
rfbScreen = (char *)malloc(rfbWindowX * rfbWindowY);
memset(&rfbPalette, 0, sizeof(rfbPalette));
- rfbPalette[7] = (char)0xAD;
- rfbPalette[63] = (char)0xFF;
rfbUpdateRegion.x = rfbWindowX;
rfbUpdateRegion.y = rfbWindowY;
Modified: trunk/bochs/gui/win32.cc
===================================================================
--- trunk/bochs/gui/win32.cc 2013-12-26 08:37:51 UTC (rev 12071)
+++ trunk/bochs/gui/win32.cc 2013-12-26 20:51:46 UTC (rev 12072)
@@ -44,7 +44,7 @@
class bx_win32_gui_c : public bx_gui_c {
public:
- bx_win32_gui_c (void) {}
+ bx_win32_gui_c(void) {}
DECLARE_GUI_VIRTUAL_METHODS();
virtual void statusbar_setitem_specific(int element, bx_bool active, bx_bool w);
virtual void get_capabilities(Bit16u *xres, Bit16u *yres, Bit16u *bpp);
@@ -195,15 +195,14 @@
sharedThreadInfo stInfo;
-LRESULT CALLBACK mainWndProc (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK simWndProc (HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK mainWndProc(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK simWndProc(HWND, UINT, WPARAM, LPARAM);
DWORD WINAPI UIThread(PVOID);
void SetStatusText(unsigned Num, const char *Text, bx_bool active, bx_bool w=0);
void terminateEmul(int);
void create_vga_font(void);
static unsigned char reverse_bitorder(unsigned char);
-void DrawBitmap (HDC, HBITMAP, int, int, int, int, int, int, DWORD, unsigned char);
-void DrawChar (HDC, unsigned char, int, int, unsigned char cColor, int, int);
+void DrawBitmap(HDC, HBITMAP, int, int, int, int, int, int, DWORD, unsigned char);
void updateUpdated(int,int,int,int);
static void headerbar_click(int x);
Modified: trunk/bochs/gui/wxdialog.cc
===================================================================
--- trunk/bochs/gui/wxdialog.cc 2013-12-26 08:37:51 UTC (rev 12071)
+++ trunk/bochs/gui/wxdialog.cc 2013-12-26 20:51:46 UTC (rev 12072)
@@ -1202,7 +1202,7 @@
{
infoSizer = new wxBoxSizer(wxHORIZONTAL);
infoSizer->Add(new wxStaticText(this, -1, wxString("Clicking OK signals a media \
change for this drive.", wxConvUTF8)), 0, wxALIGN_CENTER|wxALL, 3);
- createButton = AddButton(ID_Create, wxT("Create Image"));
+ createButton = AddButton(ID_Create, BTNLABEL_CREATE_IMG);
AddDefaultButtons();
}
Modified: trunk/bochs/gui/wxdialog.h
===================================================================
--- trunk/bochs/gui/wxdialog.h 2013-12-26 08:37:51 UTC (rev 12071)
+++ trunk/bochs/gui/wxdialog.h 2013-12-26 20:51:46 UTC (rev 12072)
@@ -14,18 +14,11 @@
////////////////////////////////////////////////////////////////////
#define MSG_NO_HELP wxT("No help is available yet.")
#define MSG_NO_HELP_CAPTION wxT("No help")
-#define MSG_ENABLED wxT("Enabled")
#define BTNLABEL_HELP wxT("Help")
#define BTNLABEL_CANCEL wxT("Cancel")
#define BTNLABEL_OK wxT("Ok")
#define BTNLABEL_CREATE_IMG wxT("Create Image")
#define BTNLABEL_BROWSE wxT("<--Browse")
-#define BTNLABEL_DEBUG_CONTINUE wxT("Continue")
-#define BTNLABEL_DEBUG_STOP wxT("Stop")
-#define BTNLABEL_DEBUG_STEP wxT("Step")
-#define BTNLABEL_DEBUG_COMMIT wxT("Commit")
-#define BTNLABEL_CLOSE wxT("Close")
-#define BTNLABEL_EXECUTE wxT("Execute")
#if defined(WIN32)
// On win32, apparantly the spinctrl depends on a native control which only
@@ -439,24 +432,6 @@
| [Help] [Cancel] [Ok] |
+---------------------------------------------------------------------------+
-The CD-ROM media can still be configured during the simulation. In this
-context we can just show the Media section. The same code can be written to
-serve both purposes. This is the dialog that would appear when you click the
-CD-ROM button on the toolbar at runtime.
-
-+-- CD-ROM Media -----------------------------+
-| |
-| Bochs can use a physical CD-ROM drive as |
-| the data source, or use an image file. |
-| |
-| [X] Ejected |
-| [ ] Physical CD-ROM drive /dev/cdrom |
-| [ ] Disk image: [_____________] [Browse] |
-| |
-| |
-| [Help] [Cancel] [Ok] |
-+---------------------------------------------+
-
////////////////////////////////////////////////////////////////////////////
// ChooseConfigDialog
////////////////////////////////////////////////////////////////////////////
@@ -489,48 +464,6 @@
+--------------------------------------------------------+
////////////////////////////////////////////////////////////////////////////
-// ChooseBootDialog
-////////////////////////////////////////////////////////////////////////////
-
-This dialog basically lets you choose which disk you want to boot: floppy A,
-disk c, or cdrom. The boot selection could be as simple as
-+-------------------------------------------+
-| Choose boot drive |
-| [ ] Floppy A |
-| [X] Hard Disk C |
-| [ ] CD-ROM |
-| [ Help ] [ Cancel ] [ Ok ] |
-+-------------------------------------------+
-or fancier with icons for the device types, and Edit buttons that
-let you go right to the configure screen for that disk drive.
-+---------------------------------------------------------------+
-| |
-| /----+ |
-| |= =| A Drive +----+ |
-| [ ] | __ | Raw Floppy Drive |Edit| |
-| || || A: +----+ |
-| ++--++ |
-| |
-| /----+ |
-| |= =| B Drive +----+ |
-| [ ] | __ | Floppy Disk Image |Edit| |
-| || || C:\Bochs\Images\A.img +----+ |
-| ++--++ |
-| |
-| +-----+ C Drive |
-| |=====| Hard Disk Image +----+ |
-| [BOOT] | o| C:\Bochs\Images\HD30meg.img |Edit| |
-| +-----+ +----+ |
-| |
-| ___ |
-| / \ D Drive +----+ |
-| [ ] | O | ISO CD Image |Edit| |
-| \___/ C:\Bochs\Images\BootCD.img +----+ |
-| |
-| [ Help ] [ Cancel ] [ Ok ] |
-+---------------------------------------------------------------+
-
-////////////////////////////////////////////////////////////////////////////
// KeymappingDialog
////////////////////////////////////////////////////////////////////////////
more ambitious: create a button for each key on a standard keyboard, so that
Modified: trunk/bochs/gui/wxmain.h
===================================================================
--- trunk/bochs/gui/wxmain.h 2013-12-26 08:37:51 UTC (rev 12071)
+++ trunk/bochs/gui/wxmain.h 2013-12-26 20:51:46 UTC (rev 12072)
@@ -208,7 +208,6 @@
wxMenu *menuConfiguration;
wxMenu *menuEdit;
wxMenu *menuSimulate;
- wxMenu *menuDebug;
wxMenu *menuLog;
wxMenu *menuHelp;
wxToolBar *bxToolBar;
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic