Make wxr resources work in Unicode mode.

[wxWidgets.git] / src / mac / carbon / uma.cpp

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 2e50863903ee53493cbfc528b211b988b561691c..5485a9eb19ab75b1367647e8b24967d33ad97046 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -4,7 +4,15 @@
 #include <MacTextEditor.h>
 
 #ifndef __DARWIN__
 #include <MacTextEditor.h>
 
 #ifndef __DARWIN__

-  #include <Navigation.h>
+#  include <Navigation.h>
+#  if defined(TARGET_CARBON)
+#    if PM_USE_SESSION_APIS
+#      include <PMCore.h>
+#    endif
+#    include <PMApplication.h>
+#  else
+#    include <Printing.h>
+#  endif

 #endif
 
 // since we have decided that we only support 8.6 upwards we are
 #endif
 
 // since we have decided that we only support 8.6 upwards we are


@@ -13,17 +21,16 @@
 // windows manager, control manager, navigation services etc. are 
 // present
 
 // windows manager, control manager, navigation services etc. are 
 // present
 

-#define wxUSE_MLTE 0
-
-

 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;

+static long sUMASystemVersion = 0 ;

 static bool sUMAHasAquaLayout = false ;
 static bool sUMASystemInitialized = false ;
 
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
 static bool sUMAHasAquaLayout = false ;
 static bool sUMASystemInitialized = false ;
 
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }

+long UMAGetSystemVersion() { return sUMASystemVersion ; }

 
 static bool    sUMAHasWindowManager = false ;
 static long sUMAWindowManagerAttr = 0 ;
 
 static bool    sUMAHasWindowManager = false ;
 static long sUMAWindowManagerAttr = 0 ;


@@ -43,9 +50,8 @@ void UMACleanupToolbox()
        {
                NavUnload() ;
        }
        {
                NavUnload() ;
        }

-#if wxUSE_MLTE
-       TXNTerminateTextension( ) ;
-#endif
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+         TXNTerminateTextension( ) ;

 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {


@@ -67,6 +73,9 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
        InitCursor();
 #endif
 
        InitCursor();
 #endif
 

+    if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
+       sUMASystemVersion = 0x0000 ;
+       

        long theAppearance ;
        if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
        {
        long theAppearance ;
        if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
        {


@@ -86,7 +95,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                

-#ifndef __DARWIN__

 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else


@@ -94,7 +102,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                InitFloatingWindows() ;
        else
                InitWindows();
                InitFloatingWindows() ;
        else
                InitWindows();

-#endif

 #endif
 
        if ( NavServicesAvailable() )
 #endif
 
        if ( NavServicesAvailable() )


@@ -102,21 +109,52 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
                NavLoad() ;
        }
 

-#if wxUSE_MLTE
-  TXNMacOSPreferredFontDescription defaults;
-  defaults.fontID = kFontIDGeneva ;
-  defaults.pointSize = (10 << 16) ;
-  defaults.fontStyle = kTXNDefaultFontStyle;
-  defaults.encoding = kTXNSystemDefaultEncoding;
-       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-#endif

   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;

+
+  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+  { 
+    FontFamilyID fontId ;
+       Str255 fontName ;
+       SInt16 fontSize ;
+       Style fontStyle ;
+       GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    GetFNum( fontName, &fontId );
+
+    TXNMacOSPreferredFontDescription fontDescriptions[] =
+    {
+        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
+    } ;
+    int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
+#if 0 // TARGET_CARBON  
+    --noOfFontDescriptions ;
+#endif
+       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
+       OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if TARGET_CARBON
+    if ( !UMAHasAquaLayout() )
+#endif
+    {
+        options |= kTXNAlwaysUseQuickDrawTextMask ;
+    }
+       TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+  }
+
+

   sUMASystemInitialized = true ;
   sUMASystemInitialized = true ;

+

 }
 
 }
 

