7.1.317

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.1.317
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.1.317
  11 Problem:    Compiler warnings in Motif calls.
  12 Solution:   Change zero to NULL. (Dominique Pelle)
  13 Files:      src/gui_motif.c
  14
  15
  16 *** ../vim-7.1.316/src/gui_motif.c      Tue Jan 22 11:06:06 2008
  17 --- src/gui_motif.c     Sat Jun  7 15:06:33 2008
  18 ***************
  19 *** 686,693 ****
  20
  21       /* Temporarily set value of XmNmappedWhenManaged
  22          to stop the dialog from popping up right away */
  23 !     XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, 0);
  24 !     XtVaSetValues(shell, XmNmappedWhenManaged, False, 0);
  25
  26       XtManageChild(dialog_child);
  27
  28 --- 686,693 ----
  29
  30       /* Temporarily set value of XmNmappedWhenManaged
  31          to stop the dialog from popping up right away */
  32 !     XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, NULL);
  33 !     XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
  34
  35       XtManageChild(dialog_child);
  36
  37 ***************
  38 *** 723,729 ****
  39       XtMapWidget(shell);
  40
  41       /* Restore the value of XmNmappedWhenManaged */
  42 !     XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, 0);
  43   }
  44
  45   #if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \
  46 --- 723,729 ----
  47       XtMapWidget(shell);
  48
  49       /* Restore the value of XmNmappedWhenManaged */
  50 !     XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, NULL);
  51   }
  52
  53   #if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \
  54 ***************
  55 *** 1993,1999 ****
  56       {
  57         if (XtClass(w) == xmRowColumnWidgetClass)
  58         {
  59 !           XtVaGetValues(w, XmNrowColumnType, &rowColType, 0);
  60             isMenu = (rowColType != (unsigned char)XmWORK_AREA);
  61         }
  62         else
  63 --- 1993,1999 ----
  64       {
  65         if (XtClass(w) == xmRowColumnWidgetClass)
  66         {
  67 !           XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL);
  68             isMenu = (rowColType != (unsigned char)XmWORK_AREA);
  69         }
  70         else
  71 ***************
  72 *** 2001,2014 ****
  73         if (!isMenu)
  74         {
  75             XtVaGetValues(w, XmNchildren, &children, XmNnumChildren,
  76 !                         &numChildren, 0);
  77             for (i = 0; i < numChildren; i++)
  78                 do_mnemonic(children[i], keycode);
  79         }
  80       }
  81       else
  82       {
  83 !       XtVaGetValues(w, XmNmnemonic, &mnemonic, 0);
  84         if (mnemonic != '\0')
  85         {
  86             mneString[0] = mnemonic;
  87 --- 2001,2014 ----
  88         if (!isMenu)
  89         {
  90             XtVaGetValues(w, XmNchildren, &children, XmNnumChildren,
  91 !                         &numChildren, NULL);
  92             for (i = 0; i < numChildren; i++)
  93                 do_mnemonic(children[i], keycode);
  94         }
  95       }
  96       else
  97       {
  98 !       XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL);
  99         if (mnemonic != '\0')
 100         {
 101             mneString[0] = mnemonic;
 102 ***************
 103 *** 2019,2025 ****
 104                 if (XtClass(w) == xmLabelWidgetClass
 105                         || XtClass(w) == xmLabelGadgetClass)
 106                 {
 107 !                   XtVaGetValues(w, XmNuserData, &userData, 0);
 108                     if (userData != NULL && XtIsWidget(userData))
 109                         XmProcessTraversal(userData, XmTRAVERSE_CURRENT);
 110                 }
 111 --- 2019,2025 ----
 112                 if (XtClass(w) == xmLabelWidgetClass
 113                         || XtClass(w) == xmLabelGadgetClass)
 114                 {
 115 !                   XtVaGetValues(w, XmNuserData, &userData, NULL);
 116                     if (userData != NULL && XtIsWidget(userData))
 117                         XmProcessTraversal(userData, XmTRAVERSE_CURRENT);
 118                 }
 119 ***************
 120 *** 2073,2079 ****
 121       {
 122         if (XtClass(w) == xmRowColumnWidgetClass)
 123         {
 124 !           XtVaGetValues(w, XmNrowColumnType, &rowColType, 0);
 125             isMenu = (rowColType != (unsigned char)XmWORK_AREA);
 126         }
 127         else
 128 --- 2073,2079 ----
 129       {
 130         if (XtClass(w) == xmRowColumnWidgetClass)
 131         {
 132 !           XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL);
 133             isMenu = (rowColType != (unsigned char)XmWORK_AREA);
 134         }
 135         else
 136 ***************
 137 *** 2081,2094 ****
 138         if (!isMenu)
 139         {
 140             XtVaGetValues(w, XmNchildren, &children, XmNnumChildren,
 141 !                                                            &numChildren, 0);
 142             for (i = 0; i < numChildren; i++)
 143                 add_mnemonic_grabs(dialog, children[i]);
 144         }
 145       }
 146       else
 147       {
 148 !       XtVaGetValues(w, XmNmnemonic, &mnemonic, 0);
 149         if (mnemonic != '\0')
 150         {
 151             mneString[0] = mnemonic;
 152 --- 2081,2094 ----
 153         if (!isMenu)
 154         {
 155             XtVaGetValues(w, XmNchildren, &children, XmNnumChildren,
 156 !                                                         &numChildren, NULL);
 157             for (i = 0; i < numChildren; i++)
 158                 add_mnemonic_grabs(dialog, children[i]);
 159         }
 160       }
 161       else
 162       {
 163 !       XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL);
 164         if (mnemonic != '\0')
 165         {
 166             mneString[0] = mnemonic;
 167 *** ../vim-7.1.316/src/version.c        Fri Jun 20 11:10:53 2008
 168 --- src/version.c       Fri Jun 20 11:38:25 2008
 169 ***************
 170 *** 668,669 ****
 171 --- 673,676 ----
 172   {   /* Add new patch number below this line */
 173 + /**/
 174 +     317,
 175   /**/
 176
 177 --
 178 hundred-and-one symptoms of being an internet addict:
 179 43. You tell the kids they can't use the computer because "Daddy's got work to
 180     do" and you don't even have a job.
 181
 182  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 183 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 184 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 185  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///