From e691506671ffabca2f6dd0a3210a7f31d55d1110 Mon Sep 17 00:00:00 2001
From: "pinkerton%netscape.com" <pinkerton%netscape.com>
Date: Thu, 18 Feb 1999 19:28:00 +0000
Subject: [PATCH] fix types and remember to initialize the grippy last
 highlight to none at creation. Fixes a problem where the first grippy in the
 toolbar was being drawn highlighted at create time.

---
 layout/xul/base/src/nsToolboxFrame.cpp | 2 +-
 layout/xul/base/src/nsToolboxFrame.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/xul/base/src/nsToolboxFrame.cpp b/layout/xul/base/src/nsToolboxFrame.cpp
index 73f33ad4c06a..92592bbc19c5 100644
--- a/layout/xul/base/src/nsToolboxFrame.cpp
+++ b/layout/xul/base/src/nsToolboxFrame.cpp
@@ -83,7 +83,7 @@ NS_NewToolboxFrame ( nsIFrame*& aNewFrame )
 // Init, if necessary
 //
 nsToolboxFrame :: nsToolboxFrame ( )
-  : mSumOfToolbarHeights(0), mNumToolbars(0)
+  : mSumOfToolbarHeights(0), mNumToolbars(0), mGrippyHilighted(kNoGrippyHilighted)
 {
 	//*** anything?
 }
diff --git a/layout/xul/base/src/nsToolboxFrame.h b/layout/xul/base/src/nsToolboxFrame.h
index 8449fe43a8dc..4a8e9707399e 100644
--- a/layout/xul/base/src/nsToolboxFrame.h
+++ b/layout/xul/base/src/nsToolboxFrame.h
@@ -111,10 +111,10 @@ protected:
   nsCOMPtr<nsIStyleContext>    mGrippyNormalStyle;
   nsCOMPtr<nsIStyleContext>    mGrippyRolloverStyle;
   
-  PRUint32 mSumOfToolbarHeights;
+  unsigned long mSumOfToolbarHeights;
   TabInfo  mGrippies[10];          //*** make this a list or something!!!!!!
-  PRUint32 mNumToolbars;
-  PRUint32 mGrippyHilighted;     // used to indicate which grippy the mouse is inside
+  unsigned short mNumToolbars;
+  short mGrippyHilighted;          // used to indicate which grippy the mouse is inside
 
     // pass-by-value not allowed for a toolbox because it corresponds 1-to-1
     // with an element in the UI.