From fac1614754ae36056a41b643c5f556b9e34f4940 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com"
 <sfraser%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 25 Jun 2002 21:53:27 +0000
Subject: [PATCH] Fixing bug 154069; hooking up additional find options. Also
 did some file detabbing. r=ccarlen/pinkerton.

git-svn-id: svn://10.0.0.236/trunk@124022 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/CHFind.h                       |   3 ++-
 .../English.lproj/FindDialog.nib/classes.nib  |  10 +++++-----
 .../English.lproj/FindDialog.nib/objects.nib  | Bin 1956 -> 2336 bytes
 mozilla/camino/FindDialog.nib/classes.nib     |  10 +++++-----
 mozilla/camino/FindDialog.nib/objects.nib     | Bin 1956 -> 2336 bytes
 mozilla/camino/FindDlgController.h            |  10 +++++-----
 mozilla/camino/FindDlgController.mm           |  18 ++++++++++++++----
 .../English.lproj/FindDialog.nib/classes.nib  |  10 +++++-----
 .../English.lproj/FindDialog.nib/objects.nib  | Bin 1956 -> 2336 bytes
 mozilla/camino/src/find/Find.h                |   3 ++-
 mozilla/camino/src/find/FindDlgController.h   |  10 +++++-----
 mozilla/camino/src/find/FindDlgController.mm  |  18 ++++++++++++++----
 mozilla/chimera/CHFind.h                      |   3 ++-
 .../English.lproj/FindDialog.nib/classes.nib  |  10 +++++-----
 .../English.lproj/FindDialog.nib/objects.nib  | Bin 1956 -> 2336 bytes
 mozilla/chimera/FindDialog.nib/classes.nib    |  10 +++++-----
 mozilla/chimera/FindDialog.nib/objects.nib    | Bin 1956 -> 2336 bytes
 mozilla/chimera/FindDlgController.h           |  10 +++++-----
 mozilla/chimera/FindDlgController.mm          |  18 ++++++++++++++----
 .../English.lproj/FindDialog.nib/classes.nib  |  10 +++++-----
 .../English.lproj/FindDialog.nib/objects.nib  | Bin 1956 -> 2336 bytes
 mozilla/chimera/src/find/Find.h               |   3 ++-
 mozilla/chimera/src/find/FindDlgController.h  |  10 +++++-----
 mozilla/chimera/src/find/FindDlgController.mm |  18 ++++++++++++++----
 24 files changed, 114 insertions(+), 70 deletions(-)

diff --git a/mozilla/camino/CHFind.h b/mozilla/camino/CHFind.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/camino/CHFind.h
+++ b/mozilla/camino/CHFind.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/camino/English.lproj/FindDialog.nib/classes.nib b/mozilla/camino/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/camino/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/camino/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/camino/English.lproj/FindDialog.nib/objects.nib b/mozilla/camino/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571bdd2ce70df678d6f77b827b416052..5eda225871b13268ccd08e39a06621d65e9a3ec2 100644
GIT binary patch
delta 765
zcmZ3&zd*>2fmMuwfr$YVFaw1cf!L0Lfqe;(2C89y1Qe13vN^$sfk9zI023q2<Upnj
zmX=wQ=1q=aQJ8$6Np^B4i|AxQ=D^9vnItCHu<%a)!z4O+A+!ACL}mxkqnjHUPDnB}
zdDsO0U$LTfe`{OYq?wcLSyUz;U^Zi%Ir%%Y$K+isI;;#Wjf^iQzh(($VtO^%fmN=4
z-kE8O=1n^~Z`$U0(+<s>wtL=8j%hPnX3XI53wA0kDap@kn|21sWerHoOU-GUHWkR`
zam&m}RWDZXFV9OYYMZtQD8%g-9Fkg5;+C13lhQVAGe{AVh*8_Lqd*}pn2{zxfkO}h
z35X>ohHcY!14TIDN+!QyEnwU|IhIXQ8l;pjH@qmZz_BR5G%v*|zXIsHmIv#n9-Taq
zO%CY04Qwtz@+(`6)nkDJ_xTSz6+AGL_rMv}18>C+yc9VwkL|!z#siBu4s7N;@LcG?
zQJw=IBo2I%JaCBnz;3PsU!)Ga7M&?Sxtm?G9uhgA2m%98tk4qx?H^F!0J0tAdn_R!
N!yxznKS&-Q0065DspkLy

