diff --git a/mozilla/widget/public/nsILookAndFeel.h b/mozilla/widget/public/nsILookAndFeel.h index c6ef3570773..fa6d4e9fa38 100644 --- a/mozilla/widget/public/nsILookAndFeel.h +++ b/mozilla/widget/public/nsILookAndFeel.h @@ -44,10 +44,11 @@ struct nsSize; -// {ED0B4802-9F50-4f69-9509-6949C69999E4} +// {CE295E90-FF53-4013-96AE-67B5762292A9} #define NS_ILOOKANDFEEL_IID \ -{ 0xed0b4802, 0x9f50, 0x4f69, \ - { 0x95, 0x9, 0x69, 0x49, 0xc6, 0x99, 0x99, 0xe4 } } +{ 0xce295e90, 0xff53, 0x4013, \ + { 0x96, 0xae, 0x67, 0xb5, 0x76, 0x22, 0x92, 0xa9 } } + class nsILookAndFeel: public nsISupports { public: @@ -75,6 +76,19 @@ public: eColor_TextSelectBackgroundDisabled, eColor_TextSelectBackgroundAttention, + eColor_IMERawInputBackground, + eColor_IMERawInputForeground, + eColor_IMERawInputUnderline, + eColor_IMESelectedRawTextBackground, + eColor_IMESelectedRawTextForeground, + eColor_IMESelectedRawTextUnderline, + eColor_IMEConvertedTextBackground, + eColor_IMEConvertedTextForeground, + eColor_IMEConvertedTextUnderline, + eColor_IMESelectedConvertedTextBackground, + eColor_IMESelectedConvertedTextForeground, + eColor_IMESelectedConvertedTextUnderline, + // New CSS 2 color definitions eColor_activeborder, eColor_activecaption, @@ -207,7 +221,8 @@ public: eMetricFloat_ListVerticalInsidePadding, eMetricFloat_ListHorizontalInsidePadding, eMetricFloat_ButtonVerticalInsidePadding, - eMetricFloat_ButtonHorizontalInsidePadding + eMetricFloat_ButtonHorizontalInsidePadding, + eMetricFloat_IMEUnderlineRelativeSize } nsMetricFloatID; NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor) = 0; @@ -250,5 +265,18 @@ public: // Of course if other plaforms work like the Mac, they can use it too. #define NS_DONT_CHANGE_COLOR NS_RGB(0x01, 0x01, 0x01) +// -------------------------------- +// Special colors for eColor_IME* +// -------------------------------- + +// For background color only. +#define NS_TRANSPARENT NS_RGBA(0x01, 0x00, 0x00, 0x00) +// For foreground color only. +#define NS_SAME_AS_FOREGROUND_COLOR NS_RGBA(0x02, 0x00, 0x00, 0x00) +#define NS_40PERCENT_FOREGROUND_COLOR NS_RGBA(0x03, 0x00, 0x00, 0x00) + +#define NS_IS_IME_SPECIAL_COLOR(c) ((c) == NS_TRANSPARENT || \ + (c) == NS_SAME_AS_FOREGROUND_COLOR || \ + (c) == NS_40PERCENT_FOREGROUND_COLOR) #endif /* __nsILookAndFeel */ diff --git a/mozilla/widget/src/beos/nsLookAndFeel.cpp b/mozilla/widget/src/beos/nsLookAndFeel.cpp index 4e2b4594313..ad5d0d86418 100644 --- a/mozilla/widget/src/beos/nsLookAndFeel.cpp +++ b/mozilla/widget/src/beos/nsLookAndFeel.cpp @@ -98,6 +98,8 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) aColor = NS_RGB(0x00, 0x00, 0x00); break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: { // looks good in Mozilla, though, never noticed this color in BeOS menu color = ui_color(B_MENU_SELECTION_BACKGROUND_COLOR); @@ -105,10 +107,28 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) } break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: { color = ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR); aColor = NS_RGB(color.red, color.green, color.blue); } + break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; break; // two following colors get initialisation in XPLookAndFeel. //eColor_TextSelectBackgroundDisabled, @@ -437,6 +457,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/gtk/nsLookAndFeel.cpp b/mozilla/widget/src/gtk/nsLookAndFeel.cpp index c962eff96bd..f500d14e3d6 100644 --- a/mozilla/widget/src/gtk/nsLookAndFeel.cpp +++ b/mozilla/widget/src/gtk/nsLookAndFeel.cpp @@ -112,11 +112,31 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor& aColor) aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]); break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]); break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]); break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + break; // css2 http://www.w3.org/TR/REC-CSS2/ui.html#system-colors case eColor_activeborder: @@ -438,6 +458,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/gtk2/nsLookAndFeel.cpp b/mozilla/widget/src/gtk2/nsLookAndFeel.cpp index ae4360011b6..af4921681c0 100644 --- a/mozilla/widget/src/gtk2/nsLookAndFeel.cpp +++ b/mozilla/widget/src/gtk2/nsLookAndFeel.cpp @@ -116,13 +116,33 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor& aColor) aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]); break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: // still used aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_SELECTED]); break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: // still used aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]); break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + break; // css2 http://www.w3.org/TR/REC-CSS2/ui.html#system-colors case eColor_activeborder: @@ -480,6 +500,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/mac/nsLookAndFeel.cpp b/mozilla/widget/src/mac/nsLookAndFeel.cpp index fc76584ba23..33e4fb9db5c 100644 --- a/mozilla/widget/src/mac/nsLookAndFeel.cpp +++ b/mozilla/widget/src/mac/nsLookAndFeel.cpp @@ -140,6 +140,26 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) else aColor = NS_DONT_CHANGE_COLOR; break; + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_40PERCENT_FOREGROUND_COLOR; + break; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; // // css2 system colors http://www.w3.org/TR/REC-CSS2/ui.html#system-colors @@ -595,6 +615,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.5f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 2.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/os2/nsLookAndFeel.cpp b/mozilla/widget/src/os2/nsLookAndFeel.cpp index e2e40ff3cb7..75eb7e67c15 100644 --- a/mozilla/widget/src/os2/nsLookAndFeel.cpp +++ b/mozilla/widget/src/os2/nsLookAndFeel.cpp @@ -89,11 +89,31 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) idx = SYSCLR_WINDOWTEXT; break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: idx = SYSCLR_HILITEBACKGROUND; break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: idx = SYSCLR_HILITEFOREGROUND; break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + return NS_OK; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + return NS_OK; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + return NS_OK; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + return NS_OK; // New CSS 2 Color definitions case eColor_activeborder: @@ -361,6 +381,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/photon/nsLookAndFeel.cpp b/mozilla/widget/src/photon/nsLookAndFeel.cpp index cf14d60cd16..f98b516f8e5 100644 --- a/mozilla/widget/src/photon/nsLookAndFeel.cpp +++ b/mozilla/widget/src/photon/nsLookAndFeel.cpp @@ -93,12 +93,32 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) case eColor_TextForeground: aColor = PH_TO_NS_RGB(Pg_BLACK); break; - case eColor_TextSelectBackground: - aColor = PH_TO_NS_RGB(Pg_BLACK); - break; - case eColor_TextSelectForeground: - aColor = PH_TO_NS_RGB(Pg_WHITE); - break; + case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: + aColor = PH_TO_NS_RGB(Pg_BLACK); + break; + case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: + aColor = PH_TO_NS_RGB(Pg_WHITE); + break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + break; // css2 http://www.w3.org/TR/REC-CSS2/ui.html#system-colors case eColor_activeborder: @@ -385,6 +405,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/qt/nsLookAndFeel.cpp b/mozilla/widget/src/qt/nsLookAndFeel.cpp index f27d4b3a1be..0b7b2ec9f53 100644 --- a/mozilla/widget/src/qt/nsLookAndFeel.cpp +++ b/mozilla/widget/src/qt/nsLookAndFeel.cpp @@ -112,13 +112,37 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID,nscolor &aColor) break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: aColor = QCOLOR_TO_NS_RGB(activeGroup.highlight()); break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: aColor = QCOLOR_TO_NS_RGB(activeGroup.highlightedText()); break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + break; + case eColor_activeborder: aColor = QCOLOR_TO_NS_RGB(normalGroup.background()); break; @@ -465,6 +489,10 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; + default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/windows/nsLookAndFeel.cpp b/mozilla/widget/src/windows/nsLookAndFeel.cpp index 3867c935f1e..ac44f1bd26b 100644 --- a/mozilla/widget/src/windows/nsLookAndFeel.cpp +++ b/mozilla/widget/src/windows/nsLookAndFeel.cpp @@ -86,11 +86,31 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) idx = COLOR_WINDOWTEXT; break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: idx = COLOR_HIGHLIGHT; break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: idx = COLOR_HIGHLIGHTTEXT; break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + return NS_OK; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + return NS_OK; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + return NS_OK; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + return NS_OK; // New CSS 2 Color definitions case eColor_activeborder: @@ -459,6 +479,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/xlib/nsLookAndFeel.cpp b/mozilla/widget/src/xlib/nsLookAndFeel.cpp index 72b61f73b22..834f0727b8f 100644 --- a/mozilla/widget/src/xlib/nsLookAndFeel.cpp +++ b/mozilla/widget/src/xlib/nsLookAndFeel.cpp @@ -86,11 +86,32 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor) aColor = NS_RGB(0x00, 0x00, 0x00); break; case eColor_TextSelectBackground: + case eColor_IMESelectedRawTextBackground: + case eColor_IMESelectedConvertedTextBackground: aColor = NS_RGB(0x00, 0x00, 0x9c); break; case eColor_TextSelectForeground: + case eColor_IMESelectedRawTextForeground: + case eColor_IMESelectedConvertedTextForeground: aColor = NS_RGB(0xff, 0xff, 0xff); break; + case eColor_IMERawInputBackground: + case eColor_IMEConvertedTextBackground: + aColor = NS_TRANSPARENT; + break; + case eColor_IMERawInputForeground: + case eColor_IMEConvertedTextForeground: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMERawInputUnderline: + case eColor_IMEConvertedTextUnderline: + aColor = NS_SAME_AS_FOREGROUND_COLOR; + break; + case eColor_IMESelectedRawTextUnderline: + case eColor_IMESelectedConvertedTextUnderline: + aColor = NS_TRANSPARENT; + break; + // css2 http://www.w3.org/TR/REC-CSS2/ui.html#system-colors case eColor_activeborder: @@ -352,6 +373,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri case eMetricFloat_ButtonHorizontalInsidePadding: aMetric = 0.25f; break; + case eMetricFloat_IMEUnderlineRelativeSize: + aMetric = 1.0f; + break; default: aMetric = -1.0; res = NS_ERROR_FAILURE; diff --git a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp index 788e704f284..8cac487906d 100644 --- a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -125,6 +125,8 @@ nsLookAndFeelFloatPref nsXPLookAndFeel::sFloatPrefs[] = PR_FALSE, nsLookAndFeelTypeFloat, 0 }, { "ui.buttonHorizontalInsidePadding", eMetricFloat_ButtonHorizontalInsidePadding, PR_FALSE, nsLookAndFeelTypeFloat, 0 }, + { "ui.IMEUnderlineRelativeSize", eMetricFloat_IMEUnderlineRelativeSize, + PR_FALSE, nsLookAndFeelTypeFloat, 0 }, }; @@ -134,7 +136,7 @@ nsLookAndFeelFloatPref nsXPLookAndFeel::sFloatPrefs[] = * to the following array then you MUST update the * sizes of the sColorPrefs array in nsXPLookAndFeel.h */ -const char nsXPLookAndFeel::sColorPrefs[][36] = +const char nsXPLookAndFeel::sColorPrefs[][38] = { "ui.windowBackground", "ui.windowForeground", @@ -150,6 +152,18 @@ const char nsXPLookAndFeel::sColorPrefs[][36] = "ui.textSelectForeground", "ui.textSelectBackgroundDisabled", "ui.textSelectBackgroundAttention", + "ui.IMERawInputBackground", + "ui.IMERawInputForeground", + "ui.IMERawInputUnderline", + "ui.IMESelectedRawTextBackground", + "ui.IMESelectedRawTextForeground", + "ui.IMESelectedRawTextUnderline", + "ui.IMEConvertedTextBackground", + "ui.IMEConvertedTextForeground", + "ui.IMEConvertedTextUnderline", + "ui.IMESelectedConvertedTextBackground", + "ui.IMESelectedConvertedTextForeground", + "ui.IMESelectedConvertedTextUnderline", "ui.activeborder", "ui.activecaption", "ui.appworkspace", diff --git a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.h b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.h index e8df2636cdf..0285a6c44d2 100644 --- a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.h +++ b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.h @@ -127,7 +127,7 @@ protected: /* this length must not be shorter than the length of the longest string in the array * see nsXPLookAndFeel.cpp */ - static const char sColorPrefs[][36]; + static const char sColorPrefs[][38]; static PRInt32 sCachedColors[nsILookAndFeel::eColor_LAST_COLOR]; static PRInt32 sCachedColorBits[COLOR_CACHE_SIZE]; };