From 26ecfd0a1c59cc8593b7abb68718aed8b72b058a Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Thu, 8 May 2008 09:29:38 +0000 Subject: [PATCH] Bug 431309 - "Vista toolbar styles should have a -moz-win- prefix" (using the -moz-win- prefix) [p=kliu@mozilla.kailiu.com (Kai Liu) r+sr=roc a1.9=beltzner] --- browser/themes/winstripe/browser/browser.css | 2 +- gfx/public/nsThemeConstants.h | 6 ++-- layout/style/nsCSSKeywordList.h | 6 ++-- layout/style/nsCSSProps.cpp | 6 ++-- widget/src/windows/nsNativeThemeWin.cpp | 30 ++++++++++---------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css index 8df3df7ebb6..160e41bdccf 100644 --- a/browser/themes/winstripe/browser/browser.css +++ b/browser/themes/winstripe/browser/browser.css @@ -1365,7 +1365,7 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] { /* Tabstrip */ .tabbrowser-tabs { - -moz-appearance: browsertabbar-toolbox; + -moz-appearance: -moz-win-browsertabbar-toolbox; background: -moz-dialog url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") repeat-x; } diff --git a/gfx/public/nsThemeConstants.h b/gfx/public/nsThemeConstants.h index 99f4980ae41..35532b0e249 100644 --- a/gfx/public/nsThemeConstants.h +++ b/gfx/public/nsThemeConstants.h @@ -235,6 +235,6 @@ #define NS_THEME_MENUITEMTEXT 220 // Vista Rebars -#define NS_THEME_COMMUNICATIONS_TOOLBOX 221 -#define NS_THEME_MEDIA_TOOLBOX 222 -#define NS_THEME_BROWSER_TAB_BAR_TOOLBOX 223 +#define NS_THEME_WIN_COMMUNICATIONS_TOOLBOX 221 +#define NS_THEME_WIN_MEDIA_TOOLBOX 222 +#define NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX 223 diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h index 7a01cffb79c..e966623e5c3 100644 --- a/layout/style/nsCSSKeywordList.h +++ b/layout/style/nsCSSKeywordList.h @@ -558,9 +558,9 @@ CSS_KEY(radio-container, radiocontainer) CSS_KEY(checkbox-label, checkboxlabel) CSS_KEY(radio-label, radiolabel) CSS_KEY(button-focus, buttonfocus) -CSS_KEY(media-toolbox, media_toolbox) -CSS_KEY(communications-toolbox, communications_toolbox) -CSS_KEY(browsertabbar-toolbox, browsertabbar_toolbox) +CSS_KEY(-moz-win-media-toolbox, _moz_win_media_toolbox) +CSS_KEY(-moz-win-communications-toolbox, _moz_win_communications_toolbox) +CSS_KEY(-moz-win-browsertabbar-toolbox, _moz_win_browsertabbar_toolbox) CSS_KEY(-moz-win-mediatext, _moz_win_mediatext) CSS_KEY(-moz-win-communicationstext, _moz_win_communicationstext) diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 9a54ac82391..8a9845a7625 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -266,9 +266,9 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = { eCSSKeyword_menuarrow, NS_THEME_MENUARROW, eCSSKeyword_menuimage, NS_THEME_MENUIMAGE, eCSSKeyword_menuitemtext, NS_THEME_MENUITEMTEXT, - eCSSKeyword_media_toolbox, NS_THEME_MEDIA_TOOLBOX, - eCSSKeyword_communications_toolbox, NS_THEME_COMMUNICATIONS_TOOLBOX, - eCSSKeyword_browsertabbar_toolbox, NS_THEME_BROWSER_TAB_BAR_TOOLBOX, + eCSSKeyword__moz_win_media_toolbox, NS_THEME_WIN_MEDIA_TOOLBOX, + eCSSKeyword__moz_win_communications_toolbox, NS_THEME_WIN_COMMUNICATIONS_TOOLBOX, + eCSSKeyword__moz_win_browsertabbar_toolbox, NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX, eCSSKeyword_UNKNOWN,-1 }; diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp index bbb4a590d56..34c1de90917 100644 --- a/widget/src/windows/nsNativeThemeWin.cpp +++ b/widget/src/windows/nsNativeThemeWin.cpp @@ -503,17 +503,17 @@ nsNativeThemeWin::GetTheme(PRUint8 aWidgetType) mRebarTheme = openTheme(NULL, L"Rebar"); return mRebarTheme; } - case NS_THEME_MEDIA_TOOLBOX: { + case NS_THEME_WIN_MEDIA_TOOLBOX: { if (!mMediaRebarTheme) mMediaRebarTheme = openTheme(NULL, L"Media::Rebar"); return mMediaRebarTheme; } - case NS_THEME_COMMUNICATIONS_TOOLBOX: { + case NS_THEME_WIN_COMMUNICATIONS_TOOLBOX: { if (!mCommunicationsRebarTheme) mCommunicationsRebarTheme = openTheme(NULL, L"Communications::Rebar"); return mCommunicationsRebarTheme; } - case NS_THEME_BROWSER_TAB_BAR_TOOLBOX: { + case NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX: { if (!mBrowserTabBarRebarTheme) mBrowserTabBarRebarTheme = openTheme(NULL, L"BrowserTabBar::Rebar"); return mBrowserTabBarRebarTheme; @@ -954,9 +954,9 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType, return NS_OK; } case NS_THEME_TOOLBOX: - case NS_THEME_MEDIA_TOOLBOX: - case NS_THEME_COMMUNICATIONS_TOOLBOX: - case NS_THEME_BROWSER_TAB_BAR_TOOLBOX: + case NS_THEME_WIN_MEDIA_TOOLBOX: + case NS_THEME_WIN_COMMUNICATIONS_TOOLBOX: + case NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX: case NS_THEME_STATUSBAR: case NS_THEME_SCROLLBAR: case NS_THEME_SCROLLBAR_SMALL: { @@ -1459,9 +1459,9 @@ nsNativeThemeWin::GetWidgetBorder(nsIDeviceContext* aContext, if (!WidgetIsContainer(aWidgetType) || aWidgetType == NS_THEME_TOOLBOX || - aWidgetType == NS_THEME_MEDIA_TOOLBOX || - aWidgetType == NS_THEME_COMMUNICATIONS_TOOLBOX || - aWidgetType == NS_THEME_BROWSER_TAB_BAR_TOOLBOX || + aWidgetType == NS_THEME_WIN_MEDIA_TOOLBOX || + aWidgetType == NS_THEME_WIN_COMMUNICATIONS_TOOLBOX || + aWidgetType == NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX || aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_RESIZER || aWidgetType == NS_THEME_TAB_PANEL || aWidgetType == NS_THEME_SCROLLBAR_TRACK_HORIZONTAL || @@ -1689,9 +1689,9 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* return ClassicGetMinimumWidgetSize(aContext, aFrame, aWidgetType, aResult, aIsOverridable); if (aWidgetType == NS_THEME_TOOLBOX || - aWidgetType == NS_THEME_MEDIA_TOOLBOX || - aWidgetType == NS_THEME_COMMUNICATIONS_TOOLBOX || - aWidgetType == NS_THEME_BROWSER_TAB_BAR_TOOLBOX || + aWidgetType == NS_THEME_WIN_MEDIA_TOOLBOX || + aWidgetType == NS_THEME_WIN_COMMUNICATIONS_TOOLBOX || + aWidgetType == NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX || aWidgetType == NS_THEME_TOOLBAR || aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_PROGRESSBAR_CHUNK || aWidgetType == NS_THEME_PROGRESSBAR_CHUNK_VERTICAL || @@ -1821,9 +1821,9 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType, { // Some widget types just never change state. if (aWidgetType == NS_THEME_TOOLBOX || - aWidgetType == NS_THEME_MEDIA_TOOLBOX || - aWidgetType == NS_THEME_COMMUNICATIONS_TOOLBOX || - aWidgetType == NS_THEME_BROWSER_TAB_BAR_TOOLBOX || + aWidgetType == NS_THEME_WIN_MEDIA_TOOLBOX || + aWidgetType == NS_THEME_WIN_COMMUNICATIONS_TOOLBOX || + aWidgetType == NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX || aWidgetType == NS_THEME_TOOLBAR || aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_STATUSBAR_PANEL || aWidgetType == NS_THEME_STATUSBAR_RESIZER_PANEL ||