Changeset 953 for trunk/dll/treecnr.c

Timestamp:

Feb 16, 2008, 3:15:16 AM (17 years ago)

Author:

Steven Levine

Message:

Rework code and resources to support settings menu conditional cascade
Optimize last settings menu save/restore

File:

• trunk/dll/treecnr.c (modified) (7 diffs)

trunk/dll/treecnr.c

@@ -44 +44 @@
   22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
   10 Jan 08 SHL Sync with CfgDlgProc mods
+  15 Feb 08 SHL Sync with settings menu rework
 
 ***********************************************************************/
@@ -63 +64 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // CfgDlgProc
 #include "fm3dll.h"
 
@@ -2373 +2375 @@
         break;
 
-      case IDM_NOTEBOOK:
+      case IDM_TREECNRVIEWSETTINGS:
         if (!ParentIsDesktop(dcd->hwndParent, dcd->hwndParent))
-          PostMsg(dcd->hwndParent, msg, MPFROMLONG(IDM_TREECNRSETTINGS), mp2);
+          PostMsg(dcd->hwndParent, msg, MPFROMLONG(IDM_TREECNRVIEWSETTINGS), mp2);
         else {
           WinDlgBox(HWND_DESKTOP,
@@ -2382 +2384 @@
                     FM3ModHandle,
                     CFG_FRAME,
-                    MPFROMLONG(IDM_TREECNRSETTINGS));
+                    MPFROMLONG(IDM_TREECNRVIEWSETTINGS));
         }
         break;
@@ -2953 +2955 @@
                                  NULL,
                                  WS_VISIBLE | fwsAnimate,
-                                 FM3ModHandle, TREE_FRAME, &hwndClient);
+                                 FM3ModHandle, TREE_FRAME, &hwndClient);
   if (hwndParent != HWND_DESKTOP) {
     hwndSysMenu = WinWindowFromID(hwndFrame, FID_SYSMENU);
     if (hwndSysMenu != NULLHANDLE)
       WinSendMsg(hwndSysMenu, MM_SETITEMATTR,
-                 MPFROM2SHORT(SC_CLOSE, TRUE),
-                 MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED));
+                 MPFROM2SHORT(SC_CLOSE, TRUE),
+                 MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED));
     if (!fFreeTree)
       WinSendMsg(hwndSysMenu, MM_SETITEMATTR,
-                 MPFROM2SHORT(SC_MOVE, TRUE),
-                 MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED));
+                 MPFROM2SHORT(SC_MOVE, TRUE),
+                 MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED));
   }
   if (hwndFrame && hwndClient) {
@@ -2979 +2981 @@
         if (!WinCreateWindow(hwndFrame,
                              WC_TREEOPENBUTTON,
-                             "Op",
+                             "Op",
                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS,
                              ((swp.cx -
@@ -3068 +3070 @@
         if (dcd->oldproc == 0)
           Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    "WinSubclassWindow");
+                    "WinSubclassWindow");
         if (!PostMsg(dcd->hwndCnr, UM_SETUP, MPVOID, MPVOID))
           WinSendMsg(dcd->hwndCnr, UM_SETUP, MPVOID, MPVOID);