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
authorjoshmoz@gmail.com
Sun, 30 Mar 2008 10:54:42 -0700
changeset 13752 6f3547785fee8c79ca14acb350b384aaa66e53a7
parent 13751 9453199dfe89ce28072c4eedaf0764de2fc5a47c
child 13753 7f5447862845c13f86ecd7d62353d90e4f8a0866
push idunknown
push userunknown
push dateunknown
reviewerssmorgan
bugs422760
milestone1.9pre
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
extensions/spellcheck/Makefile.in
extensions/spellcheck/src/Makefile.in
extensions/spellcheck/src/mozSpellCheckerFactory.cpp
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -252,33 +252,29 @@
                 accesskey="&metadataCmd.accesskey;"
                 oncommand="gContextMenu.showMetadata();"/>
       <menuseparator id="spell-separator"/>
       <menuitem id="spell-check-enabled"
                 label="&spellCheckEnable.label;"
                 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"/>
       <menuitem hidden="true" id="context-bidi-text-direction-toggle"
                 label="&bidiSwitchTextDirectionItem.label;"
                 accesskey="&bidiSwitchTextDirectionItem.accesskey;"
                 command="cmd_switchTextDirection"/>
       <menuitem hidden="true" id="context-bidi-page-direction-toggle"
--- a/extensions/spellcheck/Makefile.in
+++ b/extensions/spellcheck/Makefile.in
@@ -39,17 +39,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 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
 endif
 
 DIRS += src
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -71,17 +71,17 @@ CPPSRCS		= \
 		mozPersonalDictionary.cpp	\
 		mozEnglishWordUtils.cpp		\
 		mozGenericWordUtils.cpp		\
 		mozSpellI18NManager.cpp		\
 		mozInlineSpellChecker.cpp	\
 		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
 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
 endif
 
 EXTRA_DSO_LDOPTS = \
--- a/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
+++ b/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
@@ -32,17 +32,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 
 #include "nsIGenericFactory.h"
 
-#ifdef MOZ_WIDGET_COCOA
+#ifdef MOZ_MACBROWSER
 #include "mozOSXSpell.h"
 #else
 #include "mozHunspell.h"
 #ifdef MOZ_XUL_APP
 #include "mozHunspellDirProvider.h"
 #endif
 #endif
 
@@ -63,17 +63,17 @@ 0x9fe5d975, 0x9bd, 0x44aa,              
 { 0xa0, 0x1a, 0x66, 0x40, 0x2e, 0xa2, 0x86, 0x57} }
 
 ////////////////////////////////////////////////////////////////////////
 // Define the constructor function for the objects
 //
 // 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)
 #ifdef MOZ_XUL_APP
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozHunspellDirProvider)
 #endif
 #endif
 
@@ -117,17 +117,17 @@ mozInlineSpellCheckerConstructor(nsISupp
 }
 
 ////////////////////////////////////////////////////////////////////////
 // Define a table of CIDs implemented by this module along with other
 // information like the function to create an instance, contractid, and
 // class name.
 //
 static nsModuleComponentInfo components[] = {
-#ifdef MOZ_WIDGET_COCOA
+#ifdef MOZ_MACBROWSER
     {
         "OSX Spell check service",
         MOZ_OSXSPELL_CID,
         MOZ_OSXSPELL_CONTRACTID,
         mozOSXSpellConstructor
     },
 #else
     {
@@ -141,17 +141,17 @@ static nsModuleComponentInfo components[
         "mozHunspellDirProvider",
         HUNSPELLDIRPROVIDER_CID,
         mozHunspellDirProvider::kContractID,
         mozHunspellDirProviderConstructor,
         mozHunspellDirProvider::Register,
         mozHunspellDirProvider::Unregister
     },
 #endif // MOZ_XUL_APP
-#endif // MOZ_WIDGET_COCOA
+#endif // MOZ_MACBROWSER
   {
       NULL,
       NS_SPELLCHECKER_CID,
       NS_SPELLCHECKER_CONTRACTID,
       mozSpellCheckerConstructor
   },
   {
       NULL,