Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-27 22:29:48 +00:00
Code Issues Projects Releases Wiki Activity

Applied Joshua Bell's patch:

Browse Source 
* Clean up signed/unsigned comparison warnings
* Clean up deprecated function warnings
* Enable XP visual themes in the properties dialog (the AdditionalManifestDependencies entry in ApplewinExpress9.00.vcproj)
* Clean up of settings property sheet:
** Correct tab order
** Add/correct keyboard shortcuts
** Adjust layout (slightly; most dramatic on first tab)
** Retitle a few controls for improved readability
** Tweaked the spin controls to be right aligned
This commit is contained in:
tomch 2009-11-30 14:00:22 +00:00
parent 5ed7a58e0b
commit 1581b6a4ff
8 changed files with 112 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AppleWin/ApplewinExpress9.00.vcproj
View File

@ -86,6 +86,7 @@
OutputFile=".\Release/Applewin.exe" OutputFile=".\Release/Applewin.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalManifestDependencies=""type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'""
ProgramDatabaseFile=".\Release/Applewin.pdb" ProgramDatabaseFile=".\Release/Applewin.pdb"
SubSystem="2" SubSystem="2"
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
@ -180,6 +181,7 @@
OutputFile=".\Debug/Applewin.exe" OutputFile=".\Debug/Applewin.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalManifestDependencies=""type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/Applewin.pdb" ProgramDatabaseFile=".\Debug/Applewin.pdb"
SubSystem="2" SubSystem="2"

205
AppleWin/resource/Applewin.rc
View File

