From 1a3600fea2f058c662c8d5f2db1f177e886d5905 Mon Sep 17 00:00:00 2001 From: "blizzard%redhat.com" Date: Wed, 28 Jul 1999 02:02:21 +0000 Subject: [PATCH] fix UMRs as reported by the great and powerful bruce. this closes bug 10625. --- widget/src/xlib/nsScrollBar.cpp | 4 ++++ widget/src/xlib/nsWidget.cpp | 1 + widget/src/xlib/nsWindow.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/widget/src/xlib/nsScrollBar.cpp b/widget/src/xlib/nsScrollBar.cpp index 72cb84435434..b5f5ed0dca11 100644 --- a/widget/src/xlib/nsScrollBar.cpp +++ b/widget/src/xlib/nsScrollBar.cpp @@ -260,6 +260,8 @@ void nsScrollbar::CreateNative(Window aParent, nsRect aRect) NS_IMETHODIMP nsScrollbar::Show(PRBool bState) { + PR_LOG(XlibScrollbarLM, PR_LOG_DEBUG, ("nsScrollbar::Show(): %s\n", + (bState == PR_TRUE) ? "true" : "false")); nsWidget::Show(bState); if (bState) { if (mBar) { @@ -314,6 +316,8 @@ nsresult nsScrollbar::NextPage(void) sevent.widget = (nsWidget *)this; sevent.eventStructType = NS_SCROLLBAR_EVENT; sevent.position = (mPosition); + sevent.point.x = 0; + sevent.point.y = 0; // send the event result = ConvertStatus((*mEventCallback) (&sevent)); // the gtk code indicates that the callback can diff --git a/widget/src/xlib/nsWidget.cpp b/widget/src/xlib/nsWidget.cpp index 3454942edfc2..44d589817555 100644 --- a/widget/src/xlib/nsWidget.cpp +++ b/widget/src/xlib/nsWidget.cpp @@ -76,6 +76,7 @@ nsWidget::nsWidget() : nsBaseWidget() mBaseWindow = 0; mBackground = NS_RGB(192, 192, 192); + mBorderRGB = NS_RGB(192, 192, 192); mBackgroundPixel = xlib_rgb_xpixel_from_rgb(mBackground); mBackground = NS_RGB(192, 192, 192); mBorderPixel = xlib_rgb_xpixel_from_rgb(mBorderRGB); diff --git a/widget/src/xlib/nsWindow.cpp b/widget/src/xlib/nsWindow.cpp index 5b005ba23810..366108ab5fb2 100644 --- a/widget/src/xlib/nsWindow.cpp +++ b/widget/src/xlib/nsWindow.cpp @@ -26,7 +26,7 @@ nsWindow::nsWindow() : nsWidget() mName = "nsWindow"; mBackground = NS_RGB(255, 255, 255); mBackgroundPixel = xlib_rgb_xpixel_from_rgb(mBackground); - mBackground = NS_RGB(255, 255, 255); + mBorderRGB = NS_RGB(255,255,255); mBorderPixel = xlib_rgb_xpixel_from_rgb(mBorderRGB); }