+/*
+Boolean CanUseATSUI()
+       {
+       long result;
+       OSErr err = Gestalt(gestaltATSUVersion, &result);
+       return (err == noErr);
+       }
+*/

 // process manager
 long UMAGetProcessMode() 
 {
 // process manager
 long UMAGetProcessMode() 
 {


@@ -142,124 +180,262 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch()
 
 // menu manager
 
 
 // menu manager
 

-void UMASetMenuTitle( MenuRef menu , StringPtr title )
+MenuRef UMANewMenu( SInt16 id , const wxString& title )

 {
 {

-/*
-#if !TARGET_CARBON
-       long                    size = GetHandleSize( (Handle) menu ) ;
-       const long              headersize = 14 ;
-       int                             oldlen = (**menu).menuData[0] + 1;
-       int                             newlen = title[0] + 1 ;
-       
-       if ( oldlen < newlen )
-       {
-               // enlarge before adjusting
-               SetHandleSize( (Handle) menu , size + (newlen - oldlen ) );
-       }
+       wxString str = wxStripMenuCodes( title ) ;
+       MenuRef menu ;
+#if TARGET_CARBON
+       CFStringRef cfs = wxMacCreateCFString( str ) ;
+       CreateNewMenu( id , 0 , &menu ) ;
+       SetMenuTitleWithCFString( menu , cfs ) ;
+       CFRelease( cfs ) ;
+#else
+       Str255 ptitle ;
+       wxMacStringToPascal( str , ptitle ) ;
+       menu = ::NewMenu( id , ptitle ) ;
+#endif
+       return menu ;
+}

 
 

-       if ( oldlen != newlen )
-               memmove( (char*) (**menu).menuData + newlen , (char*) (**menu).menuData + oldlen , size - headersize - oldlen ) ;
+void UMASetMenuTitle( MenuRef menu , const wxString& title )
+{
+       wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+       CFStringRef cfs = wxMacCreateCFString( str ) ;
+       SetMenuTitleWithCFString( menu , cfs ) ;
+       CFRelease( cfs ) ;
+#else
+       Str255 ptitle ;
+       wxMacStringToPascal( str , ptitle ) ;
+       SetMenuTitle( menu , ptitle ) ;
+#endif
+}

 
 

-       memcpy( (char*) (**menu).menuData , title ,  newlen ) ;
-       if ( oldlen > newlen )
-       {
-               // shrink after
-               SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
-       }
+void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title ) 
+{
+       wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+       CFStringRef cfs = wxMacCreateCFString( str ) ;
+       SetMenuItemTextWithCFString( menu , item , cfs ) ;
+       CFRelease( cfs ) ;

 #else
 #else

-*/
-       SetMenuTitle( menu , title ) ;
-//#endif
+       Str255 ptitle ;
+       wxMacStringToPascal( str , ptitle ) ;
+       SetMenuItemText( menu , item , ptitle ) ;
+#endif

 }
 
 }
 

+

 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {
                return MenuEvent( inEvent ) ;
 }
 
 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {
                return MenuEvent( inEvent ) ;
 }
 

-void                   UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) 

 {
 {

-       EnableMenuItem( inMenu , inItem ) ;
+       if ( enable )
+               EnableMenuItem( inMenu , inItem ) ;
+       else
+               DisableMenuItem( inMenu , inItem ) ;

 }
 
 }
 

-void                   UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id ) 

 {
 {

-       DisableMenuItem( inMenu , inItem ) ;
+       MacAppendMenu(menu, "\pA");
+       UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+       SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;

 }
 
 }
 

-void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id ) 
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id  ) 

 {
 {

-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       // hardcoded adding of the submenu combination for mac
-
-       int theEnd = label[0] + 1; 
-       if (theEnd > 251) 
-               theEnd = 251; // mac allows only 255 characters
-       label[theEnd++] = '/';
-       label[theEnd++] = hMenuCmd; 
-       label[theEnd++] = '!';
-       label[theEnd++] = id ; 
-       label[theEnd] = 0x00;
-       label[0] = theEnd;
-       MacAppendMenu(menu, label);
+       MacInsertMenuItem(menu, "\pA" , item);
+       UMASetMenuItemText(menu, item , title );
+       SetMenuItemHierarchicalID( menu , item , id ) ;

 }
 
 }
 