delta 408
zcmZ1=w1j`7T>uj!!{mOZ491z0Co-!}mS&cne3)5uvM+Ps<R8rTlW#D~PcC3FV>~)}
zIg7_+9~PC#Ow5v#1z30{n=^~a%-r0_a6*!)$-^e_|B4l@`&--E=1p5PZ`#p$(+*93
z&!WT1sMg4^f3gB=a6NOtYQ_zX3|AW&8Yi{Pn8D?inU~^{nV6HG-nN>dZR)hm^QP^d
zH*MaTnH<w*0_8dVf}KiBO7ine+NLc6^11zjLsBbB+%i*hQrf2N2AKd?Vc0fpGf;pB
zNr_S0v@<{<)_}yk)SR|yhgxKiH2`Ig0%bX1CQLrSDl%D{Egu*Lv)Lr2L8kNNh8HCk
zI2PrX=A}60SG2WFYI(4J>Y>T!+2nv>@s7;}NE)-p1iuwKaEA53B8~$yxek1gIPgjG
zz)O(>j|C2F<~(qp|G-nh1J8vH?B+gji08mj-UDBx4!jmUFqQGZJhquKGZ{ePAmHib
UoS&SZ=vI`Nn_8Y<l-<?_0Je3jmjD0&

diff --git a/mozilla/camino/FindDialog.nib/classes.nib b/mozilla/camino/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/camino/FindDialog.nib/classes.nib
+++ b/mozilla/camino/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/camino/FindDialog.nib/objects.nib b/mozilla/camino/FindDialog.nib/objects.nib
index 39a36f5e571bdd2ce70df678d6f77b827b416052..5eda225871b13268ccd08e39a06621d65e9a3ec2 100644
GIT binary patch
delta 765
zcmZ3&zd*>2fmMuwfr$YVFaw1cf!L0Lfqe;(2C89y1Qe13vN^$sfk9zI023q2<Upnj
zmX=wQ=1q=aQJ8$6Np^B4i|AxQ=D^9vnItCHu<%a)!z4O+A+!ACL}mxkqnjHUPDnB}
zdDsO0U$LTfe`{OYq?wcLSyUz;U^Zi%Ir%%Y$K+isI;;#Wjf^iQzh(($VtO^%fmN=4
z-kE8O=1n^~Z`$U0(+<s>wtL=8j%hPnX3XI53wA0kDap@kn|21sWerHoOU-GUHWkR`
zam&m}RWDZXFV9OYYMZtQD8%g-9Fkg5;+C13lhQVAGe{AVh*8_Lqd*}pn2{zxfkO}h
z35X>ohHcY!14TIDN+!QyEnwU|IhIXQ8l;pjH@qmZz_BR5G%v*|zXIsHmIv#n9-Taq
zO%CY04Qwtz@+(`6)nkDJ_xTSz6+AGL_rMv}18>C+yc9VwkL|!z#siBu4s7N;@LcG?
zQJw=IBo2I%JaCBnz;3PsU!)Ga7M&?Sxtm?G9uhgA2m%98tk4qx?H^F!0J0tAdn_R!
N!yxznKS&-Q0065DspkLy

delta 408
zcmZ1=w1j`7T>uj!!{mOZ491z0Co-!}mS&cne3)5uvM+Ps<R8rTlW#D~PcC3FV>~)}
zIg7_+9~PC#Ow5v#1z30{n=^~a%-r0_a6*!)$-^e_|B4l@`&--E=1p5PZ`#p$(+*93
z&!WT1sMg4^f3gB=a6NOtYQ_zX3|AW&8Yi{Pn8D?inU~^{nV6HG-nN>dZR)hm^QP^d
zH*MaTnH<w*0_8dVf}KiBO7ine+NLc6^11zjLsBbB+%i*hQrf2N2AKd?Vc0fpGf;pB
zNr_S0v@<{<)_}yk)SR|yhgxKiH2`Ig0%bX1CQLrSDl%D{Egu*Lv)Lr2L8kNNh8HCk
zI2PrX=A}60SG2WFYI(4J>Y>T!+2nv>@s7;}NE)-p1iuwKaEA53B8~$yxek1gIPgjG
zz)O(>j|C2F<~(qp|G-nh1J8vH?B+gji08mj-UDBx4!jmUFqQGZJhquKGZ{ePAmHib
UoS&SZ=vI`Nn_8Y<l-<?_0Je3jmjD0&

diff --git a/mozilla/camino/FindDlgController.h b/mozilla/camino/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/camino/FindDlgController.h
+++ b/mozilla/camino/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/camino/FindDlgController.mm b/mozilla/camino/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/camino/FindDlgController.mm
+++ b/mozilla/camino/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];
diff --git a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571bdd2ce70df678d6f77b827b416052..5eda225871b13268ccd08e39a06621d65e9a3ec2 100644
GIT binary patch
delta 765
zcmZ3&zd*>2fmMuwfr$YVFaw1cf!L0Lfqe;(2C89y1Qe13vN^$sfk9zI023q2<Upnj
zmX=wQ=1q=aQJ8$6Np^B4i|AxQ=D^9vnItCHu<%a)!z4O+A+!ACL}mxkqnjHUPDnB}
zdDsO0U$LTfe`{OYq?wcLSyUz;U^Zi%Ir%%Y$K+isI;;#Wjf^iQzh(($VtO^%fmN=4
z-kE8O=1n^~Z`$U0(+<s>wtL=8j%hPnX3XI53wA0kDap@kn|21sWerHoOU-GUHWkR`
zam&m}RWDZXFV9OYYMZtQD8%g-9Fkg5;+C13lhQVAGe{AVh*8_Lqd*}pn2{zxfkO}h
z35X>ohHcY!14TIDN+!QyEnwU|IhIXQ8l;pjH@qmZz_BR5G%v*|zXIsHmIv#n9-Taq
zO%CY04Qwtz@+(`6)nkDJ_xTSz6+AGL_rMv}18>C+yc9VwkL|!z#siBu4s7N;@LcG?
zQJw=IBo2I%JaCBnz;3PsU!)Ga7M&?Sxtm?G9uhgA2m%98tk4qx?H^F!0J0tAdn_R!
N!yxznKS&-Q0065DspkLy

