Changeset 1722 for trunk/dll/errutil.c

Timestamp:

Feb 16, 2014, 9:17:15 PM (11 years ago)

Author:

Gregg Young

Message:

The rest of the files for CS 1721

File:

• trunk/dll/errutil.c (modified) (5 diffs)

trunk/dll/errutil.c

@@ -40 +40 @@
   07 Nov 13 SHL Update comments
   15 Feb 14 GKY Improvements to saymsg2 some code cleanup
+  16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way
+                and so it works with move to trashcan inabled.
 
 ***********************************************************************/
@@ -60 +62 @@
 #include "init.h"                       // Data declares
 #include "wrappers.h"                   // xmallocz
+#include "fm3dll2.h"
 
 #pragma data_seg(DATA1)
@@ -398 +401 @@
   strcpy(mb2dBut[2].achText,GetPString(IDS_MB2DNO));
   strcpy(mb2dBut[3].achText,GetPString(IDS_MB2DCANCELOP));
-  mb2dBut[0].idButton = 1;
-  mb2dBut[1].idButton = 2;
-  mb2dBut[2].idButton = 3;
-  mb2dBut[3].idButton = 4;
+  mb2dBut[0].idButton = SM2_YES;
+  mb2dBut[1].idButton = SM2_DONTASK;
+  mb2dBut[2].idButton = SM2_NO;
+  mb2dBut[3].idButton = SM2_CANCEL;
   if (DefaultButton)
     mb2dBut[DefaultButton - 1].flStyle = BS_DEFAULT;
@@ -409 +412 @@
     pmbInfo->hIcon      = 0;
     pmbInfo->cButtons   = 4;
-    pmbInfo->flStyle    = MB_MOVEABLE | MB_SYSTEMMODAL | MB_ICONQUESTION ;
+    pmbInfo->flStyle    = MB_MOVEABLE | MB_ICONQUESTION ;
     pmbInfo->hwndNotify = NULLHANDLE;
     for (i = 0; i < 4; i++) {
@@ -415 +418 @@
     }
     rc = WinMessageBox2(HWND_DESKTOP, hwnd,
-                        szMsg, pszTitle, 1234,
+                        szMsg, pszTitle, SM2_DIALOG,
                         pmbInfo);
+    WinSetFocus(HWND_DESKTOP, SM2_DIALOG);
     free(pmbInfo);
     return rc;