disable native spellchecking dictionary on Mac OS X as it doesn't support all of the locales we need it to. b=422760 r=smorgan r/ui-r=mconnor

browser/base/content/browser-context.inc

@@ -257,23 +257,19 @@
                 type="checkbox"
                 accesskey="&spellCheckEnable.accesskey;"
                 oncommand="InlineSpellCheckerUI.toggleEnabled();"/>
-#ifndef MOZ_WIDGET_COCOA
       <menuitem id="spell-add-dictionaries-main"
                 label="&spellAddDictionaries.label;"
                 accesskey="&spellAddDictionaries.accesskey;"
                 oncommand="gContextMenu.addDictionaries();"/>
-#endif
       <menu id="spell-dictionaries"
             label="&spellDictionaries.label;"
             accesskey="&spellDictionaries.accesskey;">
           <menupopup id="spell-dictionaries-menu">
-#ifndef MOZ_WIDGET_COCOA
               <menuseparator id="spell-language-separator"/>
               <menuitem id="spell-add-dictionaries"
                         label="&spellAddDictionaries.label;"
                         accesskey="&spellAddDictionaries.accesskey;"
                         oncommand="gContextMenu.addDictionaries();"/>
-#endif
           </menupopup>
       </menu>
       <menuseparator hidden="true" id="context-sep-bidi"/>

extensions/spellcheck/Makefile.in

@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= spellchecker
 DIRS		= idl locales
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ifeq (camino,$(MOZ_BUILD_APP))
 DIRS		+= osxspell
 else
 DIRS		+= hunspell

extensions/spellcheck/src/Makefile.in

@@ -76,7 +76,7 @@ CPPSRCS		= \
 		mozInlineSpellWordUtil.cpp      \
 		$(NULL)
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ifeq (camino,$(MOZ_BUILD_APP))
 SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src
 else

extensions/spellcheck/src/mozSpellCheckerFactory.cpp

@@ -37,7 +37,7 @@
 
 #include "nsIGenericFactory.h"
 
-#ifdef MOZ_WIDGET_COCOA
+#ifdef MOZ_MACBROWSER
 #include "mozOSXSpell.h"
 #else
 #include "mozHunspell.h"
@@ -68,7 +68,7 @@
 // NOTE: This creates an instance of objects by using the default constructor
 //
 
-#ifdef MOZ_WIDGET_COCOA
+#ifdef MOZ_MACBROWSER
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozOSXSpell)
 #else
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozHunspell, Init)
@@ -122,7 +122,7 @@ mozInlineSpellCheckerConstructor(nsISupports *aOuter, REFNSIID aIID,
 // class name.
 //
 static nsModuleComponentInfo components[] = {
-#ifdef MOZ_WIDGET_COCOA
+#ifdef MOZ_MACBROWSER
     {
         "OSX Spell check service",
         MOZ_OSXSPELL_CID,
@@ -146,7 +146,7 @@ static nsModuleComponentInfo components[] = {
         mozHunspellDirProvider::Unregister
     },
 #endif // MOZ_XUL_APP
-#endif // MOZ_WIDGET_COCOA
+#endif // MOZ_MACBROWSER
   {
       NULL,
       NS_SPELLCHECKER_CID,