[Frhed-commits] SF.net SVN: frhed:[205] trunk/FRHED
Brought to you by:
kimmov
From: <ki...@us...> - 2008-12-13 12:45:41
|
Revision: 205 http://frhed.svn.sourceforge.net/frhed/?rev=205&view=rev Author: kimmov Date: 2008-12-13 12:45:37 +0000 (Sat, 13 Dec 2008) Log Message: ----------- Fix resource IDs in the Bit manipulation-dialog. Modified Paths: -------------- trunk/FRHED/BitManipDlg.cpp trunk/FRHED/heksedit.rc trunk/FRHED/resource.h Modified: trunk/FRHED/BitManipDlg.cpp =================================================================== --- trunk/FRHED/BitManipDlg.cpp 2008-12-10 16:53:30 UTC (rev 204) +++ trunk/FRHED/BitManipDlg.cpp 2008-12-13 12:45:37 UTC (rev 205) @@ -35,21 +35,21 @@ SetDlgItemText(hDlg, IDC_MANIPBITS, buf); BYTE cBitValue = DataArray[iCurByte]; if (cBitValue & 1) - CheckDlgButton(hDlg, IDC_CHECK1, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT1, BST_CHECKED); if (cBitValue & 2) - CheckDlgButton(hDlg, IDC_CHECK2, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT2, BST_CHECKED); if (cBitValue & 4) - CheckDlgButton(hDlg, IDC_CHECK3, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT3, BST_CHECKED); if (cBitValue & 8) - CheckDlgButton(hDlg, IDC_CHECK4, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT4, BST_CHECKED); if (cBitValue & 16) - CheckDlgButton(hDlg, IDC_CHECK5, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT5, BST_CHECKED); if (cBitValue & 32) - CheckDlgButton(hDlg, IDC_CHECK6, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT6, BST_CHECKED); if (cBitValue & 64) - CheckDlgButton(hDlg, IDC_CHECK7, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT7, BST_CHECKED); if (cBitValue & 128) - CheckDlgButton(hDlg, IDC_CHECK8, BST_CHECKED); + CheckDlgButton(hDlg, IDC_MANIPBITS_BIT8, BST_CHECKED); Apply(hDlg, 0); return TRUE; } @@ -57,21 +57,21 @@ BOOL BitManipDlg::Apply(HWND hDlg, WPARAM wParam) { BYTE cBitValue = 0; - if (IsDlgButtonChecked(hDlg, IDC_CHECK8)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT8)) cBitValue |= 128; - if (IsDlgButtonChecked(hDlg, IDC_CHECK7)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT7)) cBitValue |= 64; - if (IsDlgButtonChecked(hDlg, IDC_CHECK6)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT6)) cBitValue |= 32; - if (IsDlgButtonChecked(hDlg, IDC_CHECK5)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT5)) cBitValue |= 16; - if (IsDlgButtonChecked(hDlg, IDC_CHECK4)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT4)) cBitValue |= 8; - if (IsDlgButtonChecked(hDlg, IDC_CHECK3)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT3)) cBitValue |= 4; - if (IsDlgButtonChecked(hDlg, IDC_CHECK2)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT2)) cBitValue |= 2; - if (IsDlgButtonChecked(hDlg, IDC_CHECK1)) + if (IsDlgButtonChecked(hDlg, IDC_MANIPBITS_BIT1)) cBitValue |= 1; if (wParam == IDOK) { @@ -84,7 +84,7 @@ char buf[64]; sprintf(buf, "Value: 0x%x , %d signed, %u unsigned.", (unsigned char)cBitValue, (signed char)cBitValue, (unsigned char)cBitValue); - SetDlgItemText(hDlg, IDC_STATIC2, buf); + SetDlgItemText(hDlg, IDC_MANIPBITS_VALUE, buf); return FALSE; } @@ -98,8 +98,9 @@ switch (wParam) { case IDOK: - case IDC_CHECK1: case IDC_CHECK2: case IDC_CHECK3: case IDC_CHECK4: - case IDC_CHECK5: case IDC_CHECK6: case IDC_CHECK7: case IDC_CHECK8: + case IDC_MANIPBITS_BIT1: case IDC_MANIPBITS_BIT2: case IDC_MANIPBITS_BIT3: + case IDC_MANIPBITS_BIT4: case IDC_MANIPBITS_BIT5: case IDC_MANIPBITS_BIT6: + case IDC_MANIPBITS_BIT7: case IDC_CHECK8: if (Apply(hDlg, wParam)) { case IDCANCEL: Modified: trunk/FRHED/heksedit.rc =================================================================== --- trunk/FRHED/heksedit.rc 2008-12-10 16:53:30 UTC (rev 204) +++ trunk/FRHED/heksedit.rc 2008-12-13 12:45:37 UTC (rev 205) @@ -570,22 +570,22 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "statictext",IDC_MANIPBITS,7,7,243,8 - CONTROL "Bit 7",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 6",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 38,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 5",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 69,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 4",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 100,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 3",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 130,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 2",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 160,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 1",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 190,18,30,10,WS_EX_STATICEDGE - CONTROL "Bit 0",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 220,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 7",IDC_MANIPBITS_BIT8,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 6",IDC_MANIPBITS_BIT7,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,38,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 5",IDC_MANIPBITS_BIT6,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,69,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 4",IDC_MANIPBITS_BIT5,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,100,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 3",IDC_MANIPBITS_BIT4,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,130,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 2",IDC_MANIPBITS_BIT3,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,160,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 1",IDC_MANIPBITS_BIT2,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,190,18,30,10,WS_EX_STATICEDGE + CONTROL "Bit 0",IDC_MANIPBITS_BIT1,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,220,18,30,10,WS_EX_STATICEDGE LTEXT "(128)",IDC_STATIC,15,29,17,8 LTEXT "(64)",IDC_STATIC,48,29,13,8 LTEXT "(32)",IDC_STATIC,77,29,13,8 @@ -594,7 +594,7 @@ LTEXT "(4)",IDC_STATIC,171,29,9,8 LTEXT "(2)",IDC_STATIC,202,29,9,8 LTEXT "(1)",IDC_STATIC,231,29,9,8 - LTEXT "Static",IDC_STATIC2,7,43,243,8 + LTEXT "Static",IDC_MANIPBITS_VALUE,7,43,243,8 DEFPUSHBUTTON "OK",IDOK,75,63,50,14 PUSHBUTTON "Cancel",IDCANCEL,132,63,50,14 END Modified: trunk/FRHED/resource.h =================================================================== --- trunk/FRHED/resource.h 2008-12-10 16:53:30 UTC (rev 204) +++ trunk/FRHED/resource.h 2008-12-13 12:45:37 UTC (rev 205) @@ -292,6 +292,15 @@ #define IDC_BINMODE_BIGEND 376 #define IDC_BLOCKSEL_OFFSET 377 #define IDC_BLOCKSEL_OFFSETEND 378 +#define IDC_MANIPBITS_BIT1 379 +#define IDC_MANIPBITS_BIT2 380 +#define IDC_MANIPBITS_BIT3 381 +#define IDC_MANIPBITS_BIT4 382 +#define IDC_MANIPBITS_BIT5 383 +#define IDC_MANIPBITS_BIT6 384 +#define IDC_MANIPBITS_BIT7 385 +#define IDC_MANIPBITS_BIT8 386 +#define IDC_MANIPBITS_VALUE 387 #define IDC_ENABLE_DRAG 1074 #define IDC_ALWAYS_CHOOSE 1075 #define IDC_DROP_BIN_DATA 1076 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |