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]

This commit is contained in:
reed%reedloden.com 2008-05-08 09:29:38 +00:00
Родитель fbb86e7ec0
Коммит 26ecfd0a1c
5 изменённых файлов: 25 добавлений и 25 удалений

Просмотреть файл

@ -1365,7 +1365,7 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] {
/* Tabstrip */ /* Tabstrip */
.tabbrowser-tabs { .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; background: -moz-dialog url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") repeat-x;
} }

Просмотреть файл

@ -235,6 +235,6 @@
#define NS_THEME_MENUITEMTEXT 220 #define NS_THEME_MENUITEMTEXT 220
// Vista Rebars // Vista Rebars
#define NS_THEME_COMMUNICATIONS_TOOLBOX 221 #define NS_THEME_WIN_COMMUNICATIONS_TOOLBOX 221
#define NS_THEME_MEDIA_TOOLBOX 222 #define NS_THEME_WIN_MEDIA_TOOLBOX 222
#define NS_THEME_BROWSER_TAB_BAR_TOOLBOX 223 #define NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX 223

Просмотреть файл

@ -558,9 +558,9 @@ CSS_KEY(radio-container, radiocontainer)
CSS_KEY(checkbox-label, checkboxlabel) CSS_KEY(checkbox-label, checkboxlabel)
CSS_KEY(radio-label, radiolabel) CSS_KEY(radio-label, radiolabel)
CSS_KEY(button-focus, buttonfocus) CSS_KEY(button-focus, buttonfocus)
CSS_KEY(media-toolbox, media_toolbox) CSS_KEY(-moz-win-media-toolbox, _moz_win_media_toolbox)
CSS_KEY(communications-toolbox, communications_toolbox) CSS_KEY(-moz-win-communications-toolbox, _moz_win_communications_toolbox)
CSS_KEY(browsertabbar-toolbox, browsertabbar_toolbox) CSS_KEY(-moz-win-browsertabbar-toolbox, _moz_win_browsertabbar_toolbox)
CSS_KEY(-moz-win-mediatext, _moz_win_mediatext) CSS_KEY(-moz-win-mediatext, _moz_win_mediatext)
CSS_KEY(-moz-win-communicationstext, _moz_win_communicationstext) CSS_KEY(-moz-win-communicationstext, _moz_win_communicationstext)

Просмотреть файл

@ -266,9 +266,9 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_menuarrow, NS_THEME_MENUARROW, eCSSKeyword_menuarrow, NS_THEME_MENUARROW,
eCSSKeyword_menuimage, NS_THEME_MENUIMAGE, eCSSKeyword_menuimage, NS_THEME_MENUIMAGE,
eCSSKeyword_menuitemtext, NS_THEME_MENUITEMTEXT, eCSSKeyword_menuitemtext, NS_THEME_MENUITEMTEXT,
eCSSKeyword_media_toolbox, NS_THEME_MEDIA_TOOLBOX, eCSSKeyword__moz_win_media_toolbox, NS_THEME_WIN_MEDIA_TOOLBOX,
eCSSKeyword_communications_toolbox, NS_THEME_COMMUNICATIONS_TOOLBOX, eCSSKeyword__moz_win_communications_toolbox, NS_THEME_WIN_COMMUNICATIONS_TOOLBOX,
eCSSKeyword_browsertabbar_toolbox, NS_THEME_BROWSER_TAB_BAR_TOOLBOX, eCSSKeyword__moz_win_browsertabbar_toolbox, NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX,
eCSSKeyword_UNKNOWN,-1 eCSSKeyword_UNKNOWN,-1
}; };

Просмотреть файл

