From c36a23d33032846f0b1f6b9efd1b618be6d012b7 Mon Sep 17 00:00:00 2001
From: Rob Arnold <robarnold@cmu.edu>
Date: Mon, 5 Oct 2009 22:56:54 -0400
Subject: [PATCH] Bustage fix for rev 5d4df2ddcc20

---
 widget/src/windows/TaskbarWindowPreview.cpp | 12 ++++++------
 widget/src/windows/TaskbarWindowPreview.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/widget/src/windows/TaskbarWindowPreview.cpp b/widget/src/windows/TaskbarWindowPreview.cpp
index 2219e984a3a0..e511d333e01a 100644
--- a/widget/src/windows/TaskbarWindowPreview.cpp
+++ b/widget/src/windows/TaskbarWindowPreview.cpp
@@ -70,7 +70,7 @@ TaskbarWindowPreview::TaskbarWindowPreview(ITaskbarList4 *aTaskbar, nsITaskbarPr
   (void) SetVisible(PR_TRUE);
 
   memset(mThumbButtons, 0, sizeof mThumbButtons);
-  for (PRInt32 i = 0; i < nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS; i++) {
+  for (PRInt32 i = 0; i < nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS; i++) {
     mThumbButtons[i].dwMask = THB_FLAGS | THB_ICON | THB_TOOLTIP;
     mThumbButtons[i].iId = i;
     mThumbButtons[i].dwFlags = THBF_HIDDEN;
@@ -98,7 +98,7 @@ TaskbarWindowPreview::PreviewWindow() {
 
 nsresult
 TaskbarWindowPreview::GetButton(PRUint32 index, nsITaskbarPreviewButton **_retVal) {
-  if (index >= nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS)
+  if (index >= nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS)
     return NS_ERROR_INVALID_ARG;
 
   nsCOMPtr<nsITaskbarPreviewButton> button(do_QueryReferent(mWeakButtons[index]));
@@ -118,7 +118,7 @@ TaskbarWindowPreview::GetButton(PRUint32 index, nsITaskbarPreviewButton **_retVa
     WindowHook &hook = GetWindowHook();
     (void) hook.AddHook(WM_COMMAND, WindowHookProc, this);
 
-    if (mVisible && FAILED(mTaskbar->ThumbBarAddButtons(mWnd, nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS, mThumbButtons))) {
+    if (mVisible && FAILED(mTaskbar->ThumbBarAddButtons(mWnd, nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS, mThumbButtons))) {
       return NS_ERROR_FAILURE;
     }
   }
@@ -153,7 +153,7 @@ TaskbarWindowPreview::GetEnableCustomDrawing(PRBool *aEnable) {
 nsresult
 TaskbarWindowPreview::UpdateTaskbarProperties() {
   if (mHaveButtons) {
-    if (FAILED(mTaskbar->ThumbBarAddButtons(mWnd, nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS, mThumbButtons)))
+    if (FAILED(mTaskbar->ThumbBarAddButtons(mWnd, nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS, mThumbButtons)))
       return NS_ERROR_FAILURE;
   }
   return TaskbarPreview::UpdateTaskbarProperties();
@@ -214,14 +214,14 @@ nsresult
 TaskbarWindowPreview::UpdateButtons() {
   NS_ASSERTION(mVisible, "UpdateButtons called on invisible preview");
 
-  if (FAILED(mTaskbar->ThumbBarUpdateButtons(mWnd, nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS, mThumbButtons)))
+  if (FAILED(mTaskbar->ThumbBarUpdateButtons(mWnd, nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS, mThumbButtons)))
     return NS_ERROR_FAILURE;
   return NS_OK;
 }
 
 nsresult
 TaskbarWindowPreview::UpdateButton(PRUint32 index) {
-  if (index >= nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS)
+  if (index >= nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS)
     return NS_ERROR_INVALID_ARG;
   if (mVisible) {
     if (FAILED(mTaskbar->ThumbBarUpdateButtons(mWnd, 1, &mThumbButtons[index])))
diff --git a/widget/src/windows/TaskbarWindowPreview.h b/widget/src/windows/TaskbarWindowPreview.h
index 205d61e8ba74..73b30d70cd28 100644
--- a/widget/src/windows/TaskbarWindowPreview.h
+++ b/widget/src/windows/TaskbarWindowPreview.h
@@ -80,9 +80,9 @@ private:
   // Have we made any buttons?
   PRBool                  mHaveButtons;
   // Windows button format
-  THUMBBUTTON             mThumbButtons[nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS];
+  THUMBBUTTON             mThumbButtons[nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS];
   // Pointers to our button class (cached instances)
-  nsWeakPtr               mWeakButtons[nsITaskbarWindowPreview::MAX_TOOLBAR_BUTTONS];
+  nsWeakPtr               mWeakButtons[nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS];
 
   friend class TaskbarPreviewButton;
 };