Changeset 1687

Timestamp:

Apr 22, 2013, 12:31:36 AM (12 years ago)

Author:

Gregg Young

Message:

Fix error message on attempt to open a directory from the object information dialog. Some HELPTABLE updates.

Location:

trunk/dll

Files:

• fm3res.rc (modified) (3 diffs)
• info.c (modified) (2 diffs)

trunk/dll/fm3res.rc

@@ -3427 +3427 @@
 {
    HELPITEM MAIN_FRAME,      ID_HELPSUBTABLE,  HELP_MAIN
-   HELPITEM ASS_FRAME,       ID_HELPSUBTABLEA, HELP_ASSOC
+   HELPITEM ASS_FRAME,       ID_HELPSUBTABLEB, HELP_ASSOC
    HELPITEM EXEC_FRAME,      ID_HELPSUBTABLEB, HELP_CMDLINE
-   HELPITEM ASEL_FRAME,      ID_HELPSUBTABLEA, HELP_ARCHIVERS
+   HELPITEM ASEL_FRAME,      ID_HELPSUBTABLEB, HELP_ARCHIVERS
    HELPITEM ASEL_EDIT_FRAME, ID_HELPSUBTABLEA, HELP_EDITARC
+   HELPITEM FLE_FRAME,       ID_HELPSUBTABLEA, HELP_INFO 
+   HELPITEM CMD_FRAME,       ID_HELPSUBTABLEA, HELP_COMMAND 
+   HELPITEM EA_FRAME,        ID_HELPSUBTABLEB, HELP_EAS
 }
 
@@ -3436 +3439 @@
 {
    HELPSUBITEM COMMAND_LINE, HELP_HINTSCMD
+   HELPSUBITEM MAIN_SETUPLIST, HELP_USERLISTS
+   HELPSUBITEM MAIN_USERLIST , HELP_USERLISTS
+   HELPSUBITEM MAIN_DRIVELIST, HELP_USERLISTS
+   HELPSUBITEM MAIN_CMDLIST, HELP_USERLISTS
+   HELPSUBITEM MAIN_BUTTONLIST, HELP_USERLISTS
    
 }
@@ -3441 +3449 @@
 HELPSUBTABLE ID_HELPSUBTABLEA
 {
+   HELPSUBITEM FLE_NAME, HELP_INFO
 }
 
 HELPSUBTABLE ID_HELPSUBTABLEB
 {
+   HELPSUBITEM EA_MLE, HELP_EAS
+   HELPSUBITEM EA_LISTBOX, HELP_EAS
+   HELPSUBITEM EA_ENTRY, HELP_EAS
 }
 

trunk/dll/info.c

@@ -35 +35 @@
   22 Jul 09 GKY Check if drives support EAs add driveflag for this
   22 Jul 09 GKY Add LocalHD driveflag
-  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  17 Jan 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  20 Apr 13 GKY Double click on directory in Info listbox opens directory object instead of
+                causing an error message from DefaultView
 
 ***********************************************************************/
@@ -623 +625 @@
               if (SHORT2FROMMP(mp1) == LN_SELECT)
                 WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-              else
-                DefaultView(hwnd,
-                            (HWND) 0, (HWND) 0, NULL, 32, pfs->szFileName);
+              else if (IsFile(pfs->szFileName))
+                DefaultView(hwnd,(HWND) 0, (HWND) 0, NULL, 32, pfs->szFileName);
+              else
+                DefaultView(hwnd,(HWND) 0, (HWND) 0, NULL, 2, pfs->szFileName);
             }
           }