Changeset 574 for trunk/dll/command.c

Timestamp:

Mar 23, 2007, 11:37:07 PM (18 years ago)

Author:

Gregg Young

Message:

Use QWL_USER; Replace doesn't move the command and Okay on cmd dialog removed error on unchanged command

File:

• trunk/dll/command.c (modified) (8 diffs)

trunk/dll/command.c

@@ -16 +16 @@
   18 Sep 06 GKY Add replace command and update okay to add if changed
   17 Feb 07 GKY Move error messages etc to string file
+  22 Mar 07 GKY Use QWL_USER
+  23 Mar 07 GKY Replace doesn't change item position
+  23 Mar 07 GKY Okay fails silently when item not changed
 
 ***********************************************************************/
@@ -51 +54 @@
 MRESULT EXPENTRY CommandTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, 0);
+  PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, QWL_USER);
   static BOOL emphasized = FALSE;
 
@@ -467 +470 @@
 MRESULT EXPENTRY CommandDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  SHORT x;
+  SHORT x, y;
   LINKCMDS *info;
 
@@ -500 +503 @@
                                   (PFNWP) CommandTextProc);
       if (oldproc)
-        WinSetWindowPtr(WinWindowFromID(hwnd, CMD_CL), 0, (PVOID) oldproc);
+        WinSetWindowPtr(WinWindowFromID(hwnd, CMD_CL), QWL_USER, (PVOID) oldproc);
     }
     break;
@@ -641 +644 @@
         {
           WinDismissDlg(hwnd, 0);
-          saymsg(MB_ENTER, hwnd,
+          /*saymsg(MB_ENTER, hwnd,
            GetPString(IDS_ERRORTEXT),
                  GetPString(IDS_CANTADDCOMMANDTEXT),
-                 temp.title);
+                 temp.title);*/
          }
         else {
@@ -778 +781 @@
       {
         CHAR temp[34];
-
+        y = (SHORT) WinSendDlgItemMsg(hwnd,
+                                        CMD_LISTBOX,
+                                        LM_QUERYSELECTION,
+                                        MPFROMSHORT(LIT_CURSOR), MPVOID);
         WinQueryDlgItemText(hwnd, CMD_TITLE, 34, temp);
         bstrip(temp);
@@ -840 +846 @@
                                         CMD_LISTBOX,
                                         LM_INSERTITEM,
-                                        MPFROM2SHORT(LIT_END, 0),
+                                        MPFROM2SHORT(y, 0),
                                         MPFROMP(temp.title));
           if (x >= 0) {
@@ -850 +856 @@
                               CMD_LISTBOX,
                               LM_SELECTITEM,
-                              MPFROMSHORT(x), MPFROMSHORT(TRUE));
+                              MPFROMSHORT(x), MPFROMSHORT(TRUE));
+            {
+            LINKCMDS *temphead = NULL, *info, *last = NULL, *temptail = NULL;
+        SHORT sSelect, numitems;
+
+        sSelect = 0;
+        numitems = (SHORT) WinSendDlgItemMsg(hwnd, CMD_LISTBOX,
+                                             LM_QUERYITEMCOUNT,
+                                             MPVOID, MPVOID);
+        while (numitems) {
+          info = (LINKCMDS *) WinSendDlgItemMsg(hwnd, CMD_LISTBOX,
+                                                LM_QUERYITEMHANDLE,
+                                                MPFROMSHORT(sSelect++),
+                                                MPVOID);
+          if (info) {
+            if (!temphead) {
+              temphead = info;
+              info->prev = NULL;
+            }
+            else {
+              last->next = info;
+              info->prev = last;
+            }
+            temptail = info;
+            last = info;
+            info->next = NULL;
+          }
+          numitems--;
+        }
+            }
             save_commands();
           }