This commit was manufactured by cvs2svn to create branch 'NSCOM20_BRANCH'.

git-svn-id: svn://10.0.0.236/branches/NSCOM20_BRANCH@32006 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -1,219 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ex: set tabstop=8 softtabstop=2 shiftwidth=2 expandtab:
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFontMetricsGTK_h__
-#define nsFontMetricsGTK_h__
-
-#include "nsDeviceContextGTK.h"
-#include "nsIFontMetrics.h"
-#include "nsIFontEnumerator.h"
-#include "nsFont.h"
-#include "nsString.h"
-#include "nsUnitConversion.h"
-#include "nsIDeviceContext.h"
-#include "nsCRT.h"
-#include "nsCOMPtr.h"
-#include "nsRenderingContextGTK.h"
-#include "nsICharRepresentable.h"
-
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
-#undef FONT_HAS_GLYPH
-#define FONT_HAS_GLYPH(map, char) IS_REPRESENTABLE(map, char)
-
-typedef struct nsFontCharSetInfo nsFontCharSetInfo;
-
-typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
-  XFontStruct* aFont, const PRUnichar* aSrcBuf, PRInt32 aSrcLen,
-  char* aDestBuf, PRInt32 aDestLen);
-
-struct nsFontCharSet;
-struct nsFontFamily;
-struct nsFontNode;
-struct nsFontStretch;
-
-class nsFontGTKUserDefined;
-class nsFontMetricsGTK;
-
-class nsFontGTK
-{
-public:
-  nsFontGTK();
-  virtual ~nsFontGTK();
-  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-
-  void LoadFont(void);
-  PRBool IsEmptyFont(GdkFont*);
-
-  inline int SupportsChar(PRUnichar aChar)
-    { return mFont && FONT_HAS_GLYPH(mMap, aChar); };
-
-  virtual GdkFont* GetGDKFont(void);
-  virtual PRBool   GetGDKFontIs10646(void);
-  virtual gint GetWidth(const PRUnichar* aString, PRUint32 aLength) = 0;
-  virtual gint DrawString(nsRenderingContextGTK* aContext,
-                          nsDrawingSurfaceGTK* aSurface, nscoord aX,
-                          nscoord aY, const PRUnichar* aString,
-                          PRUint32 aLength) = 0;
-#ifdef MOZ_MATHML
-  // bounding metrics for a string 
-  // remember returned values are not in app units 
-  // - to emulate GetWidth () above
-  virtual nsresult
-  GetBoundingMetrics(const PRUnichar*   aString,
-                     PRUint32           aLength,
-                     nsBoundingMetrics& aBoundingMetrics) = 0;
-#endif
-
-  PRUint32*              mMap;
-  nsFontCharSetInfo*     mCharSetInfo;
-  char*                  mName;
-  nsFontGTKUserDefined*  mUserDefinedFont;
-  PRUint16               mSize;
-  PRInt16                mBaselineAdjust;
-
-protected:
-  GdkFont*               mFont;
-  PRBool                 mAlreadyCalledLoadFont;
-};
-
-class nsFontMetricsGTK : public nsIFontMetrics
-{
-public:
-  nsFontMetricsGTK();
-  virtual ~nsFontMetricsGTK();
-
-  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLangGroup,
-                   nsIDeviceContext* aContext);
-  NS_IMETHOD  Destroy();
-
-  NS_IMETHOD  GetXHeight(nscoord& aResult);
-  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
-  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
-  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
-  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
-
-  NS_IMETHOD  GetHeight(nscoord &aHeight);
-  NS_IMETHOD  GetNormalLineHeight(nscoord &aHeight);
-  NS_IMETHOD  GetLeading(nscoord &aLeading);
-  NS_IMETHOD  GetEmHeight(nscoord &aHeight);
-  NS_IMETHOD  GetEmAscent(nscoord &aAscent);
-  NS_IMETHOD  GetEmDescent(nscoord &aDescent);
-  NS_IMETHOD  GetMaxHeight(nscoord &aHeight);
-  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
-  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
-  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
-  NS_IMETHOD  GetFont(const nsFont *&aFont);
-  NS_IMETHOD  GetLangGroup(nsIAtom** aLangGroup);
-  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
-  
-  virtual nsresult GetSpaceWidth(nscoord &aSpaceWidth);
-
-  nsFontGTK*  FindFont(PRUnichar aChar);
-  nsFontGTK*  FindUserDefinedFont(PRUnichar aChar);
-  nsFontGTK*  FindStyleSheetSpecificFont(PRUnichar aChar);
-  nsFontGTK*  FindStyleSheetGenericFont(PRUnichar aChar);
-  nsFontGTK*  FindLangGroupPrefFont(nsIAtom* aLangGroup, PRUnichar aChar);
-  nsFontGTK*  FindLangGroupFont(nsIAtom* aLangGroup, PRUnichar aChar, nsCString* aName);
-  nsFontGTK*  FindAnyFont(PRUnichar aChar);
-  nsFontGTK*  FindSubstituteFont(PRUnichar aChar);
-
-  nsFontGTK*  SearchNode(nsFontNode* aNode, PRUnichar aChar);
-  nsFontGTK*  TryAliases(nsCString* aName, PRUnichar aChar);
-  nsFontGTK*  TryFamily(nsCString* aName, PRUnichar aChar);
-  nsFontGTK*  TryNode(nsCString* aName, PRUnichar aChar);
-  nsFontGTK*  TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar);
-  nsFontGTK*  TryLangGroup(nsIAtom* aLangGroup, nsCString* aName, PRUnichar aChar);
-
-  nsFontGTK*  AddToLoadedFontsList(nsFontGTK* aFont);
-  nsFontGTK*  PickASizeAndLoad(nsFontStretch* aStretch,
-                               nsFontCharSetInfo* aCharSet, 
-                               PRUnichar aChar,
-                               const char *aName);
-
-  static nsresult FamilyExists(const nsString& aFontName);
-
-  //friend struct nsFontGTK;
-
-  nsFontGTK   **mLoadedFonts;
-  PRUint16    mLoadedFontsAlloc;
-  PRUint16    mLoadedFontsCount;
-
-  nsFontGTK   *mSubstituteFont;
-
-  nsCStringArray mFonts;
-  PRUint16       mFontsIndex;
-  nsVoidArray    mFontIsGeneric;
-
-  nsCAutoString     mDefaultFont;
-  nsCString         *mGeneric;
-  nsCOMPtr<nsIAtom> mLangGroup;
-  nsCAutoString     mUserDefined;
-
-  PRUint8 mTriedAllGenerics;
-  PRUint8 mIsUserDefined;
-
-protected:
-  void RealizeFont();
-
-  nsIDeviceContext    *mDeviceContext;
-  nsFont              *mFont;
-  nsFontGTK           *mWesternFont;
-
-  nscoord             mLeading;
-  nscoord             mEmHeight;
-  nscoord             mEmAscent;
-  nscoord             mEmDescent;
-  nscoord             mMaxHeight;
-  nscoord             mMaxAscent;
-  nscoord             mMaxDescent;
-  nscoord             mMaxAdvance;
-  nscoord             mXHeight;
-  nscoord             mSuperscriptOffset;
-  nscoord             mSubscriptOffset;
-  nscoord             mStrikeoutSize;
-  nscoord             mStrikeoutOffset;
-  nscoord             mUnderlineSize;
-  nscoord             mUnderlineOffset;
-  nscoord             mSpaceWidth;
-
-  PRUint16            mPixelSize;
-  PRUint8             mStretchIndex;
-  PRUint8             mStyleIndex;
-  nsFontCharSetConverter mDocConverterType;
-};
-
-class nsFontEnumeratorGTK : public nsIFontEnumerator
-{
-public:
-  nsFontEnumeratorGTK();
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIFONTENUMERATOR
-};
-
-#endif