delta 408
zcmZ1=w1j`7T>uj!!{mOZ491z0Co-!}mS&cne3)5uvM+Ps<R8rTlW#D~PcC3FV>~)}
zIg7_+9~PC#Ow5v#1z30{n=^~a%-r0_a6*!)$-^e_|B4l@`&--E=1p5PZ`#p$(+*93
z&!WT1sMg4^f3gB=a6NOtYQ_zX3|AW&8Yi{Pn8D?inU~^{nV6HG-nN>dZR)hm^QP^d
zH*MaTnH<w*0_8dVf}KiBO7ine+NLc6^11zjLsBbB+%i*hQrf2N2AKd?Vc0fpGf;pB
zNr_S0v@<{<)_}yk)SR|yhgxKiH2`Ig0%bX1CQLrSDl%D{Egu*Lv)Lr2L8kNNh8HCk
zI2PrX=A}60SG2WFYI(4J>Y>T!+2nv>@s7;}NE)-p1iuwKaEA53B8~$yxek1gIPgjG
zz)O(>j|C2F<~(qp|G-nh1J8vH?B+gji08mj-UDBx4!jmUFqQGZJhquKGZ{ePAmHib
UoS&SZ=vI`Nn_8Y<l-<?_0Je3jmjD0&

diff --git a/mozilla/camino/src/find/Find.h b/mozilla/camino/src/find/Find.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/camino/src/find/Find.h
+++ b/mozilla/camino/src/find/Find.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/camino/src/find/FindDlgController.h b/mozilla/camino/src/find/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/camino/src/find/FindDlgController.h
+++ b/mozilla/camino/src/find/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/camino/src/find/FindDlgController.mm b/mozilla/camino/src/find/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/camino/src/find/FindDlgController.mm
+++ b/mozilla/camino/src/find/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];
diff --git a/mozilla/chimera/CHFind.h b/mozilla/chimera/CHFind.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/chimera/CHFind.h
+++ b/mozilla/chimera/CHFind.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib b/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/chimera/English.lproj/FindDialog.nib/objects.nib b/mozilla/chimera/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571bdd2ce70df678d6f77b827b416052..5eda225871b13268ccd08e39a06621d65e9a3ec2 100644
GIT binary patch
delta 765
zcmZ3&zd*>2fmMuwfr$YVFaw1cf!L0Lfqe;(2C89y1Qe13vN^$sfk9zI023q2<Upnj
zmX=wQ=1q=aQJ8$6Np^B4i|AxQ=D^9vnItCHu<%a)!z4O+A+!ACL}mxkqnjHUPDnB}
zdDsO0U$LTfe`{OYq?wcLSyUz;U^Zi%Ir%%Y$K+isI;;#Wjf^iQzh(($VtO^%fmN=4
z-kE8O=1n^~Z`$U0(+<s>wtL=8j%hPnX3XI53wA0kDap@kn|21sWerHoOU-GUHWkR`
zam&m}RWDZXFV9OYYMZtQD8%g-9Fkg5;+C13lhQVAGe{AVh*8_Lqd*}pn2{zxfkO}h
z35X>ohHcY!14TIDN+!QyEnwU|IhIXQ8l;pjH@qmZz_BR5G%v*|zXIsHmIv#n9-Taq
zO%CY04Qwtz@+(`6)nkDJ_xTSz6+AGL_rMv}18>C+yc9VwkL|!z#siBu4s7N;@LcG?
zQJw=IBo2I%JaCBnz;3PsU!)Ga7M&?Sxtm?G9uhgA2m%98tk4qx?H^F!0J0tAdn_R!
N!yxznKS&-Q0065DspkLy

delta 408
zcmZ1=w1j`7T>uj!!{mOZ491z0Co-!}mS&cne3)5uvM+Ps<R8rTlW#D~PcC3FV>~)}
zIg7_+9~PC#Ow5v#1z30{n=^~a%-r0_a6*!)$-^e_|B4l@`&--E=1p5PZ`#p$(+*93
z&!WT1sMg4^f3gB=a6NOtYQ_zX3|AW&8Yi{Pn8D?inU~^{nV6HG-nN>dZR)hm^QP^d
zH*MaTnH<w*0_8dVf}KiBO7ine+NLc6^11zjLsBbB+%i*hQrf2N2AKd?Vc0fpGf;pB
zNr_S0v@<{<)_}yk)SR|yhgxKiH2`Ig0%bX1CQLrSDl%D{Egu*Lv)Lr2L8kNNh8HCk
zI2PrX=A}60SG2WFYI(4J>Y>T!+2nv>@s7;}NE)-p1iuwKaEA53B8~$yxek1gIPgjG
zz)O(>j|C2F<~(qp|G-nh1J8vH?B+gji08mj-UDBx4!jmUFqQGZJhquKGZ{ePAmHib
UoS&SZ=vI`Nn_8Y<l-<?_0Je3jmjD0&

diff --git a/mozilla/chimera/FindDialog.nib/classes.nib b/mozilla/chimera/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/chimera/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/chimera/FindDialog.nib/objects.nib b/mozilla/chimera/FindDialog.nib/objects.nib
index 39a36f5e571bdd2ce70df678d6f77b827b416052..5eda225871b13268ccd08e39a06621d65e9a3ec2 100644
GIT binary patch
delta 765
zcmZ3&zd*>2fmMuwfr$YVFaw1cf!L0Lfqe;(2C89y1Qe13vN^$sfk9zI023q2<Upnj
zmX=wQ=1q=aQJ8$6Np^B4i|AxQ=D^9vnItCHu<%a)!z4O+A+!ACL}mxkqnjHUPDnB}
zdDsO0U$LTfe`{OYq?wcLSyUz;U^Zi%Ir%%Y$K+isI;;#Wjf^iQzh(($VtO^%fmN=4
z-kE8O=1n^~Z`$U0(+<s>wtL=8j%hPnX3XI53wA0kDap@kn|21sWerHoOU-GUHWkR`
zam&m}RWDZXFV9OYYMZtQD8%g-9Fkg5;+C13lhQVAGe{AVh*8_Lqd*}pn2{zxfkO}h
z35X>ohHcY!14TIDN+!QyEnwU|IhIXQ8l;pjH@qmZz_BR5G%v*|zXIsHmIv#n9-Taq
zO%CY04Qwtz@+(`6)nkDJ_xTSz6+AGL_rMv}18>C+yc9VwkL|!z#siBu4s7N;@LcG?
zQJw=IBo2I%JaCBnz;3PsU!)Ga7M&?Sxtm?G9uhgA2m%98tk4qx?H^F!0J0tAdn_R!
N!yxznKS&-Q0065DspkLy