@ -503,17 +503,17 @@ nsNativeThemeWin::GetTheme(PRUint8 aWidgetType)
mRebarTheme = openTheme(NULL, L"Rebar"); mRebarTheme = openTheme(NULL, L"Rebar");
return mRebarTheme; return mRebarTheme;
} }
case NS_THEME_MEDIA_TOOLBOX: { case NS_THEME_WIN_MEDIA_TOOLBOX: {
if (!mMediaRebarTheme) if (!mMediaRebarTheme)
mMediaRebarTheme = openTheme(NULL, L"Media::Rebar"); mMediaRebarTheme = openTheme(NULL, L"Media::Rebar");
return mMediaRebarTheme; return mMediaRebarTheme;
} }
case NS_THEME_COMMUNICATIONS_TOOLBOX: { case NS_THEME_WIN_COMMUNICATIONS_TOOLBOX: {
if (!mCommunicationsRebarTheme) if (!mCommunicationsRebarTheme)
mCommunicationsRebarTheme = openTheme(NULL, L"Communications::Rebar"); mCommunicationsRebarTheme = openTheme(NULL, L"Communications::Rebar");
return mCommunicationsRebarTheme; return mCommunicationsRebarTheme;
} }
case NS_THEME_BROWSER_TAB_BAR_TOOLBOX: { case NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX: {
if (!mBrowserTabBarRebarTheme) if (!mBrowserTabBarRebarTheme)
mBrowserTabBarRebarTheme = openTheme(NULL, L"BrowserTabBar::Rebar"); mBrowserTabBarRebarTheme = openTheme(NULL, L"BrowserTabBar::Rebar");
return mBrowserTabBarRebarTheme; return mBrowserTabBarRebarTheme;
@ -954,9 +954,9 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
return NS_OK; return NS_OK;
} }
case NS_THEME_TOOLBOX: case NS_THEME_TOOLBOX:
case NS_THEME_MEDIA_TOOLBOX: case NS_THEME_WIN_MEDIA_TOOLBOX:
case NS_THEME_COMMUNICATIONS_TOOLBOX: case NS_THEME_WIN_COMMUNICATIONS_TOOLBOX:
case NS_THEME_BROWSER_TAB_BAR_TOOLBOX: case NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX:
case NS_THEME_STATUSBAR: case NS_THEME_STATUSBAR:
case NS_THEME_SCROLLBAR: case NS_THEME_SCROLLBAR:
case NS_THEME_SCROLLBAR_SMALL: { case NS_THEME_SCROLLBAR_SMALL: {
@ -1459,9 +1459,9 @@ nsNativeThemeWin::GetWidgetBorder(nsIDeviceContext* aContext,
if (!WidgetIsContainer(aWidgetType) || if (!WidgetIsContainer(aWidgetType) ||
aWidgetType == NS_THEME_TOOLBOX || aWidgetType == NS_THEME_TOOLBOX ||
aWidgetType == NS_THEME_MEDIA_TOOLBOX || aWidgetType == NS_THEME_WIN_MEDIA_TOOLBOX ||
aWidgetType == NS_THEME_COMMUNICATIONS_TOOLBOX || aWidgetType == NS_THEME_WIN_COMMUNICATIONS_TOOLBOX ||
aWidgetType == NS_THEME_BROWSER_TAB_BAR_TOOLBOX || aWidgetType == NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX ||
aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_STATUSBAR ||
aWidgetType == NS_THEME_RESIZER || aWidgetType == NS_THEME_TAB_PANEL || aWidgetType == NS_THEME_RESIZER || aWidgetType == NS_THEME_TAB_PANEL ||
aWidgetType == NS_THEME_SCROLLBAR_TRACK_HORIZONTAL || aWidgetType == NS_THEME_SCROLLBAR_TRACK_HORIZONTAL ||
@ -1689,9 +1689,9 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame*
return ClassicGetMinimumWidgetSize(aContext, aFrame, aWidgetType, aResult, aIsOverridable); return ClassicGetMinimumWidgetSize(aContext, aFrame, aWidgetType, aResult, aIsOverridable);
if (aWidgetType == NS_THEME_TOOLBOX || if (aWidgetType == NS_THEME_TOOLBOX ||
aWidgetType == NS_THEME_MEDIA_TOOLBOX || aWidgetType == NS_THEME_WIN_MEDIA_TOOLBOX ||
aWidgetType == NS_THEME_COMMUNICATIONS_TOOLBOX || aWidgetType == NS_THEME_WIN_COMMUNICATIONS_TOOLBOX ||
aWidgetType == NS_THEME_BROWSER_TAB_BAR_TOOLBOX || aWidgetType == NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX ||
aWidgetType == NS_THEME_TOOLBAR || aWidgetType == NS_THEME_TOOLBAR ||
aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_PROGRESSBAR_CHUNK || aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_PROGRESSBAR_CHUNK ||
aWidgetType == NS_THEME_PROGRESSBAR_CHUNK_VERTICAL || aWidgetType == NS_THEME_PROGRESSBAR_CHUNK_VERTICAL ||
@ -1821,9 +1821,9 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
{ {
// Some widget types just never change state. // Some widget types just never change state.
if (aWidgetType == NS_THEME_TOOLBOX || if (aWidgetType == NS_THEME_TOOLBOX ||
aWidgetType == NS_THEME_MEDIA_TOOLBOX || aWidgetType == NS_THEME_WIN_MEDIA_TOOLBOX ||
aWidgetType == NS_THEME_COMMUNICATIONS_TOOLBOX || aWidgetType == NS_THEME_WIN_COMMUNICATIONS_TOOLBOX ||
aWidgetType == NS_THEME_BROWSER_TAB_BAR_TOOLBOX || aWidgetType == NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX ||
aWidgetType == NS_THEME_TOOLBAR || aWidgetType == NS_THEME_TOOLBAR ||
aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_STATUSBAR_PANEL || aWidgetType == NS_THEME_STATUSBAR || aWidgetType == NS_THEME_STATUSBAR_PANEL ||
aWidgetType == NS_THEME_STATUSBAR_RESIZER_PANEL || aWidgetType == NS_THEME_STATUSBAR_RESIZER_PANEL ||