@ -83,20 +83,21 @@ IDB_DEBUG_FONT_7X8 BITMAP "Debug_Font.bmp"
// Dialog // Dialog
// //
IDD_PROPPAGE_CONFIG DIALOGEX 0, 0, 210, 221 IDD_PROPPAGE_CONFIG DIALOGEX 0, 0, 210, 209
STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU
CAPTION "Configuration" CAPTION "Configuration"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "&Model:",IDC_STATIC,5,13,40,8 LTEXT "&Model:",IDC_STATIC,5,7,40,8
COMBOBOX IDC_COMPUTER,45,11,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMPUTER,45,5,95,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Video:",IDC_STATIC,5,36,40,8 GROUPBOX "Video",IDC_STATIC,5,22,200,43
COMBOBOX IDC_VIDEOTYPE,45,34,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Mo&de:",IDC_STATIC,12,33,33,8
CONTROL "&50% Scan lines",IDC_CHECK_HALF_SCAN_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,36,122,10 COMBOBOX IDC_VIDEOTYPE,45,30,95,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Ethernet Settings...",IDC_ETHERNET,15,70,80,14 PUSHBUTTON "Monochrome &Color...",IDC_MONOCOLOR,12,46,80,14
PUSHBUTTON "Monochrome Color...",IDC_MONOCOLOR,15,90,80,14 CONTROL "&50% Scan lines",IDC_CHECK_HALF_SCAN_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,48,62,10
LTEXT "S&erial Port:",IDC_STATIC,5,50,40,8 LTEXT "&Serial Port:",IDC_STATIC,5,74,40,8
COMBOBOX IDC_SERIALPORT,45,48,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SERIALPORT,45,72,95,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Ethernet Settings...",IDC_ETHERNET,4,90,80,14
GROUPBOX "Emulation Speed Control",IDC_STATIC,5,115,200,85 GROUPBOX "Emulation Speed Control",IDC_STATIC,5,115,200,85
CONTROL "Use &Authentic Machine Speed",IDC_AUTHENTIC_SPEED, CONTROL "Use &Authentic Machine Speed",IDC_AUTHENTIC_SPEED,
"Button",BS_AUTORADIOBUTTON,15,126,115,10 "Button",BS_AUTORADIOBUTTON,15,126,115,10
@ -109,81 +110,81 @@ BEGIN
PUSHBUTTON "&Benchmark Emulator",IDC_BENCHMARK,15,179,85,15 PUSHBUTTON "&Benchmark Emulator",IDC_BENCHMARK,15,179,85,15
END END
IDD_PROPPAGE_INPUT DIALOGEX 0, 0, 210, 221 IDD_PROPPAGE_INPUT DIALOGEX 0, 0, 210, 182
STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU
CAPTION "Input" CAPTION "Input"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
PUSHBUTTON "Paste from clipboard",IDC_PASTE_FROM_CLIPBOARD,5,193,75,14 CONTROL "&Restrict mouse to Apple window",IDC_MOUSE_RESTRICT_TO_WINDOW,
GROUPBOX "Joystick Control",IDC_STATIC,5,20,200,80 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,123,121,10
LTEXT "&Joystick1:",IDC_STATIC,12,33,40,8 GROUPBOX "Joystick Control",IDC_STATIC,5,7,200,66
COMBOBOX IDC_JOYSTICK0,52,31,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Joystick &1:",IDC_STATIC,12,20,40,8
LTEXT "&Joystick2:",IDC_STATIC,12,48,40,8 COMBOBOX IDC_JOYSTICK0,52,18,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_JOYSTICK1,52,46,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Joystick &2:",IDC_STATIC,12,35,40,8
LTEXT "X-trim:",IDC_STATIC,13,72,28,8 COMBOBOX IDC_JOYSTICK1,52,33,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CTEXT "0",IDC_STATIC,36,66,24,20,SS_CENTERIMAGE LTEXT "&X-trim:",IDC_STATIC,13,56,28,8
CONTROL "Spin1",IDC_SPIN_XTRIM,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNLEFT | UDS_AUTOBUDDY,59,69,10,14 CTEXT "0",IDC_STATIC,36,50,24,20,SS_CENTERIMAGE
LTEXT "Y-trim:",IDC_STATIC,115,72,28,8 CONTROL "Spin1",IDC_SPIN_XTRIM,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY,59,53,10,14
CTEXT "0",IDC_STATIC,137,65,24,20,SS_CENTERIMAGE LTEXT "&Y-trim:",IDC_STATIC,115,56,28,8
CONTROL "Spin1",IDC_SPIN_YTRIM,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNLEFT | UDS_AUTOBUDDY,161,69,10,14 CTEXT "0",IDC_STATIC,137,49,24,20,SS_CENTERIMAGE
CONTROL "Scroll Lock acts as toggle for full-speed CPU",IDC_SCROLLLOCK_TOGGLE, CONTROL "Spin1",IDC_SPIN_YTRIM,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY,161,53,10,14
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,114,166,10 CONTROL "&Scroll Lock acts as toggle for full-speed CPU",IDC_SCROLLLOCK_TOGGLE,
LTEXT "(Shift+Insert during emulation)",IDC_STATIC,89,196,94,8 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,81,166,10
CONTROL "Mouse interface in slot 4",IDC_MOUSE_IN_SLOT4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,128,106,10 CONTROL "&Mouse interface in slot 4",IDC_MOUSE_IN_SLOT4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,95,106,10
CONTROL "Show crosshairs in window's frame",IDC_MOUSE_CROSSHAIR, CONTROL "Show &crosshairs in window's frame",IDC_MOUSE_CROSSHAIR,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,142,159,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,109,159,10
CONTROL "Restrict mouse to Apple window",IDC_MOUSE_RESTRICT_TO_WINDOW, CONTROL "Microsoft C&P/M SoftCard in slot 5",IDC_Z80_IN_SLOT5,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,156,159,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,138,122,10
CONTROL "Microsoft CP/M SoftCard in slot 5",IDC_Z80_IN_SLOT5, PUSHBUTTON "Paste &From Clipboard",IDC_PASTE_FROM_CLIPBOARD,5,160,81,14
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,171,122,10 LTEXT "(Shift+Insert during emulation)",IDC_STATIC,90,163,111,8
END END
IDD_PROPPAGE_SOUND DIALOGEX 0, 0, 210, 221 IDD_PROPPAGE_SOUND DIALOGEX 0, 0, 210, 191
STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU
CAPTION "Sound" CAPTION "Sound"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "&Sound:",IDC_STATIC,5,29,40,8 LTEXT "&Device:",IDC_STATIC,5,7,40,8
COMBOBOX IDC_SOUNDTYPE,45,27,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SOUNDTYPE,45,5,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Volume Control",IDC_STATIC,5,55,100,89 GROUPBOX "Volume Control",IDC_STATIC,5,24,100,89
CONTROL "Slider1",IDC_SPKR_VOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,13,78,28,60 LTEXT "&Speaker:",IDC_STATIC,11,39,31,8
LTEXT "Speaker:",IDC_STATIC,11,70,31,8 CONTROL "Slider1",IDC_SPKR_VOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,13,47,28,60
GROUPBOX "Mockingboard/Phasor Control",IDC_STATIC,6,153,197,61 LTEXT "&Mockingboard:",IDC_STATIC,49,39,51,8
LTEXT "Mockingboard:",IDC_STATIC,49,70,51,8 CONTROL "Slider1",IDC_MB_VOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,59,47,25,60
CONTROL "Slider1",IDC_MB_VOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,59,78,25,60 GROUPBOX "Sound Cards",IDC_STATIC,6,122,197,61
CONTROL "Enable Mockingboards (in slots 4 && 5)",IDC_MB_ENABLE, CONTROL "Mocking&boards (in slots 4 && 5)",IDC_MB_ENABLE,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,10,136,142,8
"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,10,167,142,8 CONTROL "&Phasor (in slot 4)",IDC_PHASOR_ENABLE,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,10,149,92,10
CONTROL "Enable Phasor (in slot 4)",IDC_PHASOR_ENABLE,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,10,180,92,10 CONTROL "&No sound cards",IDC_SOUNDCARD_DISABLE,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,10,163,78,10
CONTROL "Disable soundcards",IDC_SOUNDCARD_DISABLE,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,10,194,78,10
END END
IDD_PROPPAGE_DISK DIALOGEX 0, 0, 210, 221 IDD_PROPPAGE_DISK DIALOGEX 0, 0, 210, 190
STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU
CAPTION "Disk" CAPTION "Disk"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "&Disk access speed:",IDC_STATIC,7,34,64,8 GROUPBOX "Floppy Disk Drives",IDC_STATIC,5,7,200,73
COMBOBOX IDC_DISKTYPE,85,33,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Disk access speed:",IDC_STATIC,12,21,64,8
PUSHBUTTON "Select HDD1",IDC_HDD1,5,142,70,14 COMBOBOX IDC_DISKTYPE,80,18,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Select HDD2",IDC_HDD2,5,162,70,14 PUSHBUTTON "Select Disk &1",IDC_DISK1,10,39,70,14
PUSHBUTTON "Select Disk1",IDC_DISK1,5,53,70,14 EDITTEXT IDC_EDIT_DISK1,84,40,115,12,ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "Select Disk2",IDC_DISK2,5,74,70,14 PUSHBUTTON "Select Disk &2",IDC_DISK2,10,60,70,14
EDITTEXT IDC_EDIT_DISK1,85,54,115,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_EDIT_DISK2,84,60,115,12,ES_AUTOHSCROLL | ES_READONLY
EDITTEXT IDC_EDIT_DISK2,85,74,115,12,ES_AUTOHSCROLL | ES_READONLY GROUPBOX "Hard Disk Drives",IDC_STATIC,5,85,200,71
EDITTEXT IDC_EDIT_HDD1,85,143,115,12,ES_AUTOHSCROLL | ES_READONLY CONTROL "&Enable hard disk controller in slot 7",IDC_HDD_ENABLE,
EDITTEXT IDC_EDIT_HDD2,85,163,115,12,ES_AUTOHSCROLL | ES_READONLY "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,98,190,10
CONTROL "Enable harddisk in slot 7",IDC_HDD_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,126,120,10 PUSHBUTTON "Select &HDD 1",IDC_HDD1,10,114,70,14
GROUPBOX "Floppy Controller",IDC_STATIC,2,21,206,73 EDITTEXT IDC_EDIT_HDD1,85,115,115,12,ES_AUTOHSCROLL | ES_READONLY
GROUPBOX "Harddisk Controller",IDC_STATIC,2,113,205,71 PUSHBUTTON "Selec&t HDD 2",IDC_HDD2,10,134,70,14
LTEXT "Path to CiderPress:",IDC_STATIC,5,190,74,8 EDITTEXT IDC_EDIT_HDD2,85,135,115,12,ES_AUTOHSCROLL | ES_READONLY
EDITTEXT IDC_CIDERPRESS_FILENAME,5,200,143,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "&Path to CiderPress:",IDC_STATIC,5,162,74,8
PUSHBUTTON "Browse...",IDC_CIDERPRESS_BROWSE,154,200,50,14 EDITTEXT IDC_CIDERPRESS_FILENAME,5,172,143,12,ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "&Browse...",IDC_CIDERPRESS_BROWSE,154,171,50,14
END END
IDD_TFE_SETTINGS_DIALOG DIALOG 0, 0, 270, 100 IDD_TFE_SETTINGS_DIALOG DIALOGEX 0, 0, 270, 100
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Ethernet Settings" CAPTION "Ethernet Settings"
FONT 8, "MS Sans Serif" FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "Ethernet",IDC_TFE_SETTINGS_ENABLE_T,9,7,30,8 LTEXT "Ethernet",IDC_TFE_SETTINGS_ENABLE_T,9,7,30,8
COMBOBOX IDC_TFE_SETTINGS_ENABLE,45,5,50,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_TFE_SETTINGS_ENABLE,45,5,50,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@ -195,37 +196,37 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,80,75,50,14 PUSHBUTTON "Cancel",IDCANCEL,80,75,50,14
END END
IDD_PROPPAGE_ADVANCED DIALOGEX 0, 0, 210, 221 IDD_PROPPAGE_ADVANCED DIALOGEX 0, 0, 210, 217
STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_CAPTION | WS_SYSMENU
CAPTION "Advanced" CAPTION "Advanced"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "Save State file name:",IDC_STATIC,5,2,74,8 GROUPBOX "Save State",IDC_STATIC,5,7,200,86
GROUPBOX "Save State Control",IDC_STATIC,5,27,200,63 LTEXT "&Filename:",IDC_STATIC,12,19,74,8
CONTROL "Save State on exit",IDC_SAVESTATE_ON_EXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,38,74,10 EDITTEXT IDC_SAVESTATE_FILENAME,12,30,133,12,ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "Save State",IDC_SAVESTATE,16,50,85,15 PUSHBUTTON "&Browse...",IDC_SAVESTATE_BROWSE,149,28,50,14
PUSHBUTTON "Load State",IDC_LOADSTATE,16,67,85,15 CONTROL "Save state on e&xit",IDC_SAVESTATE_ON_EXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,47,74,10
EDITTEXT IDC_SAVESTATE_FILENAME,5,23,143,12,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Sa&ve State",IDC_SAVESTATE,13,59,85,15
LTEXT "(F11 during emulation)",IDC_STATIC,110,53,90,8 LTEXT "(F11 during emulation)",IDC_STATIC,107,62,90,8
LTEXT "(F12 during emulation)",IDC_STATIC,110,70,90,8 PUSHBUTTON "&Load State",IDC_LOADSTATE,13,76,85,15
PUSHBUTTON "Browse...",IDC_SAVESTATE_BROWSE,154,12,50,14 LTEXT "(F12 during emulation)",IDC_STATIC,107,79,90,8
LTEXT "Printer dump filename:",IDC_STATIC,5,98,74,8 LTEXT "&Printer dump filename:",IDC_STATIC,5,97,74,8
PUSHBUTTON "Browse...",IDC_DUMP_FILENAME_BROWSE,154,107,50,14 EDITTEXT IDC_DUMP_FILENAME,5,107,143,12,ES_AUTOHSCROLL
EDITTEXT IDC_DUMP_FILENAME,5,108,143,12,ES_AUTOHSCROLL PUSHBUTTON "B&rowse...",IDC_DUMP_FILENAME_BROWSE,154,106,50,14
CONTROL "Dump to printer (use with caution)",IDC_DUMPTOPRINTER, CONTROL "&Dump to printer (use with caution)",IDC_DUMPTOPRINTER,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,125,180,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,124,180,10
CONTROL "Encoding conversion for clones",IDC_PRINTER_CONVERT_ENCODING, CONTROL "&Encoding conversion for clones",IDC_PRINTER_CONVERT_ENCODING,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,135,180,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,135,180,10
CONTROL "Filter unprintable characters",IDC_PRINTER_FILTER_UNPRINTABLE, CONTROL "Filter &unprintable characters",IDC_PRINTER_FILTER_UNPRINTABLE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,145,180,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,146,180,10
CONTROL "Append to print file",IDC_PRINTER_APPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,155,180,10 CONTROL "&Append to print file",IDC_PRINTER_APPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,157,120,10
LTEXT "Teminate printing after idle (in seconds):",IDC_STATIC,3,169,160,8 LTEXT "&Teminate printing after idle (in seconds):",IDC_STATIC,5,171,133,8
CTEXT "10",IDC_STATIC,155,162,24,20,SS_CENTERIMAGE CTEXT "10",IDC_STATIC,140,165,24,20,SS_CENTERIMAGE
CONTROL "Spin1",IDC_SPIN_PRINTER_IDLE,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNLEFT | UDS_AUTOBUDDY,161,166,10,14 CONTROL "Spin1",IDC_SPIN_PRINTER_IDLE,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY,172,169,11,14
LTEXT "&Clone:",IDC_STATIC,5,185,40,8 LTEXT "&Clone:",IDC_STATIC,5,187,40,8
COMBOBOX IDC_CLONETYPE,45,185,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CLONETYPE,35,185,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "The Freeze's non-autostart F8 rom (Apple ][ or ][+ only)",IDC_THE_FREEZES_F8_ROM_FW, CONTROL "The Free&ze's non-autostart F8 rom (Apple ][ or ][+ only)",IDC_THE_FREEZES_F8_ROM_FW,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,206,182,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,201,194,10
END END