mozilla/widget/src/mac/nsFileWidget.cpp

@@ -0,0 +1,699 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsFileWidget.h"
+#include "nsStringUtil.h"
+#include <StandardFile.h>
+#include <ICAPI.h>
+#include "nsMacControl.h"
+
+#include "nsFileSpec.h"
+
+#define DBG 0
+
+NS_IMPL_ADDREF(nsFileWidget)
+NS_IMPL_RELEASE(nsFileWidget)
+
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget constructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::nsFileWidget()
+{
+  NS_INIT_REFCNT();
+  mIOwnEventLoop = PR_FALSE;
+  mNumberOfFilters = 0;
+  
+  // Zero out the type lists
+  for (int i = 0; i < kMaxTypeListCount; i++)
+  {
+  	mTypeLists[i] = 0L;
+  }
+}
+
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget destructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::~nsFileWidget()
+{
+	// Destroy any filters we have built
+	if (mNumberOfFilters)
+	{
+	  for (int i = 0; i < kMaxTypeListCount; i++)
+	  {
+	  	if (mTypeLists[i])
+	  		DisposePtr((Ptr)mTypeLists[i]);
+	  }
+	}
+}
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFileWidget::Create(nsIWidget        *aParent,
+                          const nsRect     &aRect,
+                          EVENT_CALLBACK   aHandleEventFunction,
+                          nsIDeviceContext *aContext,
+                          nsIAppShell      *aAppShell,
+                          nsIToolkit       *aToolkit,
+                          nsWidgetInitData *aInitData) 
+{
+  nsString title("Open");
+  Create(aParent, title, eMode_load, aContext, aAppShell, aToolkit, aInitData);
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+NS_IMETHODIMP   nsFileWidget:: Create(nsIWidget  *aParent,
+                             const nsString&   aTitle,
+                             nsFileDlgMode    aMode,
+                             nsIDeviceContext *aContext,
+                             nsIAppShell *aAppShell,
+                             nsIToolkit *aToolkit,
+                             void       *aInitData)
+{
+  mTitle = aTitle;
+  mMode = aMode;
+
+	mWindowPtr = nsnull;
+
+  return NS_OK;
+
+}
+
+
+/**
+ * Implement the standard QueryInterface for NS_IWIDGET_IID and NS_ISUPPORTS_IID
+ * @param aIID The name of the class implementing the method
+ * @param _classiiddef The name of the #define symbol that defines the IID
+ * for the class (e.g. NS_ISUPPORTS_IID)
+*/ 
+nsresult nsFileWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+    if (NULL == aInstancePtr) {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    static NS_DEFINE_IID(kIFileWidgetIID, NS_IFILEWIDGET_IID);
+    if (aIID.Equals(kIFileWidgetIID)) {
+        *aInstancePtr = (void*) ((nsIFileWidget*)this);
+        AddRef();
+        return NS_OK;
+    }
+
+    return nsWindow::QueryInterface(aIID,aInstancePtr);
+}
+
+
+
+NS_IMETHODIMP nsFileWidget::Create(nsNativeWidget aParent,
+                      const nsRect &aRect,
+                      EVENT_CALLBACK aHandleEventFunction,
+                      nsIDeviceContext *aContext,
+                      nsIAppShell *aAppShell,
+                      nsIToolkit *aToolkit,
+                      nsWidgetInitData *aInitData)
+{
+	return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Ok's the dialog
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFileWidget::OnOk()
+{
+  mWasCancelled  = PR_FALSE;
+  mIOwnEventLoop = PR_FALSE;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Cancel the dialog
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFileWidget::OnCancel()
+{
+  mWasCancelled  = PR_TRUE;
+  mIOwnEventLoop = PR_FALSE;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Show - Display the file dialog
+//
+//-------------------------------------------------------------------------
+PRBool nsFileWidget::Show()
+{
+  nsString filterList;
+  GetFilterListArray(filterList);
+  char *filterBuffer = filterList.ToNewCString();
+
+  Str255 title;
+  Str255 defaultName;
+  nsMacControl::StringToStr255(mTitle,title);
+  nsMacControl::StringToStr255(mDefault,defaultName);
+    
+  FSSpec theFile;
+  PRBool userClicksOK = PR_FALSE;
+  
+  // XXX Ignore the filter list for now....
+  
+  if (mMode == eMode_load)
+    userClicksOK = GetFile ( title, &theFile );
+  else if (mMode == eMode_save)
+    userClicksOK = PutFile ( title, defaultName, &theFile );
+  else if (mMode == eMode_getfolder)
+    userClicksOK = GetFolder ( title, &theFile );  
+
+  // Clean up filter buffers
+  delete[] filterBuffer;
+
+  if ( userClicksOK ) {
+    nsNativeFileSpec fileSpec(theFile);
+    nsFilePath filePath(fileSpec);
+	
+    mFile = filePath;
+    mFileSpec = fileSpec;
+  }
+  
+  return userClicksOK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// myProc
+//
+// An event filter proc for NavServices so the dialogs will be movable-modals. However,
+// this doesn't seem to work as of yet...I'll play around with it some more.
+//
+//-------------------------------------------------------------------------
+pascal void myProc ( NavEventCallbackMessage msg, NavCBRecPtr cbRec, NavCallBackUserData data ) ;
+pascal void myProc ( NavEventCallbackMessage msg, NavCBRecPtr cbRec, NavCallBackUserData data )
+{
+	WindowPtr window = reinterpret_cast<WindowPtr>(cbRec->eventData.eventDataParms.event->message);
+	switch ( msg ) {
+		case kNavCBEvent:
+			switch ( cbRec->eventData.eventDataParms.event->what ) {
+				case updateEvt:
+					::BeginUpdate(window);
+					::EndUpdate(window);
+					break;
+			}
+			break;
+	}
+}
+
+
+//-------------------------------------------------------------------------
+//
+// PutFile
+//
+// Use NavServices to do a PutFile. Returns PR_TRUE if the user presses OK in the dialog. If
+// they do so, the location to put the file and the name, etc is in the FSSpec.
+//
+//-------------------------------------------------------------------------
+PRBool
+nsFileWidget :: PutFile ( Str255 & inTitle, Str255 & inDefaultName, FSSpec* outSpec )
+{
+ 	PRBool retVal = PR_FALSE;
+	NavReplyRecord reply;
+	NavDialogOptions dialogOptions;
+	NavEventUPP eventProc = NewNavEventProc(myProc);  // doesn't really matter if this fails
+	OSType				typeToSave = 'TEXT';
+	OSType				creatorToSave = 'MOZZ';
+
+	OSErr anErr = NavGetDefaultDialogOptions(&dialogOptions);
+	if (anErr == noErr)	{	
+		// Set the options for how the get file dialog will appear
+		dialogOptions.dialogOptionFlags |= kNavNoTypePopup;
+		dialogOptions.dialogOptionFlags |= kNavDontAutoTranslate;
+		dialogOptions.dialogOptionFlags |= kNavDontAddTranslateItems;
+		dialogOptions.dialogOptionFlags ^= kNavAllowMultipleFiles;
+		::BlockMoveData(inTitle, dialogOptions.message, *inTitle + 1);
+		
+		// Display the get file dialog
+		anErr = ::NavPutFile(
+					NULL,
+					&reply,
+					&dialogOptions,
+					eventProc,
+					typeToSave,
+					creatorToSave,
+					NULL); // callbackUD	
+	
+		// See if the user has selected save
+		if (anErr == noErr && reply.validRecord) {
+			AEKeyword	theKeyword;
+			DescType	actualType;
+			Size		actualSize;
+			FSSpec		theFSSpec;
+			
+			// Get the FSSpec for the file to be opened
+			anErr = AEGetNthPtr(&(reply.selection), 1, typeFSS, &theKeyword, &actualType,
+				&theFSSpec, sizeof(theFSSpec), &actualSize);
+			
+			if (anErr == noErr) {
+				*outSpec = theFSSpec;	// Return the FSSpec
+				
+				if (reply.replacing)
+					mSelectResult = nsFileDlgResults_Replace;
+				else
+					mSelectResult = nsFileDlgResults_OK;
+				
+				// Some housekeeping for Nav Services 
+				::NavCompleteSave(&reply, kNavTranslateInPlace);
+				::NavDisposeReply(&reply);
+				
+				retVal = PR_TRUE;
+			}
+
+		} // if user clicked OK	
+	} // if can get dialog options
+	
+	if ( eventProc ) {
+#if TARGET_CARBON
+		::DisposeNavEventUPP(eventProc);
+#else
+		::DisposeRoutineDescriptor(eventProc);
+#endif
+	}
+	
+	return retVal;
+	
+} // PutFile
+
+
+
+//-------------------------------------------------------------------------
+//
+// GetFile
+//
+// Use NavServices to do a GetFile. Returns PR_TRUE if the user presses OK in the dialog. If
+// they do so, the selected file is in the FSSpec.
+//
+//-------------------------------------------------------------------------
+PRBool
+nsFileWidget :: GetFile ( Str255 & inTitle, /* filter list here later */ FSSpec* outSpec )
+{
+ 	PRBool retVal = PR_FALSE;
+	NavReplyRecord reply;
+	NavDialogOptions dialogOptions;
+	NavEventUPP eventProc = NewNavEventProc(myProc);  // doesn't really matter if this fails
+
+	OSErr anErr = NavGetDefaultDialogOptions(&dialogOptions);
+	if (anErr == noErr)	{	
+		// Set the options for how the get file dialog will appear
+		dialogOptions.dialogOptionFlags |= kNavNoTypePopup;
+		dialogOptions.dialogOptionFlags |= kNavDontAutoTranslate;
+		dialogOptions.dialogOptionFlags |= kNavDontAddTranslateItems;
+		dialogOptions.dialogOptionFlags ^= kNavAllowMultipleFiles;
+		::BlockMoveData(inTitle, dialogOptions.message, *inTitle + 1);
+		
+		// Display the get file dialog
+		anErr = ::NavGetFile(
+					NULL,
+					&reply,
+					&dialogOptions,
+					eventProc,
+					NULL, // preview proc
+					NULL, // filter proc
+					NULL, //typeList,
+					NULL); // callbackUD	
+	
+		// See if the user has selected save
+		if (anErr == noErr && reply.validRecord) {
+			AEKeyword	theKeyword;
+			DescType	actualType;
+			Size		actualSize;
+			FSSpec		theFSSpec;
+			
+			// Get the FSSpec for the file to be opened
+			anErr = AEGetNthPtr(&(reply.selection), 1, typeFSS, &theKeyword, &actualType,
+				&theFSSpec, sizeof(theFSSpec), &actualSize);
+			
+			if (anErr == noErr) {
+				*outSpec = theFSSpec;	// Return the FSSpec
+				mSelectResult = nsFileDlgResults_OK;
+				
+				// Some housekeeping for Nav Services 
+				::NavDisposeReply(&reply);
+				
+				retVal = PR_TRUE;
+			}
+
+		} // if user clicked OK	
+	} // if can get dialog options
+	
+	if ( eventProc ) {
+#if TARGET_CARBON
+		::DisposeNavEventUPP(eventProc);
+#else
+		::DisposeRoutineDescriptor(eventProc);
+#endif
+	}
+		
+	return retVal;
+
+} // GetFile
+
+
+//-------------------------------------------------------------------------
+//
+// GetFolder
+//
+// Use NavServices to do a PutFile. Returns PR_TRUE if the user presses OK in the dialog. If
+// they do so, the folder location is in the FSSpec.
+//
+//-------------------------------------------------------------------------
+PRBool
+nsFileWidget :: GetFolder ( Str255 & inTitle, FSSpec* outSpec  )
+{
+ 	PRBool retVal = PR_FALSE;
+	NavReplyRecord reply;
+	NavDialogOptions dialogOptions;
+	NavEventUPP eventProc = NewNavEventProc(myProc);  // doesn't really matter if this fails
+
+	OSErr anErr = NavGetDefaultDialogOptions(&dialogOptions);
+	if (anErr == noErr)	{	
+		// Set the options for how the get file dialog will appear
+		dialogOptions.dialogOptionFlags |= kNavNoTypePopup;
+		dialogOptions.dialogOptionFlags |= kNavDontAutoTranslate;
+		dialogOptions.dialogOptionFlags |= kNavDontAddTranslateItems;
+		dialogOptions.dialogOptionFlags ^= kNavAllowMultipleFiles;
+		::BlockMoveData(inTitle, dialogOptions.message, *inTitle + 1);
+		
+		// Display the get file dialog
+		anErr = ::NavChooseFolder(
+					NULL,
+					&reply,
+					&dialogOptions,
+					eventProc,
+					NULL, // filter proc
+					NULL); // callbackUD	
+	
+		// See if the user has selected save
+		if (anErr == noErr && reply.validRecord) {
+			AEKeyword	theKeyword;
+			DescType	actualType;
+			Size		actualSize;
+			FSSpec		theFSSpec;
+			
+			// Get the FSSpec for the file to be opened
+			anErr = AEGetNthPtr(&(reply.selection), 1, typeFSS, &theKeyword, &actualType,
+				&theFSSpec, sizeof(theFSSpec), &actualSize);
+			
+			if (anErr == noErr) {
+				*outSpec = theFSSpec;	// Return the FSSpec
+				mSelectResult = nsFileDlgResults_OK;
+				
+				// Some housekeeping for Nav Services 
+				::NavDisposeReply(&reply);
+				
+				retVal = PR_TRUE;
+			}
+
+		} // if user clicked OK	
+	} // if can get dialog options
+	
+	if ( eventProc ) {
+#if TARGET_CARBON
+		::DisposeNavEventUPP(eventProc);
+#else
+		::DisposeRoutineDescriptor(eventProc);
+#endif
+	}
+		
+	return retVal;
+
+
+} // GetFolder
+
+
+//-------------------------------------------------------------------------
+//
+// Convert filter titles + filters into a Windows filter string
+//
+//-------------------------------------------------------------------------
+
+void nsFileWidget::GetFilterListArray(nsString& aFilterList)
+{
+  aFilterList.SetLength(0);
+  for (PRUint32 i = 0; i < mNumberOfFilters; i++) {
+    const nsString& title = mTitles[i];
+    const nsString& filter = mFilters[i];
+    
+    aFilterList.Append(title);
+    aFilterList.Append('\0');
+    aFilterList.Append(filter);
+    aFilterList.Append('\0');
+  }
+  aFilterList.Append('\0'); 
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the list of filters
+//
+// Note - Since the XP representation of filters is based on the Win32
+//			file dialog mechanism of supplying a .ext list of files to
+//			display we need to do some massaging to convert this into
+//			something useful on the Mac.  Luckily Internet Config provides
+//			a mechanism to get a file's Mac type based on the .ext so
+//			we'll utilize that.
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,const nsString aTitles[],const nsString aFilters[])
+{
+	unsigned char	typeTemp[256];
+	unsigned char	tempChar;
+	OSType			tempOSType;
+	ICInstance		icInstance;
+	ICError			icErr;
+	Handle			mappings = NewHandleClear(4);
+	ICAttr			attr;
+	ICMapEntry		icEntry;
+	
+	mNumberOfFilters  = aNumberOfFilters;
+	mTitles           = aTitles;
+	mFilters          = aFilters;
+	
+#if 0  // FOR NOW JUST BYPASS ALL THIS CODE
+	icErr = ICStart(&icInstance, 'MOZZ');
+	if (icErr == noErr)
+	{
+		icErr = ICFindConfigFile(icInstance, 0, nil);
+		if (icErr == noErr)
+		{
+			icErr = ICFindPrefHandle(icInstance, kICMapping, &attr, mappings);
+			if (icErr != noErr)
+				goto bail_w_IC;
+		}
+		else
+			goto bail_w_IC;
+	}
+	else
+		goto bail_wo_IC;
+	
+	if (aNumberOfFilters)
+	{
+		// First we allocate the memory for the Mac type lists
+		for (PRUint32 loop1 = 0; loop1 < mNumberOfFilters; loop1++)
+		{
+			mTypeLists[loop1] =
+				(NavTypeListPtr)NewPtrClear(sizeof(NavTypeList) + kMaxTypesPerFilter * sizeof(OSType));
+			
+			if (mTypeLists[loop1] == nil)
+				goto bail_w_IC;
+		}
+		
+		// Now loop through each of the filter strings
+	  	for (PRUint32 loop1 = 0; loop1 < mNumberOfFilters; loop1++)
+	  	{
+	  		const nsString& filter = mFilters[loop1];
+		  	PRUint32 filterIndex = 0;			// Index into the filter string
+
+	  		if (filter[filterIndex])
+	  		{
+		  		PRUint32 typeTempIndex = 1;			// Index into the temp string for a single filter type
+		  		PRUint32 typesInThisFilter = 0;		// Count for # of types in this filter
+				bool finishedThisFilter = false;	// Flag so we know when we're finsihed with the filter
+	  			do	// Loop throught the characters of filter string
+		  		{
+		  			if ((tempChar == ';') || (tempChar == 0))
+		  			{ // End of filter type reached
+		  				typeTemp[typeTempIndex] = 0;
+		  				typeTemp[0] = typeTempIndex - 1;
+		  				
+		  				icErr = ICMapEntriesFilename(icInstance, mappings, typeTemp, &icEntry);
+		  				if (icErr != icPrefNotFoundErr)
+		  				{
+		  					bool addToList = true;
+		  					tempOSType = icEntry.file_type;
+		  					for (PRUint32 typeIndex = 0; typeIndex < typesInThisFilter; typeIndex++)
+		  					{
+		  						if (mTypeLists[loop1]->osType[typeIndex] == tempOSType)
+		  						{
+		  							addToList = false;
+		  							break;
+		  						}
+		  					}
+		  					if (addToList)
+		  						mTypeLists[loop1]->osType[typesInThisFilter++] = tempOSType;
+		  				}
+		  				
+		  				typeTempIndex = 0;			// Reset the temp string for the type
+		  				typeTemp[0] = 0;
+		  				if (tempChar == 0)
+		  					finishedThisFilter = true;
+		  			}
+		  			else
+		  			{
+		  				typeTemp[typeTempIndex++] = tempChar;
+		  			}
+		  			
+		  			filterIndex++;
+		  		} while (!finishedThisFilter);
+		  		
+		  		// Set hoe many OSTypes we actually found
+		  		mTypeLists[loop1]->osTypeCount = typesInThisFilter;
+	  		}
+		}
+	}
+
+bail_w_IC:
+	ICStop(icInstance);
+
+bail_wo_IC:
+
+#endif	// FOR NOW JUST BYPASS ALL THIS CODE
+
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
+{
+  aFile = mFileSpec;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP  nsFileWidget::SetDefaultString(const nsString& aString)
+{
+  mDefault = aString;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the display directory
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
+{
+  mDisplayDirectory = aDirectory;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the display directory
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
+{
+  aDirectory = mDisplayDirectory;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+nsFileDlgResults  nsFileWidget::GetFile(
+	    nsIWidget        * aParent,
+	    const nsString   & promptString,
+	    nsFileSpec       & theFileSpec)
+{
+	Create(aParent, promptString, eMode_load, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		theFileSpec = mFileSpec;
+		return mSelectResult;
+	}
+	
+	return nsFileDlgResults_Cancel;
+}
+	    
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+nsFileDlgResults  nsFileWidget::GetFolder(
+	    nsIWidget        * aParent,
+	    const nsString   & promptString,
+	    nsFileSpec       & theFileSpec)
+{
+	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		theFileSpec = mFileSpec;
+		return mSelectResult;
+	}
+	
+	return nsFileDlgResults_Cancel;
+}
+	    
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+nsFileDlgResults  nsFileWidget::PutFile(
+	    nsIWidget        * aParent,
+	    const nsString         & promptString,
+	    nsFileSpec       & theFileSpec)
+{
+	Create(aParent, promptString, eMode_save, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		theFileSpec = mFileSpec;
+		return mSelectResult;
+	}
+	
+	return nsFileDlgResults_Cancel;
+}

mozilla/xpcom/ds/Makefile.in

@@ -1,134 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xpcom
-XPIDL_MODULE	= xpcom_ds
-LIBRARY_NAME	= xpcomds_s
-REQUIRES	= unicharutil string
-
-CSRCS = \
-		pldhash.c \
-		plvector.c \
-		$(NULL)
-
-CPPSRCS		= \
-		nsArena.cpp \
-		nsAtomTable.cpp \
-		nsAtomService.cpp \
-		nsAVLTree.cpp \
-		nsByteBuffer.cpp \
-		nsCRT.cpp \
-		nsConjoiningEnumerator.cpp \
-		nsDeque.cpp \
-		nsEmptyEnumerator.cpp \
-		nsEnumeratorUtils.cpp \
-		nsFixedSizeAllocator.cpp \
-		nsHashtable.cpp \
-		nsHashtableEnumerator.cpp \
-		nsObserver.cpp \
-		nsObserverList.cpp \
-		nsObserverService.cpp \
-		nsProperties.cpp \
-		nsPersistentProperties.cpp \
-		nsQuickSort.cpp \
-		nsSizeOfHandler.cpp \
-		nsStaticNameTable.cpp \
-		nsStatistics.cpp \
-		nsStringMap.cpp \
-		nsSupportsArray.cpp \
-		nsSupportsArrayEnumerator.cpp \
-		nsSupportsPrimitives.cpp \
-		nsUnicharBuffer.cpp \
-		nsVoidArray.cpp \
-		nsVoidBTree.cpp \
-		nsTextFormatter.cpp \
-		nsTimelineService.cpp \
-		$(NULL)
-
-EXPORTS		= \
-		nsAVLTree.h \
-		nsAtomService.h \
-		nsCppSharedAllocator.h \
-		nsCRT.h \
-		nsDeque.h \
-		nsEnumeratorUtils.h \
-		nsFixedSizeAllocator.h \
-		nsHashtable.h \
-		nsHashtableEnumerator.h \
-		nsIArena.h \
-		nsIByteBuffer.h \
-		nsIObserverList.h \
-		nsISimpleEnumerator.h \
-		nsISizeOfHandler.h \
-		nsIUnicharBuffer.h \
-		nsInt64.h \
-		nsQuickSort.h \
-		nsStaticNameTable.h \
-		nsStatistics.h \
-		nsStringMap.h \
-		nsSupportsArray.h \
-		nsSupportsPrimitives.h \
-		nsTime.h \
-		nsUnitConversion.h \
-		nsVector.h \
-		nsVoidArray.h \
-		nsVoidBTree.h \
-		pldhash.h \
-		plvector.h \
-		nsTextFormatter.h \
-		$(NULL)			
-
-XPIDLSRCS	= \
-		nsIAtom.idl \
-		nsIAtomService.idl \
-		nsICollection.idl \
-		nsIEnumerator.idl \
-		nsIObserver.idl \
-		nsIObserverService.idl \
-		nsIPersistentProperties2.idl \
-		nsIProperties.idl \
-		nsISerializable.idl \
-		nsIStopwatch.idl \
-		nsISupportsArray.idl \
-		nsISupportsIterators.idl \
-		nsISupportsPrimitives.idl \
-		nsITimelineService.idl \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-# Force use of PIC
-FORCE_USE_PIC	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
-

mozilla/xpcom/ds/nsStringMap.cpp

@@ -1,300 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator client code.
- * 
- * The Initial Developer of the Original Code is James L. Nance
- * Portions created by James L. Nance are Copyright (C) 2001
- * James L. Nance.  All  Rights Reserved.
- * 
- * Contributor(s): Patricia Jewell Nance, Jesse Jacob Nance
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-// #define TEST_PATRICIA
-
-#if defined(TEST_PATRICIA)
-#   include "stdlib.h"
-#   include "stdio.h"
-#   include "string.h"
-#   define PRBool bool
-#   define PRUint32 unsigned int
-#   define PRInt32  int
-#   define PR_CALLBACK
-#   define PLArenaPool int
-#   define PL_FinishArenaPool(a)
-#   define PL_InitArenaPool(a, b, c, d)
-#   define PL_ArenaAllocate(a, size) malloc(size)
-#   define PR_TRUE true
-#   define PR_FALSE false
-
-    struct nsCRT {
-        static int strlen(const char *a) {return ::strlen(a);}
-        static int memcmp(const void *a, const void *b, PRUint32 c) {
-            return ::memcmp(a,b,c);
-        }
-    };
-#else
-#   include "nsCRT.h"
-#endif
-
-#include "nsStringMap.h"
-
-const char nsStringMap::zero_str[] = "\0";
-
-nsStringMap::~nsStringMap()
-{
-    // Get rid of the arena memory
-    PL_FinishArenaPool(&mPool);
-}
-
-nsStringMap::nsStringMap() : numEntries(0)
-{
-    // Initialize the head
-    head.l   = head.r = &head;
-    head.bit = ~0;
-    head.key = zero_str;
-    head.len = 1;
-    head.obj = 0;
-
-    // Initialize the arena.  Guess that a 512 byte block size is good
-    PL_InitArenaPool(&mPool, "nsStringMap", 512, sizeof(void*));
-}
-
-void
-nsStringMap::Reset()
-{
-    // Initialize the head
-    head.l   = head.r = &head;
-    head.bit = ~0;
-    head.key = zero_str;
-    head.len = 1;
-    head.obj = 0;
-
-    // Reinitialize the Arena
-    PL_FinishArenaPool(&mPool);
-    PL_InitArenaPool(&mPool, "nsStringMap", 512, sizeof(void*));
-}
-
-void
-nsStringMap::Reset(nsStringMapEnumFunc destroyFunc, void *aClosure)
-{
-    Enumerate(destroyFunc, aClosure);
-    Reset();
-}
-
-nsStringMap::Patricia *
-nsStringMap::newNode()
-{
-    return (Patricia*) PL_ArenaAllocate(&mPool, sizeof(Patricia));
-}
-
-nsStringMap::Patricia *
-nsStringMap::searchDown(BitTester &key)
-{
-    // The head node only branches to the left, so we can optimize here.
-    Patricia *x = head.l;
-
-    PRUint32 lastBits;
-
-    do {
-        lastBits = x->bit;
-
-        if(key.isset(lastBits))
-            x = x->r;
-        else
-            x = x->l;
-
-    } while(lastBits > x->bit);
-
-    return x;
-}
-
-void*
-nsStringMap::Get(const char *str, PRUint32 slen)
-{
-    BitTester key(str, slen);
-
-    Patricia *t = searchDown(key);
-
-    if(!key.memcmp(t->key, t->len)) {
-        return t->obj;
-    }
-
-    return 0;
-}
-
-void*
-nsStringMap::Get(const char *str)
-{
-    BitTester key(str);
-
-    Patricia *t = searchDown(key);
-
-    if(!key.memcmp(t->key, t->len)) {
-        return t->obj;
-    }
-
-    return 0;
-}
-
-PRBool
-nsStringMap::Put(const char *str, void *obj, PRBool copy)
-{
-    PRUint32 slen = nsCRT::strlen(str);
-    return Put(str, slen, obj, copy);
-}
-
-PRBool
-nsStringMap::Put(const char *str, PRUint32 slen, void *obj, PRBool copy)
-{
-    if(copy) {
-        PRUint32 mask  = sizeof(double) - 1;
-        PRUint32 asize = (slen+mask) & ~mask;
-        char *tstr = (char*) PL_ArenaAllocate(&mPool, asize);
-        memcpy(tstr, str, slen);
-        str = tstr;
-    }
-
-    BitTester key(str, slen);
-
-    Patricia *t = searchDown(key);
-
-    if(!key.memcmp(t->key, t->len)) {
-        t->obj = obj;
-        return PR_TRUE;
-    }
-
-    // This is somewhat ugly.  We need to find the maximum bit position that
-    // differs, but this is complicated by the fact that we have random length
-    // data.  Assume that data past the end of the string is 0.
-    const PRUint32 klen = key.datalen();
-    const PRUint32 tlen = t->len;
-    PRUint32   bpos;
-    if(klen>tlen) {
-        bpos = 8 * klen - 1;
-        while(!BitTester::isset_checked(str, bpos)) --bpos;
-    } else if(tlen>klen) {
-        bpos = 8 * tlen - 1;
-        while(!BitTester::isset_checked(t->key, bpos)) --bpos;
-    } else /* equal */ {
-        bpos = 8 * tlen - 1;
-        while(BitTester::bitsequal(t->key, str, bpos)) --bpos;
-    }
-
-    Patricia *p, *x = &head;
-
-    do {
-        p = x;
-        x = key.isset(x->bit) ? x->r : x->l;
-    } while(x->bit > bpos && p->bit > x->bit);
-
-    t = newNode();
-
-    if(!t) {
-        return PR_FALSE;
-    }
-
-    t->key = str;
-    t->len = key.datalen();
-    t->obj = obj;
-    t->bit = bpos;
-
-    if(key.isset(t->bit)) {
-        t->r = t;
-        t->l = x;
-    } else {
-        t->r = x;
-        t->l = t;
-    }
-
-    if(key.isset(p->bit)) {
-        p->r = t;
-    } else {
-        p->l = t;
-    }
-
-    return PR_TRUE;
-}
-
-void
-nsStringMap::enumerate_recurse(
-nsStringMapEnumFunc aEnumFunc, void* aClosure, Patricia *node)
-{
-    aEnumFunc(node->key, node->obj, aClosure);
-    if(node->l && node->l->bit<node->bit)
-        enumerate_recurse(aEnumFunc, aClosure, node->l);
-    if(node->r && node->r->bit<node->bit)
-        enumerate_recurse(aEnumFunc, aClosure, node->r);
-}
-
-void
-nsStringMap::Enumerate(nsStringMapEnumFunc aEnumFunc, void *aClosure)
-{
-    // We dont want to process head, its a sentinal
-    if(head.l && head.l->bit<head.bit)
-        enumerate_recurse(aEnumFunc, aClosure, head.l);
-    if(head.r && head.r->bit<head.bit)
-        enumerate_recurse(aEnumFunc, aClosure, head.r);
-}
-
-#if defined(TEST_PATRICIA)
-
-PRBool etest(const char *key, void *data, void *closure)
-{
-    printf("%s\n", key);
-    return PR_TRUE;
-}
-
-int main()
-{
-    nsStringMap map;
-    const char *strings[] = {
-      "I am number 1 string",
-      "I am number 2 string",
-      "I am number 3 string",
-      "a different string",
-      "a similar string",
-      "I am a very long string and I want to make sure we can handle this",
-      "I am a very long string and I want to make sure we can handle this too",
-      0
-    };
-
-    int idx;
-    for(idx=0; strings[idx]; ++idx) {
-        map.Put(strings[idx], (void*)(1+idx));
-    }
-
-    printf("Lookup Test\n");
-    while(--idx>=0) {
-        void *ptr = map.Get(strings[idx]);
-        printf("%d: %s\n", (long)ptr, strings[idx]);
-    }
-
-    printf("\nEnumeration Test\n");
-
-    map.Enumerate(etest, 0);
-
-    return 0;
-}
-
-#endif

mozilla/xpcom/ds/nsStringMap.h

@@ -1,112 +0,0 @@
-#ifndef nsStringMap_h__
-#define nsStringMap_h__
-
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator client code.
- * 
- * The Initial Developer of the Original Code is James L. Nance
- * Portions created by James L. Nance are Copyright (C) 2001
- * James L. Nance.  All  Rights Reserved.
- * 
- * Contributor(s): Patricia Jewell Nance, Jesse Jacob Nance
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#if !defined(TEST_PATRICIA)
-#   include "nscore.h"
-#   include "prtypes.h"
-#   include "plarena.h"
-#endif
-
-typedef PRBool (*PR_CALLBACK nsStringMapEnumFunc) (
-    const char *aKey, void *aData, void *aClosure);
-
-class nsStringMap
-{
-public:
-    nsStringMap();
-    ~nsStringMap();
-    PRBool Put(const char *str, PRUint32 slen, void *obj, PRBool copy=PR_FALSE);
-    PRBool Put(const char *str, void *obj, PRBool copy=PR_FALSE);
-    void*  Get(const char *str);
-    void*  Get(const char *str, PRUint32 slen);
-    void   Reset();
-    void   Reset(nsStringMapEnumFunc destroyFunc, void *aClosure = 0);
-    void   Enumerate(nsStringMapEnumFunc aEnumFunc, void *aClosure = 0);
-
-    struct Patricia {
-        Patricia   *l, *r;
-        PRUint32    bit;    // Bit position for l/r comp
-        const char *key;
-        PRUint32    len;
-        void       *obj;
-    };
-
-    // The BitTester class is used to test a particular bit position in an
-    // array of characters.  It does not assign any special meaning to 0
-    // characters.  Bits past the end of the array are treated as 0
-    class BitTester {
-        const PRUint32 slen;
-        const char    *cstr;
-    public:
-        BitTester(const char *s) : slen(nsCRT::strlen(s)), cstr(s) {}
-        BitTester(const char *s, PRUint32 l) : slen(l), cstr(s) {}
-
-        PRInt32 memcmp(const char *ostr, PRUint32 olen) {
-            if(olen==slen) {
-                return ::memcmp((void*)cstr, ostr, slen);
-            } else {
-                return olen - slen;
-            }
-        }
-
-        PRUint32 datalen() const {return slen;}
-
-        static PRBool isset_checked(const char *str, PRUint32 idx) {
-            return (str[idx/8] & (1<<(idx & 7))) != 0;
-        }
-
-        static PRBool
-        bitsequal(const char *str1, const char*str2, PRUint32 idx) {
-            return (str1[idx/8] & (1<<(idx&7)))==(str2[idx/8] & (1<<(idx&7)));
-        }
-
-        PRBool isset(PRUint32 idx) {
-            const PRUint32 base = idx/8;
-            if(base>=slen) return 0;
-            return (cstr[base] & (1<<(idx & 7))) != 0;
-        }
-    };
-
-private:
-    PLArenaPool mPool;
-    Patricia *newNode();
-    Patricia *searchDown(BitTester&);
-    void enumerate_recurse(nsStringMapEnumFunc, void*, Patricia*);
-    Patricia head; // Sentinal node
-    PRInt32  numEntries;
-    static const char zero_str[];
-};
-
-#endif