-void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id  ) 
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       // hardcoded adding of the submenu combination for mac
+       if ( !entry )
+               return ;
+               
+       UInt8 modifiers = 0 ;
+       SInt16 key = entry->GetKeyCode() ;
+       if ( key )
+       {
+               bool explicitCommandKey = false ;
+
+               if ( entry->GetFlags() & wxACCEL_CTRL ) 
+               {
+                       explicitCommandKey = true ;
+               }
+
+               if (entry->GetFlags() & wxACCEL_ALT ) 
+               {
+                       modifiers |= kMenuOptionModifier ;
+               }
+
+               if (entry->GetFlags() & wxACCEL_SHIFT) 
+               {
+                       modifiers |= kMenuShiftModifier ;
+               }

 
 

-       int theEnd = label[0] + 1; 
-       if (theEnd > 251) 
-               theEnd = 251; // mac allows only 255 characters
-       label[theEnd++] = '/';
-       label[theEnd++] = hMenuCmd; 
-       label[theEnd++] = '!';
-       label[theEnd++] = id; 
-       label[theEnd] = 0x00;
-       label[0] = theEnd;
-       MacInsertMenuItem(menu, label , item);
+           SInt16 glyph = 0 ;
+           SInt16 macKey = key ;
+           if ( key >= WXK_F1 && key <= WXK_F15 )
+           {
+               macKey = kFunctionKeyCharCode ;
+               glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
+               if ( key >= WXK_F13 )
+                   glyph += 13 ;
+            if ( !explicitCommandKey )
+               modifiers |= kMenuNoCommandModifier ;
+               
+                       switch( key )
+               {
+                   case WXK_F1 :
+                       macKey += ( 0x7a << 8 ) ;
+                       break ;
+                   case WXK_F2 :
+                       macKey += ( 0x78 << 8 ) ;
+                       break ;
+                   case WXK_F3 :
+                       macKey += ( 0x63 << 8 ) ;
+                       break ;
+                   case WXK_F4 :
+                       macKey += ( 0x76 << 8 ) ;
+                       break ;
+                   case WXK_F5 :
+                       macKey += ( 0x60 << 8 ) ;
+                       break ;
+                   case WXK_F6 :
+                       macKey += ( 0x61 << 8 ) ;
+                       break ;
+                   case WXK_F7 :
+                       macKey += ( 0x62 << 8 ) ;
+                       break ;
+                   case WXK_F8 :
+                       macKey += ( 0x64 << 8 ) ;
+                       break ;
+                   case WXK_F9 :
+                       macKey += ( 0x65 << 8 ) ;
+                       break ;
+                   case WXK_F10 :
+                       macKey += ( 0x6D << 8 ) ;
+                       break ;
+                   case WXK_F11 :
+                       macKey += ( 0x67 << 8 ) ;
+                       break ;
+                   case WXK_F12 :
+                       macKey += ( 0x6F << 8 ) ;
+                       break ;
+                   case WXK_F13 :
+                       macKey += ( 0x69 << 8 ) ;
+                       break ;
+                   case WXK_F14 :
+                       macKey += ( 0x6B << 8 ) ;
+                       break ;
+                   case WXK_F15 :
+                       macKey += ( 0x71 << 8 ) ;
+                       break ;
+                   default :
+                       break ;
+               } ;
+               // unfortunately this does not yet trigger the right key ,
+               // for some reason mac justs picks the first function key menu
+               // defined, so we turn this off
+               macKey = 0 ;
+               glyph = 0 ;
+           }
+           else
+       {
+           switch( key )
+           {
+               case WXK_BACK :
+                   macKey = kBackspaceCharCode ;
+                   glyph = kMenuDeleteLeftGlyph ;
+                   break ;
+               case WXK_TAB :
+                   macKey = kTabCharCode ;
+                   glyph = kMenuTabRightGlyph ;
+                   break ;
+               case kEnterCharCode :
+                   macKey = kEnterCharCode ;
+                   glyph = kMenuEnterGlyph ;
+                   break ;
+               case WXK_RETURN :
+                   macKey = kReturnCharCode ;
+                   glyph = kMenuReturnGlyph ;
+                   break ;
+               case WXK_ESCAPE :
+                   macKey = kEscapeCharCode ;
+                   glyph = kMenuEscapeGlyph ;
+                   break ;
+               case WXK_SPACE :
+                   macKey = ' ' ;
+                   glyph = kMenuSpaceGlyph ;
+                   break ;
+               case WXK_DELETE :
+                   macKey = kDeleteCharCode ;
+                   glyph = kMenuDeleteRightGlyph ;
+                   break ;
+               case WXK_CLEAR :
+                   macKey = kClearCharCode ;
+                   glyph = kMenuClearGlyph ;
+                   break ;
+               case WXK_PRIOR : // PAGE UP
+                   macKey = kPageUpCharCode ;
+                   glyph = kMenuPageUpGlyph ;
+                   break ;
+               case WXK_NEXT :
+                   macKey = kPageDownCharCode ;
+                   glyph = kMenuPageDownGlyph ;
+                   break ;
+               case WXK_LEFT :
+                   macKey = kLeftArrowCharCode ;
+                   glyph = kMenuLeftArrowGlyph ;
+                   break ;
+               case WXK_UP :
+                   macKey = kUpArrowCharCode ;
+                   glyph = kMenuUpArrowGlyph ;
+                   break ;
+               case WXK_RIGHT :
+                   macKey = kRightArrowCharCode ;
+                   glyph = kMenuRightArrowGlyph ;
+                   break ;
+               case WXK_DOWN :
+                   macKey = kDownArrowCharCode ;
+                   glyph = kMenuDownArrowGlyph ;
+                   break ;
+            }
+        }
+
+           SetItemCmd( menu, item , macKey );
+           SetMenuItemModifiers(menu, item , modifiers ) ;
+
+        if ( glyph )
+            SetMenuItemKeyGlyph(menu, item , glyph ) ;
+       }

 }
 
 }
 