5
AppleWin/resource/resource.h
View File

@ -95,21 +95,20 @@
#define IDC_PRINTER_APPEND 1057 #define IDC_PRINTER_APPEND 1057
#define IDC_SPIN_PRINTER_IDLE 1058 #define IDC_SPIN_PRINTER_IDLE 1058
#define IDC_CHECK_HALF_SCAN_LINES 1059 #define IDC_CHECK_HALF_SCAN_LINES 1059
#define IDM_EXIT 40001 #define IDM_EXIT 40001
#define IDM_HELP 40002 #define IDM_HELP 40002
#define IDM_ABOUT 40003 #define IDM_ABOUT 40003
#define ID_DISKMENU_EJECT 40004 #define ID_DISKMENU_EJECT 40004
#define ID_DISKMENU_WRITEPROTECTION_ON 40005 #define ID_DISKMENU_WRITEPROTECTION_ON 40005
#define ID_DISKMENU_WRITEPROTECTION_OFF 40006 #define ID_DISKMENU_WRITEPROTECTION_OFF 40006
#define ID_DISKMENU_SENDTO_CIDERPRESS 40007 #define ID_DISKMENU_SENDTO_CIDERPRESS 40007
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 141 #define _APS_NEXT_RESOURCE_VALUE 143
#define _APS_NEXT_COMMAND_VALUE 40008 #define _APS_NEXT_COMMAND_VALUE 40008
#define _APS_NEXT_CONTROL_VALUE 1060 #define _APS_NEXT_CONTROL_VALUE 1060
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101

