To: vim-dev@vim.org

To: [email protected]
Subject: Patch 6.1b.030 (extra)
Fcc: outbox
From: Bram Moolenaar <[email protected]>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1b.030 (extra)
Problem: Mac: small mistake in the build script and prototypes.
Solution: Fix the build script and add the prototypes. (Axel Kielhorn)
Files: src/os_mac.build, src/gui_mac.c

*** ../vim61b.029/src/os_mac.build Fri Feb 22 12:56:35 2002
--- src/os_mac.build Fri Mar 15 22:06:09 2002
***************
*** 26,32 ****
set ppcLOpts "{SharedLibraries}AppearanceLib"
set ppcLibs "{SharedLibraries}ContextualMenu"
#
! set carbonSources "syntax.c"
set carbonOpts "-carbon"
set carbonCOpts "-d TARGET_API_MAC_CARBON"
set carbonLOpts ""
--- 26,32 ----
set ppcLOpts "{SharedLibraries}AppearanceLib"
set ppcLibs "{SharedLibraries}ContextualMenu"
#
! set carbonSources ""
set carbonOpts "-carbon"
set carbonCOpts "-d TARGET_API_MAC_CARBON"
set carbonLOpts ""
*** ../vim61b.029/src/gui_mac.c Sat Mar 9 19:48:52 2002
--- src/gui_mac.c Thu Mar 21 20:39:48 2002
***************
*** 416,422 ****
* Convert the modifiers of an Event into vim's modifiers (keys)
*/

! int_u
EventModifiers2VimModifiers(EventModifiers macModifiers)
{
int_u vimModifiers = 0x00;
--- 416,422 ----
* Convert the modifiers of an Event into vim's modifiers (keys)
*/

! static int_u
EventModifiers2VimModifiers(EventModifiers macModifiers)
{
int_u vimModifiers = 0x00;
***************
*** 4507,4513 ****

#define MoveRectTo(r,x,y) OffsetRect(r,x-r->left,y-r->top)

! void
macMoveDialogItem(
DialogRef theDialog,
short itemNumber,
--- 4507,4513 ----

#define MoveRectTo(r,x,y) OffsetRect(r,x-r->left,y-r->top)

! static void
macMoveDialogItem(
DialogRef theDialog,
short itemNumber,
***************
*** 4540,4546 ****
#endif
}

! void
macSizeDialogItem(
DialogRef theDialog,
short itemNumber,
--- 4540,4546 ----
#endif
}

! static void
macSizeDialogItem(
DialogRef theDialog,
short itemNumber,
***************
*** 4576,4582 ****
#endif
}

! void
macSetDialogItemText(
DialogRef theDialog,
short itemNumber,
--- 4576,4582 ----
#endif
}

! static void
macSetDialogItemText(
DialogRef theDialog,
short itemNumber,
*** ../vim61b.029/src/version.c Tue Mar 19 22:46:59 2002
--- src/version.c Thu Mar 21 20:36:42 2002
***************
*** 608,609 ****
--- 608,611 ----
{ /* Add new patch number below this line */
+ /**/
+ 30,
/**/

--
Wi n0t trei a h0liday in Sweden thi yer?
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- [email protected] -- http://www.moolenaar.net \\\
/// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\
\\\ Project leader for A-A-P -- http://www.a-a-p.org ///
\\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///