From 928ee0a02c69dbd014ec6df04fd6b21dfa74bb7b Mon Sep 17 00:00:00 2001
From: "disttsc%bart.nl" <disttsc%bart.nl@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 9 Dec 2000 01:07:59 +0000
Subject: [PATCH] Remove more dead titledbutton code, bug=57751, r=pinkerton,
 r=evaughan, a=brendan

git-svn-id: svn://10.0.0.236/trunk@83417 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/xul/base/src/nsSliderFrame.cpp | 45 -------------------
 .../xul/base/src/nsToolbarDragListener.cpp    |  3 +-
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
index 399a525af34..4633f0d4419 100644
--- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
@@ -51,7 +51,6 @@
 #include "nsIViewManager.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsDocument.h"
-#include "nsTitledButtonFrame.h"
 #include "nsScrollbarButtonFrame.h"
 #include "nsIScrollbarListener.h"
 #include "nsIScrollbarMediator.h"
@@ -1111,50 +1110,6 @@ NS_IMETHODIMP_(void) nsSliderFrame::Notify(nsITimer *timer)
     }
 }
 
-/*
-class nsThumbFrame : public nsTitledButtonFrame
-{
-public:
-
-  friend nsresult NS_NewThumbFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame);
-
-  NS_IMETHOD HandlePress(nsIPresContext* aPresContext,
-                         nsGUIEvent *    aEvent,
-                         nsEventStatus*  aEventStatus) { return NS_OK; }
-
-  NS_IMETHOD HandleMultiplePress(nsIPresContext* aPresContext,
-                         nsGUIEvent *    aEvent,
-                         nsEventStatus*  aEventStatus)  { return NS_OK; }
-
-  NS_IMETHOD HandleDrag(nsIPresContext* aPresContext,
-                        nsGUIEvent *    aEvent,
-                        nsEventStatus*  aEventStatus)  { return NS_OK; }
-
-  NS_IMETHOD HandleRelease(nsIPresContext* aPresContext,
-                           nsGUIEvent *    aEvent,
-                           nsEventStatus*  aEventStatus)  { return NS_OK; }
-
-  nsThumbFrame(nsIPresShell* aPresShell):nsTitledButtonFrame(aPresShell) {}
-};
-
-
-nsresult
-NS_NewThumbFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame)
-{
-  NS_PRECONDITION(aNewFrame, "null OUT ptr");
-  if (nsnull == aNewFrame) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  nsThumbFrame* it = new (aPresShell) nsThumbFrame(aPresShell);
-  if (nsnull == it)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  *aNewFrame = it;
-  return NS_OK;
-  
-} // NS_NewSliderFrame
-*/
-
 NS_INTERFACE_MAP_BEGIN(nsSliderMediator)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMouseListener)
   NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
diff --git a/mozilla/layout/xul/base/src/nsToolbarDragListener.cpp b/mozilla/layout/xul/base/src/nsToolbarDragListener.cpp
index 9067cede204..6b27f7e498c 100644
--- a/mozilla/layout/xul/base/src/nsToolbarDragListener.cpp
+++ b/mozilla/layout/xul/base/src/nsToolbarDragListener.cpp
@@ -194,8 +194,7 @@ nsToolbarDragListener :: ItemMouseIsOver ( nsIDOMEvent* aDragEvent, nscoord* out
         content->GetTag(*getter_AddRefs(tag));
 
         // for now I am checking for both titlebutton and toolbar items
-        // XXX but the check for titlebutton should be removed in the future
-        if (tag.get() == nsXULAtoms::titledbutton || tag.get() == nsXULAtoms::toolbaritem) {
+        if (tag.get() == nsXULAtoms::toolbaritem) {
 
           // now check if item is a container
           PRBool isContainer = PR_FALSE;