1
AppleWin/source/Applewin.cpp
View File

@ -750,6 +750,7 @@ int DoDiskInsert(int nDrive, LPSTR szFileName)
int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int) int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
{ {
InitCommonControls();
bool bSetFullScreen = false; bool bSetFullScreen = false;
bool bBoot = false; bool bBoot = false;
LPSTR szImageName_drive1 = NULL; LPSTR szImageName_drive1 = NULL;

2
AppleWin/source/Debug.cpp
View File

@ -6910,7 +6910,7 @@ int FindCommand( LPTSTR pName, CmdFuncPtr_t & pFunction_, int * iCommand_ )
char sCommand[ CONSOLE_WIDTH ]; char sCommand[ CONSOLE_WIDTH ];
strcpy( sCommand, pName ); strcpy( sCommand, pName );
strupr( sCommand ); _strupr( sCommand );
while ((iCommand < NUM_COMMANDS_WITH_ALIASES)) // && (name[0] >= g_aCommands[iCommand].aName[0])) Command no longer in Alphabetical order while ((iCommand < NUM_COMMANDS_WITH_ALIASES)) // && (name[0] >= g_aCommands[iCommand].aName[0])) Command no longer in Alphabetical order
{ {

2
AppleWin/source/Debugger_Range.cpp
View File

@ -47,7 +47,7 @@ bool Range_CalcEndLen( const RangeType_t eRange
// End = FFFE = Len-1 // End = FFFE = Len-1
// Len = FFFF // Len = FFFF
nAddressLen_ = nAddress2; nAddressLen_ = nAddress2;
int nTemp = nAddress1 + nAddressLen_ - 1; unsigned int nTemp = nAddress1 + nAddressLen_ - 1;
if (nTemp > _6502_MEM_END) if (nTemp > _6502_MEM_END)
nTemp = _6502_MEM_END; nTemp = _6502_MEM_END;
nAddressEnd_ = nTemp; nAddressEnd_ = nTemp;

2
AppleWin/source/Debugger_Symbols.cpp
View File

@ -624,7 +624,7 @@ Update_t CmdSymbolsLoad (int nArgs)
// SymbolOffset // SymbolOffset
// sym load "filename" [,symbol_offset] // sym load "filename" [,symbol_offset]
int nOffsetAddr = 0; unsigned int nOffsetAddr = 0;
iArg++; iArg++;
if( iArg <= nArgs) if( iArg <= nArgs)

2
AppleWin/source/SoundCore.cpp
View File

@ -62,7 +62,7 @@ static BOOL CALLBACK DSEnumProc(LPGUID lpGUID, LPCTSTR lpszDesc, LPCTSTR lpszDrv
return TRUE; return TRUE;
if(lpGUID != NULL) if(lpGUID != NULL)
memcpy(&sound_device_guid[i], lpGUID, sizeof (GUID)); memcpy(&sound_device_guid[i], lpGUID, sizeof (GUID));
sound_devices[i] = strdup(lpszDesc); sound_devices[i] = _strdup(lpszDesc);
if(g_fh) fprintf(g_fh, "%d: %s - %s\n",i,lpszDesc,lpszDrvName); if(g_fh) fprintf(g_fh, "%d: %s - %s\n",i,lpszDesc,lpszDrvName);