diff --git a/mozilla/xpfe/components/find/public/nsIFindComponent.idl b/mozilla/xpfe/components/find/public/nsIFindComponent.idl index 9c7cf4c12c0..7c116ed7b72 100644 --- a/mozilla/xpfe/components/find/public/nsIFindComponent.idl +++ b/mozilla/xpfe/components/find/public/nsIFindComponent.idl @@ -74,7 +74,7 @@ interface nsIFindComponent : nsIAppShellComponent | Clients do have to call Release() when they're no longer interested in | | this search context. | --------------------------------------------------------------------------*/ - nsISupports CreateContext(in nsIDOMWindowInternal aWindow, in nsIEditorShell aEditor); + nsISupports createContext(in nsIDOMWindowInternal aWindow, in nsIEditorShell aEditor); /*--------------------------------- Find ----------------------------------- | Finds the "first" occurrence of a string in the given search context | @@ -87,7 +87,7 @@ interface nsIFindComponent : nsIAppShellComponent | case" and "search backward") is up to the implementation of this | | component. | --------------------------------------------------------------------------*/ - boolean Find( in nsISupports aContext ); + boolean find( in nsISupports aContext ); /*--------------------------------- Replace ----------------------------------- | Replace the currently selected text. It is intended that the string used | @@ -96,7 +96,7 @@ interface nsIFindComponent : nsIAppShellComponent | | | Returns an error if the current context does not allow replacement. | --------------------------------------------------------------------------*/ - void Replace( in nsISupports aContext ); + void replace( in nsISupports aContext ); /*------------------------------- FindNext --------------------------------- | Finds the next occurrence (of the previously searched for string) in | @@ -105,14 +105,14 @@ interface nsIFindComponent : nsIAppShellComponent | If no previous Find has been performed with this context, then the | | find component will use the last find performed for any context. | --------------------------------------------------------------------------*/ - boolean FindNext( in nsISupports aContext ); + boolean findNext( in nsISupports aContext ); /*----------------------------- ResetContext ------------------------------- | Reset the given search context to search a new web shell. Generally, | | this will be the equivalent of calling Release() on the old context and | | then creating a new one for aNewWebShell. | --------------------------------------------------------------------------*/ - void ResetContext(in nsISupports aContext, in nsIDOMWindowInternal aWindow, + void resetContext(in nsISupports aContext, in nsIDOMWindowInternal aWindow, in nsIEditorShell aEditor ); }; diff --git a/mozilla/xpfe/components/find/public/nsISearchContext.idl b/mozilla/xpfe/components/find/public/nsISearchContext.idl index 0b52bcff314..dcdea3beedd 100644 --- a/mozilla/xpfe/components/find/public/nsISearchContext.idl +++ b/mozilla/xpfe/components/find/public/nsISearchContext.idl @@ -23,12 +23,6 @@ #include "nsISupports.idl" #include "domstubs.idl" -[ptr] native nsIWebShell( nsIWebShell ); - -%{C++ -class nsIWebShell; -%} - /*----------------------------- nsISearchContext ------------------------------- | This file defines the internal, non-public interface between the default | | implementation of the browser's "find component" and it's JavaScript | diff --git a/mozilla/xpfe/components/find/resources/finddialog.js b/mozilla/xpfe/components/find/resources/finddialog.js index 60d02074a4f..49f884793af 100644 --- a/mozilla/xpfe/components/find/resources/finddialog.js +++ b/mozilla/xpfe/components/find/resources/finddialog.js @@ -112,7 +112,7 @@ loadData(); // Search. - finder.FindNext( data ); + finder.findNext( data ); // don't close the window return false;