From 97caf0546ff0753edd281f8057d4863fe938785d Mon Sep 17 00:00:00 2001
From: "ramiro%netscape.com" <ramiro%netscape.com>
Date: Mon, 21 Sep 1998 20:50:25 +0000
Subject: [PATCH] Unbreak the taskbar some more.

---
 cmd/xfe/src/Dashboard.cpp | 7 ++++---
 cmd/xfe/src/TaskBar.cpp   | 7 ++++++-
 cmd/xfe/src/TaskBar.h     | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cmd/xfe/src/Dashboard.cpp b/cmd/xfe/src/Dashboard.cpp
index d762529a9ffd..be9f7becf411 100644
--- a/cmd/xfe/src/Dashboard.cpp
+++ b/cmd/xfe/src/Dashboard.cpp
@@ -489,7 +489,6 @@ XFE_Dashboard::createDockedTaskBar()
 	m_dockedTaskBar = new XFE_TaskBar(m_widget,m_parentFrame,False);
 
 	// Add action cb to dashboard
-//	XtAddCallback(m_dockedTaskBar->getBaseWidget(),
 	XtAddCallback(m_dockedTaskBar->getUndockButton(),
 				  XmNactivateCallback,
 				  XFE_Dashboard::floatingActionCB,
@@ -746,7 +745,7 @@ XFE_Dashboard::startFloatingTaskBar(XFE_Frame * parentFrame)
 
 	// Add popup menu post event handler to floating task bar items
 	XfeChildrenAddEventHandler(
-		XFE_Dashboard::m_floatingTaskBar->getBaseWidget(),
+		XFE_Dashboard::m_floatingTaskBar->getToolBar(),
 		ButtonPressMask,
 		True,
 		&XFE_Dashboard::floatingButtonEH,
@@ -838,7 +837,7 @@ XFE_Dashboard::setFloatingTaskBarHorizontal(XP_Bool horizontal)
 	fe_globalPrefs.task_bar_horizontal = horizontal;
 
 	// Update the floating task bar's orientation
-	XtVaSetValues(m_floatingTaskBar->getBaseWidget(),
+	XtVaSetValues(m_floatingTaskBar->getToolBar(),
 				  XmNorientation,horizontal ? XmHORIZONTAL : XmVERTICAL,
 				  NULL);
 }
@@ -1093,6 +1092,8 @@ XFE_Dashboard::floatingActionCB(Widget		/* w */,
 	{
 		return;
 	}
+
+	XFE_Dashboard::unDockTaskBar();
 }
 //////////////////////////////////////////////////////////////////////////
 /* static */ void
diff --git a/cmd/xfe/src/TaskBar.cpp b/cmd/xfe/src/TaskBar.cpp
index 2616011894f9..d315b3c0539d 100644
--- a/cmd/xfe/src/TaskBar.cpp
+++ b/cmd/xfe/src/TaskBar.cpp
@@ -591,7 +591,12 @@ XFE_TaskBar::getUndockButton()
 	return m_undockButton;
 }
 //////////////////////////////////////////////////////////////////////////
-
+Widget
+XFE_TaskBar::getToolBar()
+{
+	return m_toolBar;
+}
+//////////////////////////////////////////////////////////////////////////
 XFE_CALLBACK_DEFN(XFE_TaskBar,updateIconAppearance)
 	(XFE_NotificationCenter *	/*obj*/, 
 	 void *						/*clientData*/, 
diff --git a/cmd/xfe/src/TaskBar.h b/cmd/xfe/src/TaskBar.h
index 35b29c529489..4136ecbde342 100644
--- a/cmd/xfe/src/TaskBar.h
+++ b/cmd/xfe/src/TaskBar.h
@@ -62,6 +62,7 @@ public:
 	Cardinal	numEnabledButtons			();
 	
 	Widget		getUndockButton				();
+	Widget		getToolBar					();
 
 private: