Fix mac bustage -- conflict with a mac system header
This commit is contained in:
akkana%netscape.com
Родитель
b0f647ae91
Коммит
5450e7fb31
|
|
@ -1,8 +1,8 @@
|
|||
/* -*- sode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
/* -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you say not use this file
|
||||
* except in compliance with the License. You say obtain a copy of
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is sozilla.org code.
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
|
|
@ -30,143 +30,143 @@ NS_IMPL_ISUPPORTS1(nsXPLookAndFeel, nsILookAndFeel)
|
|||
|
||||
nsLookAndFeelIntPref nsXPLookAndFeel::sIntPrefs[] =
|
||||
{
|
||||
{ "ui.windowTitleHeight", eMetric_WindowTitleHeight, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.windowBorderWidth", eMetric_WindowBorderWidth, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.windowBorderHeight", eMetric_WindowBorderHeight, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.widget3DBorder", eMetric_Widget3DBorder, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.textFieldBorder", eMetric_TextFieldBorder, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.textFieldHeight", eMetric_TextFieldHeight, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.windowTitleHeight", eMetric_WindowTitleHeight, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.windowBorderWidth", eMetric_WindowBorderWidth, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.windowBorderHeight", eMetric_WindowBorderHeight, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.widget3DBorder", eMetric_Widget3DBorder, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.textFieldBorder", eMetric_TextFieldBorder, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.textFieldHeight", eMetric_TextFieldHeight, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.buttonHorizontalInsidePaddingNavQuirks",
|
||||
eMetric_ButtonHorizontalInsidePaddingNavQuirks, PR_FALSE, typeInt, 0 },
|
||||
eMetric_ButtonHorizontalInsidePaddingNavQuirks, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.buttonHorizontalInsidePaddingOffsetNavQuirks",
|
||||
eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.checkboxSize", eMetric_CheckboxSize, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.radioboxSize", eMetric_RadioboxSize, PR_FALSE, typeInt, 0 },
|
||||
eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.checkboxSize", eMetric_CheckboxSize, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.radioboxSize", eMetric_RadioboxSize, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.textHorizontalInsideMinimumPadding",
|
||||
eMetric_TextHorizontalInsideMinimumPadding, PR_FALSE, typeInt, 0 },
|
||||
eMetric_TextHorizontalInsideMinimumPadding, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.textVerticalInsidePadding", eMetric_TextVerticalInsidePadding,
|
||||
PR_FALSE, typeInt, 0 },
|
||||
PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.textShouldUseVerticalInsidePadding",
|
||||
eMetric_TextShouldUseVerticalInsidePadding, PR_FALSE, typeInt, 0 },
|
||||
eMetric_TextShouldUseVerticalInsidePadding, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.textShouldUseHorizontalInsideMinimumPadding",
|
||||
eMetric_TextShouldUseHorizontalInsideMinimumPadding, PR_FALSE, typeInt, 0 },
|
||||
eMetric_TextShouldUseHorizontalInsideMinimumPadding, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.listShouldUseHorizontalInsideMinimumPadding",
|
||||
eMetric_ListShouldUseHorizontalInsideMinimumPadding, PR_FALSE, typeInt, 0 },
|
||||
eMetric_ListShouldUseHorizontalInsideMinimumPadding, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.listHorizontalInsideMinimumPadding",
|
||||
eMetric_ListHorizontalInsideMinimumPadding, PR_FALSE, typeInt, 0 },
|
||||
eMetric_ListHorizontalInsideMinimumPadding, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.listShouldUseVerticalInsidePadding",
|
||||
eMetric_ListShouldUseVerticalInsidePadding, PR_FALSE, typeInt, 0 },
|
||||
eMetric_ListShouldUseVerticalInsidePadding, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.listVerticalInsidePadding", eMetric_ListVerticalInsidePadding,
|
||||
PR_FALSE, typeInt, 0 },
|
||||
{ "ui.caretBlinkTime", eMetric_CaretBlinkTime, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.caretWidthTwips", eMetric_CaretWidthTwips, PR_FALSE, typeInt, 0 },
|
||||
{ "ui.submenuDelay", eMetric_SubmenuDelay, PR_FALSE, typeInt, 0 },
|
||||
PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.caretBlinkTime", eMetric_CaretBlinkTime, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.caretWidthTwips", eMetric_CaretWidthTwips, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.submenuDelay", eMetric_SubmenuDelay, PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
{ "ui.menusCanOverlapOSBar", eMetric_MenusCanOverlapOSBar,
|
||||
PR_FALSE, typeInt, 0 },
|
||||
PR_FALSE, nsLookAndFeelTypeInt, 0 },
|
||||
};
|
||||
|
||||
nsLookAndFeelFloatPref nsXPLookAndFeel::sFloatPrefs[] =
|
||||
{
|
||||
{ "ui.textFieldVerticalInsidePadding",
|
||||
eMetricFloat_TextFieldVerticalInsidePadding, PR_FALSE, typeFloat, 0 },
|
||||
eMetricFloat_TextFieldVerticalInsidePadding, PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.textFieldHorizontalInsidePadding",
|
||||
eMetricFloat_TextFieldHorizontalInsidePadding, PR_FALSE, typeFloat, 0 },
|
||||
eMetricFloat_TextFieldHorizontalInsidePadding, PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.textAreaVerticalInsidePadding", eMetricFloat_TextAreaVerticalInsidePadding,
|
||||
PR_FALSE, typeFloat, 0 },
|
||||
PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.textAreaHorizontalInsidePadding",
|
||||
eMetricFloat_TextAreaHorizontalInsidePadding, PR_FALSE, typeFloat, 0 },
|
||||
eMetricFloat_TextAreaHorizontalInsidePadding, PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.listVerticalInsidePadding",
|
||||
eMetricFloat_ListVerticalInsidePadding, PR_FALSE, typeFloat, 0 },
|
||||
eMetricFloat_ListVerticalInsidePadding, PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.listHorizontalInsidePadding",
|
||||
eMetricFloat_ListHorizontalInsidePadding, PR_FALSE, typeFloat, 0 },
|
||||
eMetricFloat_ListHorizontalInsidePadding, PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.buttonVerticalInsidePadding", eMetricFloat_ButtonVerticalInsidePadding,
|
||||
PR_FALSE, typeFloat, 0 },
|
||||
PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
{ "ui.buttonHorizontalInsidePadding", eMetricFloat_ButtonHorizontalInsidePadding,
|
||||
PR_FALSE, typeFloat, 0 },
|
||||
PR_FALSE, nsLookAndFeelTypeFloat, 0 },
|
||||
};
|
||||
|
||||
nsLookAndFeelColorPref nsXPLookAndFeel::sColorPrefs[] =
|
||||
{
|
||||
{ "ui.windowBackground",
|
||||
eColor_WindowBackground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_WindowBackground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.windowForeground",
|
||||
eColor_WindowForeground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_WindowForeground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.widgetBackground",
|
||||
eColor_WidgetBackground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_WidgetBackground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.widgetForeground",
|
||||
eColor_WidgetForeground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_WidgetForeground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.widgetSelectBackground",
|
||||
eColor_WidgetSelectBackground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_WidgetSelectBackground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.widgetSelectForeground",
|
||||
eColor_WidgetSelectForeground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_WidgetSelectForeground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.widget3DHighlight",
|
||||
eColor_Widget3DHighlight, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_Widget3DHighlight, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.widget3DShadow",
|
||||
eColor_Widget3DShadow, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_Widget3DShadow, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.textBackground",
|
||||
eColor_TextBackground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_TextBackground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.textForeground",
|
||||
eColor_TextForeground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_TextForeground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.textSelectBackground",
|
||||
eColor_TextSelectBackground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_TextSelectBackground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.textSelectForeground",
|
||||
eColor_TextSelectForeground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_TextSelectForeground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.activeborder",
|
||||
eColor_activeborder, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_activeborder, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.activecaption",
|
||||
eColor_activecaption, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_activecaption, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.appworkspace",
|
||||
eColor_appworkspace, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_appworkspace, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.background",
|
||||
eColor_background, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_background, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.captiontext",
|
||||
eColor_captiontext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_captiontext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.graytext",
|
||||
eColor_graytext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_graytext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.highlight",
|
||||
eColor_highlight, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_highlight, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.highlighttext",
|
||||
eColor_highlighttext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_highlighttext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.inactiveborder",
|
||||
eColor_inactiveborder, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_inactiveborder, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.inactivecaption",
|
||||
eColor_inactivecaption, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_inactivecaption, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.inactivecaptiontext",
|
||||
eColor_inactivecaptiontext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_inactivecaptiontext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.infobackground",
|
||||
eColor_infobackground, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_infobackground, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.infotext",
|
||||
eColor_infotext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_infotext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.menu",
|
||||
eColor_menu, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_menu, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.menutext",
|
||||
eColor_menutext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_menutext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.scrollbar",
|
||||
eColor_scrollbar, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_scrollbar, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.threedface",
|
||||
eColor_threedface, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_threedface, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.buttonface",
|
||||
eColor_buttonface, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_buttonface, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.buttonhighlight",
|
||||
eColor_buttonhighlight, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_buttonhighlight, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.threedhighlight",
|
||||
eColor_threedhighlight, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_threedhighlight, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.buttontext",
|
||||
eColor_buttontext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_buttontext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.buttonshadow",
|
||||
eColor_buttonshadow, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_buttonshadow, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.threeddarkshadow",
|
||||
eColor_threeddarkshadow, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_threeddarkshadow, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.threedshadow",
|
||||
eColor_threedshadow, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_threedshadow, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.threedlightshadow",
|
||||
eColor_threedlightshadow, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_threedlightshadow, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.window",
|
||||
eColor_window, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_window, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.windowframe",
|
||||
eColor_windowframe, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_windowframe, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
{ "ui.windowtext",
|
||||
eColor_windowtext, PR_FALSE, typeColor, (nscolor)0 },
|
||||
eColor_windowtext, PR_FALSE, nsLookAndFeelTypeColor, (nscolor)0 },
|
||||
};
|
||||
|
||||
PRBool nsXPLookAndFeel::sInitialized = PR_FALSE;
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
#include "nsIPref.h"
|
||||
|
||||
typedef enum nsLookAndFeelType {
|
||||
typeInt,
|
||||
typeFloat,
|
||||
typeColor
|
||||
nsLookAndFeelTypeInt,
|
||||
nsLookAndFeelTypeFloat,
|
||||
nsLookAndFeelTypeColor
|
||||
};
|
||||
|
||||
struct nsLookAndFeelIntPref
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче