Get preferred and minimum sizes in the right order.

[u/mdw/putty] / mac / macctrls.c

diff --git a/mac/macctrls.c b/mac/macctrls.c
index 17b39a7..dec815a 100644 (file)
--- a/mac/macctrls.c
+++ b/mac/macctrls.c
@@ -1,4 +1,4 @@
-/* $Id: macctrls.c,v 1.13 2003/03/25 23:18:59 ben Exp $ */
+/* $Id: macctrls.c,v 1.15 2003/03/25 23:45:56 ben Exp $ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.
@@ -1055,13 +1055,13 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg)
     unsigned int i, n;
 
     fprintf(stderr, "      popup_clear\n");
-    n = CountMItems(menu);
+    n = CountMenuItems(menu);
     for (i = 0; i < n; i++)
        DeleteMenuItem(menu, n - i);
     mc->popup.nids = 0;
     sfree(mc->popup.ids);
     mc->popup.ids = NULL;
-    SetControlMaximum(mc->popup.tbctrl, CountMItems(menu));
+    SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu));
 }
 
 void dlg_listbox_clear(union control *ctrl, void *dlg)
@@ -1082,7 +1082,7 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index)
     if (mc->popup.ids != NULL)
        memcpy(mc->popup.ids + index, mc->popup.ids + index + 1,
               (mc->popup.nids - index - 1) * sizeof(*mc->popup.ids));
-    SetControlMaximum(mc->popup.tbctrl, CountMItems(menu));
+    SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu));
 }
 
 void dlg_listbox_del(union control *ctrl, void *dlg, int index)
@@ -1103,8 +1103,8 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text)
     assert(text[0] != '\0');
     c2pstrcpy(itemstring, text);
     AppendMenu(menu, "\pdummy");
-    SetMenuItemText(menu, CountMItems(menu), itemstring);
-    SetControlMaximum(mc->popup.tbctrl, CountMItems(menu));
+    SetMenuItemText(menu, CountMenuItems(menu), itemstring);
+    SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu));
 }
 
 void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
@@ -1114,8 +1114,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
        dlg_macpopup_add(ctrl, dlg, text);
 }
 
-static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg,
-                                     char const *text, int id)
+static void dlg_macpopup_addwithid(union control *ctrl, void *dlg,
+                                  char const *text, int id)
 {
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
@@ -1124,7 +1124,7 @@ static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg,
 
     fprintf(stderr, "      popup_addwthindex %s, %d\n", text, id);
     dlg_macpopup_add(ctrl, dlg, text);
-    index = CountMItems(menu) - 1;
+    index = CountMenuItems(menu) - 1;
     if (mc->popup.nids <= index) {
        mc->popup.nids = index + 1;
        mc->popup.ids = srealloc(mc->popup.ids,
@@ -1133,12 +1133,12 @@ static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg,
     mc->popup.ids[index] = id;
 }
 
-void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
-                             char const *text, int id)
+void dlg_listbox_addwithid(union control *ctrl, void *dlg,
+                          char const *text, int id)
 {
 
     if (ctrl->listbox.height == 0)
-       dlg_macpopup_addwithindex(ctrl, dlg, text, id);
+       dlg_macpopup_addwithid(ctrl, dlg, text, id);
 }
 
 int dlg_listbox_getid(union control *ctrl, void *dlg, int index)