diff --git a/widget/public/nsILookAndFeel.h b/widget/public/nsILookAndFeel.h index d70a419c85db..093288156514 100644 --- a/widget/public/nsILookAndFeel.h +++ b/widget/public/nsILookAndFeel.h @@ -44,10 +44,10 @@ struct nsSize; -// {CE295E90-FF53-4013-96AE-67B5762292A9} +// {BEC234D0-AAA5-430D-8435-B10100F78003} #define NS_ILOOKANDFEEL_IID \ -{ 0xce295e90, 0xff53, 0x4013, \ - { 0x96, 0xae, 0x67, 0xb5, 0x76, 0x22, 0x92, 0xa9 } } +{ 0xbec234d0, 0xaaa5, 0x430d, \ + { 0x84, 0x35, 0xb1, 0x01, 0x00, 0xf7, 0x80, 0x03} } class nsILookAndFeel: public nsISupports { @@ -199,9 +199,6 @@ public: eMetric_ScrollArrowStyle, // position of scroll arrows in a scrollbar eMetric_ScrollSliderStyle, // is scroll thumb proportional or fixed? - eMetric_ScrollbarWidth, // width of a vertical scrollbar - eMetric_ScrollbarHeight, // height of horizontal scrollbar - eMetric_ScrollButtonLeftMouseButtonAction, // each button can take one of four values: eMetric_ScrollButtonMiddleMouseButtonAction, // 0 - scrolls one line, 1 - scrolls one page eMetric_ScrollButtonRightMouseButtonAction, // 2 - scrolls to end, 3 - button ignored diff --git a/widget/src/cocoa/nsLookAndFeel.mm b/widget/src/cocoa/nsLookAndFeel.mm index e0f4c9515bd8..0f8f25698cd7 100644 --- a/widget/src/cocoa/nsLookAndFeel.mm +++ b/widget/src/cocoa/nsLookAndFeel.mm @@ -531,14 +531,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric) case eMetric_DragThresholdY: aMetric = 4; break; - case eMetric_ScrollbarHeight: // height of horizontal scrollbar - case eMetric_ScrollbarWidth: // width of vertical scrollbar - // It would be nice to use the native metric function, but we have always - // used 16 before and it returns 15. We should make the change, but with a - // complete audit to make sure things match up. - // ::GetThemeMetric(kThemeMetricScrollBarWidth, (SInt32*)&aMetric); - aMetric = 16; - break; case eMetric_ScrollArrowStyle: ThemeScrollBarArrowStyle arrowStyle; ::GetThemeScrollBarArrowStyle ( &arrowStyle ); diff --git a/widget/src/gtk2/nsLookAndFeel.cpp b/widget/src/gtk2/nsLookAndFeel.cpp index c4a5dd155701..0a71b7751f0b 100644 --- a/widget/src/gtk2/nsLookAndFeel.cpp +++ b/widget/src/gtk2/nsLookAndFeel.cpp @@ -509,14 +509,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric) case eMetric_ScrollSliderStyle: aMetric = eMetric_ScrollThumbStyleProportional; break; - case eMetric_ScrollbarWidth: - case eMetric_ScrollbarHeight: - { - MozGtkScrollbarMetrics metrics; - moz_gtk_get_scrollbar_metrics(&metrics); - aMetric = metrics.stepper_size; - } - break; case eMetric_TreeOpenDelay: aMetric = 1000; break; diff --git a/widget/src/mac/nsLookAndFeel.cpp b/widget/src/mac/nsLookAndFeel.cpp index d5f89e090119..5b973fc515a0 100644 --- a/widget/src/mac/nsLookAndFeel.cpp +++ b/widget/src/mac/nsLookAndFeel.cpp @@ -546,14 +546,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric) case eMetric_DragThresholdY: aMetric = 4; break; - case eMetric_ScrollbarHeight: // height of horizontal scrollbar - case eMetric_ScrollbarWidth: // width of vertical scrollbar - // It would be nice to use the native metric function, but we have always - // used 16 before and it returns 15. We should make the change, but with a - // complete audit to make sure things match up. - // ::GetThemeMetric(kThemeMetricScrollBarWidth, (SInt32*)&aMetric); - aMetric = 16; - break; case eMetric_ScrollArrowStyle: ThemeScrollBarArrowStyle arrowStyle; ::GetThemeScrollBarArrowStyle ( &arrowStyle ); diff --git a/widget/src/windows/nsLookAndFeel.cpp b/widget/src/windows/nsLookAndFeel.cpp index e475bb835e49..5734fec74f9a 100644 --- a/widget/src/windows/nsLookAndFeel.cpp +++ b/widget/src/windows/nsLookAndFeel.cpp @@ -423,12 +423,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric) case eMetric_ScrollSliderStyle: aMetric = eMetric_ScrollThumbStyleProportional; break; - case eMetric_ScrollbarHeight: - aMetric = ::GetSystemMetrics(SM_CXVSCROLL); - break; - case eMetric_ScrollbarWidth: - aMetric = ::GetSystemMetrics(SM_CXHSCROLL); - break; case eMetric_TreeOpenDelay: aMetric = 1000; break;