-void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
+void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry ) 

 {
 {

-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       if ( key )
-       {
-                       int pos = label[0] ;
-                       label[++pos] = '/';
-                       label[++pos] = toupper( key );
-                       label[0] = pos ;
-       }
-       MacAppendMenu( menu , label ) ;
+       MacAppendMenu(menu, "\pA");
+       UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+       UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;

 }
 
 }
 

-void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) 
+void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry ) 

 {
 {

-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       if ( key )
-       {
-                       int pos = label[0] ;
-                       label[++pos] = '/';
-                       label[++pos] = toupper( key );
-                       label[0] = pos ;
-       }
-       MacInsertMenuItem( menu , label , item) ;
+       MacInsertMenuItem( menu , "\p" , item) ;
+       UMASetMenuItemText(menu, item , title );
+       UMASetMenuItemShortcut( menu , item , entry ) ;

 }
 
 // quickdraw
 
 int gPrOpenCounter = 0 ;
 
 }
 
 // quickdraw
 
 int gPrOpenCounter = 0 ;
 

-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrOpen()
-#endif
+OSStatus UMAPrOpen(void *macPrintSession)

 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;


@@ -277,7 +453,7 @@ OSStatus UMAPrOpen()
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS

-           err = PMCreateSession(macPrintSession) ;
+           err = PMCreateSession((PMPrintSession *)macPrintSession) ;

   #else
            err = PMBegin() ;
   #endif
   #else
            err = PMBegin() ;
   #endif


@@ -287,11 +463,7 @@ OSStatus UMAPrOpen()
 #endif
 }
 
 #endif
 }
 

-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrClose(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrClose()
-#endif
+OSStatus UMAPrClose(void *macPrintSession)

 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;


@@ -310,8 +482,8 @@ OSStatus UMAPrClose()
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS

-           err = PMRelease(*macPrintSession) ;
-           *macPrintSession = kPMNoReference;
+           err = PMRelease(*(PMPrintSession *)macPrintSession) ;
+           *(PMPrintSession *)macPrintSession = kPMNoReference;

   #else
            err = PMEnd() ;
   #endif
   #else
            err = PMEnd() ;
   #endif


@@ -370,7 +542,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 

-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 

 #else
        return (GrafPtr) inWindowRef ;
 #endif
 #else
        return (GrafPtr) inWindowRef ;
 #endif


@@ -579,9 +751,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 

+#if !TARGET_CARBON

 static OSStatus helpMenuStatus = noErr ;
 static OSStatus helpMenuStatus = noErr ;

-static MenuRef helpMenuHandle = NULL ;

 static MenuItemIndex firstCustomItemIndex = 0 ;
 static MenuItemIndex firstCustomItemIndex = 0 ;

+#endif

 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,


@@ -590,13 +763,11 @@ OSStatus UMAGetHelpMenu(
 #if TARGET_CARBON
   return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
 #else
 #if TARGET_CARBON
   return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
 #else

-  if ( helpMenuHandle == NULL )
+  MenuRef helpMenuHandle ;
+  helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
+  if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )

   {
   {

-    helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
-    if ( helpMenuStatus == noErr )
-    {
-      firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-    }
+    firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;

   }
   if ( outFirstCustomItemIndex )
   {
   }
   if ( outFirstCustomItemIndex )
   {