diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/libjar/nsJAR.cpp | 2 | ||||
| -rw-r--r-- | modules/libjar/nsZipArchive.cpp | 2 | ||||
| -rw-r--r-- | modules/libmar/sign/nss_secutil.c | 4 | ||||
| -rw-r--r-- | modules/libpref/src/Makefile.in | 2 | ||||
| -rw-r--r-- | modules/libpref/src/Preferences.cpp | 2 | ||||
| -rw-r--r-- | modules/libpref/src/init/all.js | 196 | ||||
| -rw-r--r-- | modules/libpref/src/prefapi.cpp | 8 |
7 files changed, 3 insertions, 213 deletions
diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp index 358859c50..b246e10c7 100644 --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp @@ -13,7 +13,7 @@ #ifdef XP_UNIX #include <sys/stat.h> -#elif defined (XP_WIN) || defined(XP_OS2) +#elif defined (XP_WIN) #include <io.h> #endif diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index e945091a3..ff92d98ff 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -35,7 +35,7 @@ #include <sys/stat.h> #include <limits.h> #include <unistd.h> -#elif defined(XP_WIN) || defined(XP_OS2) +#elif defined(XP_WIN) #include <io.h> #endif diff --git a/modules/libmar/sign/nss_secutil.c b/modules/libmar/sign/nss_secutil.c index 8eb055fc3..31906914b 100644 --- a/modules/libmar/sign/nss_secutil.c +++ b/modules/libmar/sign/nss_secutil.c @@ -18,12 +18,8 @@ static char consoleName[] = { #ifdef XP_UNIX "/dev/tty" #else -#ifdef XP_OS2 - "\\DEV\\CON" -#else "CON:" #endif -#endif }; #if defined(_WINDOWS) diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 442a31708..5b4e767d8 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -27,7 +27,7 @@ include $(topsrcdir)/config/rules.mk GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ mailnews.js editor.js \ - aix.js unix.js winpref.js os2prefs.js) + aix.js unix.js winpref.js) GARBAGE += greprefs.js diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp index 7c9155dd2..23cee758b 100644 --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp @@ -1111,8 +1111,6 @@ static nsresult pref_InitInitialObjects() #elif defined(_AIX) , "aix.js" #endif -#elif defined(XP_OS2) - "os2pref.js" #elif defined(XP_BEOS) "beos.js" #endif diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index c41acd9e2..2bf7d39de 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -3000,202 +3000,6 @@ pref("mousewheel.enable_pixel_scrolling", true); # XP_MACOSX #endif -#ifdef XP_OS2 - -pref("ui.key.menuAccessKeyFocuses", true); - -pref("font.alias-list", "sans,sans-serif,serif,monospace,Tms Rmn,Helv,Courier,Times New Roman"); - -pref("font.mathfont-family", "MathJax_Main, STIXNonUnicode, STIXSizeOneSym, STIXSize1, STIXGeneral, Asana Math, DejaVu Sans"); - -// Languages only need lists if we have a default that might not be available. -// Tms Rmn and Helv cannot be used by Thebes but the OS/2 version of FontConfig -// maps them to Times New Roman and Helvetica, respectively. Those fonts and -// Courier are available on OS/2 by default. - -pref("font.name.serif.ar", "Tms Rmn"); -pref("font.name.sans-serif.ar", "Helv"); -pref("font.name.monospace.ar", "Courier"); - -pref("font.name.serif.el", "Tms Rmn"); -pref("font.name.sans-serif.el", "Helv"); -pref("font.name.monospace.el", "Courier"); - -pref("font.name.serif.he", "Tms Rmn"); -pref("font.name.sans-serif.he", "Helv"); -pref("font.name.monospace.he", "Courier"); - -pref("font.name.serif.ja", "Times New Roman WT J"); -pref("font.name-list.serif.ja", "Times New Roman WT J, Times New Roman WT, Times New Roman MT 30, Tms Rmn"); -pref("font.name.sans-serif.ja", "Helv"); -pref("font.name.monospace.ja", "Kochi Gothic"); -pref("font.name-list.monospace.ja", "Kochi Gothic, Kochi Mincho, Courier New, Courier"); - -pref("font.name.serif.ko", "Times New Roman WT K"); -pref("font.name-list.serif.ko", "Times New Roman WT K, Times New Roman WT, Times New Roman MT 30, Tms Rmn"); -pref("font.name.sans-serif.ko", "Helv"); -pref("font.name.monospace.ko", "Courier"); - -pref("font.name.serif.th", "Tms Rmn"); -pref("font.name.sans-serif.th", "Helv"); -pref("font.name.monospace.th", "Courier"); - -pref("font.name.serif.tr", "Tms Rmn"); -pref("font.name.sans-serif.tr", "Helv"); -pref("font.name.monospace.tr", "Courier"); - -pref("font.name.serif.x-baltic", "Tms Rmn"); -pref("font.name.sans-serif.x-baltic", "Helv"); -pref("font.name.monospace.x-baltic", "Courier"); - -pref("font.name.serif.x-central-euro", "Tms Rmn"); -pref("font.name.sans-serif.x-central-euro", "Helv"); -pref("font.name.monospace.x-central-euro", "Courier"); - -pref("font.name.serif.x-cyrillic", "Tms Rmn"); -pref("font.name.sans-serif.x-cyrillic", "Helv"); -pref("font.name.monospace.x-cyrillic", "Courier"); - -// Unicode fonts -// Fontconfig will match substrings, so that we only need to list e.g. -// Times New Roman WT and it will search for the J, SC, TC, K variants. -// The DejaVu fonts are shipped with eCS, so list them first but include other -// fonts that OS/2 users are likely to have. -pref("font.name.serif.x-unicode", "Times New Roman MT 30"); -pref("font.name-list.serif.x-unicode", "DejaVu Serif, FreeSerif, Times New Roman WT, Times New Roman MT 30, Tms Rmn"); -pref("font.name.sans-serif.x-unicode", "Lucida Sans Unicode"); -pref("font.name-list.sans-serif.x-unicode", "DejaVu Sans, FreeSans, Arial Unicode, Lucida Sans Unicode, Helv"); -pref("font.name.monospace.x-unicode", "DejaVu Sans Mono"); -pref("font.name-list.monospace.x-unicode", "DejaVu Sans Mono, FreeMono, Andale Mono, Courier New, Courier"); -pref("font.name.fantasy.x-unicode", "Times New Roman MT 30"); -pref("font.name-list.fantasy.x-unicode", "DejaVu Serif, FreeSerif, Times New Roman WT, Times New Roman MT 30"); -pref("font.name.cursive.x-unicode", "Times New Roman MT 30"); -pref("font.name-list.cursive.x-unicode", "DejaVu Serif, FreeSerif, Times New Roman WT, Times New Roman MT 30"); - -pref("font.name.serif.x-western", "Tms Rmn"); -pref("font.name.sans-serif.x-western", "Helv"); -pref("font.name.monospace.x-western", "Courier"); - -pref("font.name.serif.zh-CN", "Times New Roman WT SC"); -pref("font.name-list.serif.zh_CN", "Times New Roman WT SC, Times New Roman MT 30, Times New Roman WT, Tms Rmn"); -pref("font.name.sans-serif.zh-CN", "Helv"); -pref("font.name.monospace.zh-CN", "Courier"); - -pref("font.name.serif.zh-TW", "Times New Roman WT TC"); -pref("font.name-list.serif.zh-TW", "Times New Roman WT TC, Times New Roman MT 30, Times New Roman WT, Tms Rmn"); -pref("font.name.sans-serif.zh-TW", "Helv"); -pref("font.name.monospace.zh-TW", "Courier"); - -// just copied values from zh-TW -pref("font.name.serif.zh-HK", "Times New Roman WT TC"); -pref("font.name-list.serif.zh-HK", "Times New Roman WT TC, Times New Roman MT 30, Times New Roman WT, Tms Rmn"); -pref("font.name.sans-serif.zh-HK", "Helv"); -pref("font.name.monospace.zh-HK", "Courier"); - -pref("font.default", "serif"); - -pref("font.default.ar", "serif"); -pref("font.size.variable.ar", 16); -pref("font.size.fixed.ar", 13); - -pref("font.default.el", "serif"); -pref("font.size.variable.el", 16); -pref("font.size.fixed.el", 13); - -pref("font.default.he", "serif"); -pref("font.size.variable.he", 16); -pref("font.size.fixed.he", 13); - -pref("font.default.ja", "serif"); -pref("font.size.variable.ja", 16); -pref("font.size.fixed.ja", 16); - -pref("font.default.ko", "serif"); -pref("font.size.variable.ko", 16); -pref("font.size.fixed.ko", 16); - -pref("font.default.th", "serif"); -pref("font.size.variable.th", 16); -pref("font.size.fixed.th", 13); - -pref("font.default.tr", "serif"); -pref("font.size.variable.tr", 16); -pref("font.size.fixed.tr", 13); - -pref("font.default.x-baltic", "serif"); -pref("font.size.variable.x-baltic", 16); -pref("font.size.fixed.x-baltic", 13); - -pref("font.default.x-central-euro", "serif"); -pref("font.size.variable.x-central-euro", 16); -pref("font.size.fixed.x-central-euro", 13); - -pref("font.default.x-cyrillic", "serif"); -pref("font.size.variable.x-cyrillic", 16); -pref("font.size.fixed.x-cyrillic", 13); - -pref("font.default.x-devanagari", "serif"); -pref("font.size.variable.x-devanagari", 16); -pref("font.size.fixed.x-devanagari", 13); - -pref("font.default.x-tamil", "serif"); -pref("font.size.variable.x-tamil", 16); -pref("font.size.fixed.x-tamil", 13); - -pref("font.default.x-unicode", "serif"); -pref("font.size.variable.x-unicode", 16); -pref("font.size.fixed.x-unicode", 13); - -pref("font.default.x-western", "serif"); -pref("font.size.variable.x-western", 16); -pref("font.size.fixed.x-western", 13); - -pref("font.default.zh-CN", "serif"); -pref("font.size.variable.zh-CN", 16); -pref("font.size.fixed.zh-CN", 16); - -pref("font.default.zh-TW", "serif"); -pref("font.size.variable.zh-TW", 16); -pref("font.size.fixed.zh-TW", 16); - -pref("font.default.zh-HK", "serif"); -pref("font.size.variable.zh-HK", 16); -pref("font.size.fixed.zh-HK", 16); - -pref("netinst.profile.show_profile_wizard", true); - -pref("middlemouse.paste", true); - -// override double-click word selection behavior. -pref("layout.word_select.eat_space_to_next_word", true); -pref("layout.word_select.stop_at_punctuation", false); - -// If false, will always use closest matching size for a given -// image font. If true, will substitute a vector font for a given -// image font if the given size is smaller/larger than can be handled -// by the image font. -pref("browser.display.substitute_vector_fonts", true); - -// print_extra_margin enables platforms to specify an extra gap or margin -// around the content of the page for Print Preview only -pref("print.print_extra_margin", 90); // twips (90 twips is an eigth of an inch) - -pref("mail.compose.max_recycled_windows", 0); - -// Disable IPv6 name lookups by default. -// This is because OS/2 doesn't support IPv6 -pref("network.dns.disableIPv6", true); - -// IMEs of OS/2 might use non-topmost windows for topmost <panel> element, -// see bug 451015. If there are other problems by this value, we may need to -// change this value. -pref("ui.panel.default_level_parent", false); - -pref("mousewheel.system_scroll_override_on_root_content.enabled", false); - -# OS2 -#endif - #ifdef ANDROID // Handled differently under Mac/Windows pref("network.protocol-handler.warn-external.file", false); diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp index cec84da69..fafeb7167 100644 --- a/modules/libpref/src/prefapi.cpp +++ b/modules/libpref/src/prefapi.cpp @@ -14,9 +14,6 @@ #define PL_ARENA_CONST_ALIGN_MASK 3 #include "plarena.h" -#ifdef XP_OS2 - #include <sys/types.h> -#endif #ifdef _WIN32 #include "windows.h" #endif /* _WIN32 */ @@ -32,11 +29,6 @@ #include "nsPrintfCString.h" #include "prlink.h" -#ifdef XP_OS2 -#define INCL_DOS -#include <os2.h> -#endif - using namespace mozilla; static void |