Commit b6c755426a16f92cc01084598adef157565e4034
Merge branch 'master' of tpgithost:Echo/InterlockingTool
Showing
3 changed files
with
4 additions
and
4 deletions
| @@ -65,7 +65,7 @@ END | @@ -65,7 +65,7 @@ END | ||
| 65 | 65 | ||
| 66 | // Icon with lowest ID value placed first to ensure application icon | 66 | // Icon with lowest ID value placed first to ensure application icon |
| 67 | // remains consistent on all systems. | 67 | // remains consistent on all systems. |
| 68 | -IDR_MAINFRAME ICON DISCARDABLE "res\\SN Writer.ico" | 68 | +IDR_MAINFRAME ICON DISCARDABLE "res\\idr_main.ico" |
| 69 | 69 | ||
| 70 | ///////////////////////////////////////////////////////////////////////////// | 70 | ///////////////////////////////////////////////////////////////////////////// |
| 71 | // | 71 | // |
| @@ -273,7 +273,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | | @@ -273,7 +273,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | | ||
| 273 | WS_SYSMENU | 273 | WS_SYSMENU |
| 274 | EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW | 274 | EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW |
| 275 | CAPTION "c" | 275 | CAPTION "c" |
| 276 | -FONT 9, "΢ÈíÑźÚ" | 276 | +FONT 9, "΢ÈíÑźÚ", 0, 0, 0x1 |
| 277 | BEGIN | 277 | BEGIN |
| 278 | EDITTEXT IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL | 278 | EDITTEXT IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL |
| 279 | PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,246,10,44,15 | 279 | PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,246,10,44,15 |
| @@ -29,7 +29,7 @@ static char THIS_FILE[] = __FILE__; | @@ -29,7 +29,7 @@ static char THIS_FILE[] = __FILE__; | ||
| 29 | unsigned short g_iTotalComPort = MAX_COMPORT_COUNT; | 29 | unsigned short g_iTotalComPort = MAX_COMPORT_COUNT; |
| 30 | unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0}; | 30 | unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0}; |
| 31 | 31 | ||
| 32 | -const char *g_strToolVersion = "SN Writer V1.1728.00"; | 32 | +const char *g_strToolVersion = "check flag tool"; |
| 33 | 33 | ||
| 34 | extern CSNWriterDlg *g_pMainDlg; | 34 | extern CSNWriterDlg *g_pMainDlg; |
| 35 | 35 |
| @@ -242,7 +242,7 @@ | @@ -242,7 +242,7 @@ | ||
| 242 | // | 242 | // |
| 243 | #ifdef APSTUDIO_INVOKED | 243 | #ifdef APSTUDIO_INVOKED |
| 244 | #ifndef APSTUDIO_READONLY_SYMBOLS | 244 | #ifndef APSTUDIO_READONLY_SYMBOLS |
| 245 | -#define _APS_NEXT_RESOURCE_VALUE 158 | 245 | +#define _APS_NEXT_RESOURCE_VALUE 159 |
| 246 | #define _APS_NEXT_COMMAND_VALUE 32798 | 246 | #define _APS_NEXT_COMMAND_VALUE 32798 |
| 247 | #define _APS_NEXT_CONTROL_VALUE 1177 | 247 | #define _APS_NEXT_CONTROL_VALUE 1177 |
| 248 | #define _APS_NEXT_SYMED_VALUE 101 | 248 | #define _APS_NEXT_SYMED_VALUE 101 |
Please
register
or
login
to post a comment