From 8e2e7cc31d43ecd191cb3e7cec81de9f6e68dcb6 Mon Sep 17 00:00:00 2001
From: "ramiro%netscape.com"
 <ramiro%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 12 Oct 1998 14:36:51 +0000
Subject: [PATCH] Move setItemLabelString() to XFE_RDFUtils.

git-svn-id: svn://10.0.0.236/trunk@12574 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/cmd/xfe/src/RDFMenuToolbarBase.cpp | 29 ++-------------------
 mozilla/cmd/xfe/src/RDFMenuToolbarBase.h   |  1 -
 mozilla/cmd/xfe/src/RDFToolbar.cpp         |  4 +--
 mozilla/cmd/xfe/src/RDFUtils.cpp           | 30 ++++++++++++++++++++++
 mozilla/cmd/xfe/src/RDFUtils.h             |  5 ++++
 5 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/mozilla/cmd/xfe/src/RDFMenuToolbarBase.cpp b/mozilla/cmd/xfe/src/RDFMenuToolbarBase.cpp
index f69a7825c0e..70ed5facda8 100644
--- a/mozilla/cmd/xfe/src/RDFMenuToolbarBase.cpp
+++ b/mozilla/cmd/xfe/src/RDFMenuToolbarBase.cpp
@@ -677,7 +677,7 @@ XFE_RDFMenuToolbarBase::createCascadeButton(Widget        menu,
                               &pulldown);
 
     // Set the item's label
-    setItemLabelString(cascade,entry);
+    XFE_RDFUtils::setItemLabelString(_frame->getContext(),cascade,entry);
     
     // Configure the new cascade button
     if (_fancyItems)
@@ -774,7 +774,7 @@ XFE_RDFMenuToolbarBase::createPushButton(Widget menu, HT_Resource entry)
     }
 
     // Set the item's label
-    setItemLabelString(button,entry);
+    XFE_RDFUtils::setItemLabelString(_frame->getContext(),button,entry);
 
     // Create a new bookmark data structure for the callbacks
     data = XP_NEW_ZAP(ItemCallbackStruct);
@@ -1086,31 +1086,6 @@ XFE_RDFMenuToolbarBase::getDropLastAccess()
     return _dropLastAccess;
 }
 //////////////////////////////////////////////////////////////////////////
-
-void 
-XFE_RDFMenuToolbarBase::setItemLabelString(Widget item,HT_Resource entry)
-{
-    XP_ASSERT( XfeIsAlive(item) );
-    XP_ASSERT( entry != NULL );
-    XP_ASSERT( XmIsLabel(item) || 
-               XmIsLabelGadget(item) ||
-               XfeIsLabel(item) );
-
-    MWContext * context = _frame->getContext();
-    INTL_CharSetInfo charSetInfo =
-        LO_GetDocumentCharacterSetInfo(context);
-
-    // Create am XmString from the entry
-    XmString xmname = XFE_RDFUtils::entryToXmString(entry, charSetInfo);
-
-    if (xmname != NULL)
-    {
-        XtVaSetValues(item,XmNlabelString,xmname,NULL);
-
-        XmStringFree(xmname);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
 void
 XFE_RDFMenuToolbarBase::getStyleAndLayout(HT_Resource  entry, int32 * toolbar_style, unsigned char * layout)
 {
diff --git a/mozilla/cmd/xfe/src/RDFMenuToolbarBase.h b/mozilla/cmd/xfe/src/RDFMenuToolbarBase.h
index cbb5a16b53c..fe4a87485b2 100644
--- a/mozilla/cmd/xfe/src/RDFMenuToolbarBase.h
+++ b/mozilla/cmd/xfe/src/RDFMenuToolbarBase.h
@@ -144,7 +144,6 @@ protected:
     HT_Resource getMenuFolder         ();
 	XP_Bool		getOnlyHeaders		  ();
 
-    void        setItemLabelString    (Widget menu, HT_Resource entry);
     void getStyleAndLayout(HT_Resource , int32 *, unsigned char * );
 
     // Item callbacks
diff --git a/mozilla/cmd/xfe/src/RDFToolbar.cpp b/mozilla/cmd/xfe/src/RDFToolbar.cpp
index 3a3382da090..42836f4ccb0 100644
--- a/mozilla/cmd/xfe/src/RDFToolbar.cpp
+++ b/mozilla/cmd/xfe/src/RDFToolbar.cpp
@@ -465,7 +465,7 @@ XFE_RDFToolbar::createXfeButton(Widget parent,HT_Resource entry)
     button = XfeCreateButton(parent,"bookmarkButton",av,ac);
 
     // Set the item's label
-    setItemLabelString(button,entry);
+    XFE_RDFUtils::setItemLabelString(_frame->getContext(),button,entry);
 
     configureXfeButton(button,entry);
 
@@ -540,7 +540,7 @@ XFE_RDFToolbar::createXfeCascade(Widget parent,HT_Resource entry)
 
     
     // Set the item's label
-    setItemLabelString(cascade,entry);
+    XFE_RDFUtils::setItemLabelString(_frame->getContext(),cascade,entry);
 
     configureXfeCascade(cascade,entry);
 
diff --git a/mozilla/cmd/xfe/src/RDFUtils.cpp b/mozilla/cmd/xfe/src/RDFUtils.cpp
index 454d5972123..00c2248c017 100644
--- a/mozilla/cmd/xfe/src/RDFUtils.cpp
+++ b/mozilla/cmd/xfe/src/RDFUtils.cpp
@@ -35,6 +35,10 @@
 
 #include "xfe.h"			// For fe_FormatDocTitle()
 
+#include <Xfe/Xfe.h>		// For XfeIsAlive()
+#include <Xfe/Label.h>		// For XfeIsLabel()
+#include <Xm/Label.h>		// For XmIsLabel()
+
 //////////////////////////////////////////////////////////////////////////
 //
 // XFE Command utilities
@@ -386,3 +390,29 @@ XFE_RDFUtils::getStringFromResource(MWContext *		context,
     return xmname;
 }
 //////////////////////////////////////////////////////////////////////////
+/* static */ void 
+XFE_RDFUtils::setItemLabelString(MWContext *	context,
+								 Widget			item,
+								 HT_Resource	entry)
+{
+    XP_ASSERT( XfeIsAlive(item) );
+ 
+   XP_ASSERT( entry != NULL );
+
+    XP_ASSERT( XmIsLabel(item) || 
+               XmIsLabelGadget(item) ||
+               XfeIsLabel(item) );
+
+    INTL_CharSetInfo charSetInfo = LO_GetDocumentCharacterSetInfo(context);
+
+    // Create am XmString from the entry
+    XmString xmname = XFE_RDFUtils::entryToXmString(entry,charSetInfo);
+	
+    if (xmname != NULL)
+    {
+        XtVaSetValues(item,XmNlabelString,xmname,NULL);
+		
+        XmStringFree(xmname);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/cmd/xfe/src/RDFUtils.h b/mozilla/cmd/xfe/src/RDFUtils.h
index 9bf590141bb..2ae44ab5a3c 100644
--- a/mozilla/cmd/xfe/src/RDFUtils.h
+++ b/mozilla/cmd/xfe/src/RDFUtils.h
@@ -99,6 +99,11 @@ public:
 	static XmString	getStringFromResource	(MWContext *		context,
 											 HT_Resource		entry);
 
+
+	// Set the XmNlabelString for a widget
+	static void		setItemLabelString		(MWContext *	context,
+											 Widget			item,
+											 HT_Resource	entry);
 };
 
 #endif // _xfe_rdf_utils_h_