delta 408
zcmZ1=w1j`7T>uj!!{mOZ491z0Co-!}mS&cne3)5uvM+Ps<R8rTlW#D~PcC3FV>~)}
zIg7_+9~PC#Ow5v#1z30{n=^~a%-r0_a6*!)$-^e_|B4l@`&--E=1p5PZ`#p$(+*93
z&!WT1sMg4^f3gB=a6NOtYQ_zX3|AW&8Yi{Pn8D?inU~^{nV6HG-nN>dZR)hm^QP^d
zH*MaTnH<w*0_8dVf}KiBO7ine+NLc6^11zjLsBbB+%i*hQrf2N2AKd?Vc0fpGf;pB
zNr_S0v@<{<)_}yk)SR|yhgxKiH2`Ig0%bX1CQLrSDl%D{Egu*Lv)Lr2L8kNNh8HCk
zI2PrX=A}60SG2WFYI(4J>Y>T!+2nv>@s7;}NE)-p1iuwKaEA53B8~$yxek1gIPgjG
zz)O(>j|C2F<~(qp|G-nh1J8vH?B+gji08mj-UDBx4!jmUFqQGZJhquKGZ{ePAmHib
UoS&SZ=vI`Nn_8Y<l-<?_0Je3jmjD0&

diff --git a/mozilla/chimera/FindDlgController.h b/mozilla/chimera/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/chimera/FindDlgController.h
+++ b/mozilla/chimera/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/chimera/FindDlgController.mm b/mozilla/chimera/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/chimera/FindDlgController.mm
+++ b/mozilla/chimera/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571bdd2ce70df678d6f77b827b416052..5eda225871b13268ccd08e39a06621d65e9a3ec2 100644
GIT binary patch
delta 765
zcmZ3&zd*>2fmMuwfr$YVFaw1cf!L0Lfqe;(2C89y1Qe13vN^$sfk9zI023q2<Upnj
zmX=wQ=1q=aQJ8$6Np^B4i|AxQ=D^9vnItCHu<%a)!z4O+A+!ACL}mxkqnjHUPDnB}
zdDsO0U$LTfe`{OYq?wcLSyUz;U^Zi%Ir%%Y$K+isI;;#Wjf^iQzh(($VtO^%fmN=4
z-kE8O=1n^~Z`$U0(+<s>wtL=8j%hPnX3XI53wA0kDap@kn|21sWerHoOU-GUHWkR`
zam&m}RWDZXFV9OYYMZtQD8%g-9Fkg5;+C13lhQVAGe{AVh*8_Lqd*}pn2{zxfkO}h
z35X>ohHcY!14TIDN+!QyEnwU|IhIXQ8l;pjH@qmZz_BR5G%v*|zXIsHmIv#n9-Taq
zO%CY04Qwtz@+(`6)nkDJ_xTSz6+AGL_rMv}18>C+yc9VwkL|!z#siBu4s7N;@LcG?
zQJw=IBo2I%JaCBnz;3PsU!)Ga7M&?Sxtm?G9uhgA2m%98tk4qx?H^F!0J0tAdn_R!
N!yxznKS&-Q0065DspkLy

delta 408
zcmZ1=w1j`7T>uj!!{mOZ491z0Co-!}mS&cne3)5uvM+Ps<R8rTlW#D~PcC3FV>~)}
zIg7_+9~PC#Ow5v#1z30{n=^~a%-r0_a6*!)$-^e_|B4l@`&--E=1p5PZ`#p$(+*93
z&!WT1sMg4^f3gB=a6NOtYQ_zX3|AW&8Yi{Pn8D?inU~^{nV6HG-nN>dZR)hm^QP^d
zH*MaTnH<w*0_8dVf}KiBO7ine+NLc6^11zjLsBbB+%i*hQrf2N2AKd?Vc0fpGf;pB
zNr_S0v@<{<)_}yk)SR|yhgxKiH2`Ig0%bX1CQLrSDl%D{Egu*Lv)Lr2L8kNNh8HCk
zI2PrX=A}60SG2WFYI(4J>Y>T!+2nv>@s7;}NE)-p1iuwKaEA53B8~$yxek1gIPgjG
zz)O(>j|C2F<~(qp|G-nh1J8vH?B+gji08mj-UDBx4!jmUFqQGZJhquKGZ{ePAmHib
UoS&SZ=vI`Nn_8Y<l-<?_0Je3jmjD0&

diff --git a/mozilla/chimera/src/find/Find.h b/mozilla/chimera/src/find/Find.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/chimera/src/find/Find.h
+++ b/mozilla/chimera/src/find/Find.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/chimera/src/find/FindDlgController.h b/mozilla/chimera/src/find/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/chimera/src/find/FindDlgController.h
+++ b/mozilla/chimera/src/find/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/chimera/src/find/FindDlgController.mm b/mozilla/chimera/src/find/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/chimera/src/find/FindDlgController.mm
+++ b/mozilla/chimera/src/find/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];