From dba5766cb9545667a0590cf26816de550bebbfaa Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Fri, 18 May 2018 16:32:43 +0200
Subject: [PATCH] + add: search/replace dialog to be MUI aware

---
 language/common_res.h               |  27 ++++++++-
 language/np3_af_af/dialogs_af_af.rc | Bin 4052 -> 15086 bytes
 language/np3_af_af/np3_af_af.rc     | Bin 3352 -> 3348 bytes
 language/np3_de_de/dialogs_de_de.rc | Bin 4042 -> 15078 bytes
 language/np3_de_de/np3_de_de.rc     | Bin 3400 -> 3396 bytes
 language/np3_en_uk/dialogs_en_uk.rc | Bin 4090 -> 15120 bytes
 language/np3_en_uk/np3_en_uk.rc     | Bin 3418 -> 3414 bytes
 language/np3_en_us/dialogs_en_us.rc | Bin 4270 -> 15108 bytes
 language/np3_es_es/dialogs_es_es.rc | Bin 4134 -> 15168 bytes
 language/np3_es_es/np3_es_es.rc     | Bin 3466 -> 3466 bytes
 language/np3_fr_fr/dialogs_fr_fr.rc | Bin 4032 -> 15066 bytes
 language/np3_fr_fr/np3_fr_fr.rc     | Bin 3368 -> 3364 bytes
 src/Edit.c                          |   4 +-
 src/Notepad3.rc                     |  89 ----------------------------
 src/resource.h                      |  27 +--------
 15 files changed, 29 insertions(+), 118 deletions(-)

diff --git a/language/common_res.h b/language/common_res.h
index be65ce621..aa4e24243 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -113,12 +113,35 @@
 
 #define IDD_MUI_RUN                     17000
 #define IDI_MUI_RUN                     17001
-
-
+#define IDD_MUI_FIND                    17002
+#define IDD_MUI_REPLACE                 17003
 
 
 #define IDC_COMMANDLINE                 18000
 #define IDC_SEARCHEXE                   18001
+#define IDC_FINDTEXT                    18002
+#define IDC_REPLACETEXT                 18003
+#define IDC_FINDCASE                    18004
+#define IDC_FINDWORD                    18005
+#define IDC_FINDSTART                   18006
+#define IDC_FINDTRANSFORMBS             18007
+#define IDC_FINDREGEXP                  18008
+#define IDC_DOT_MATCH_ALL               18009
+#define IDC_NOWRAP                      18010
+#define IDC_FINDCLOSE                   18011
+#define IDC_ALL_OCCURRENCES             18012
+#define IDC_WILDCARDSEARCH              18013
+#define IDC_FINDPREV                    18014
+#define IDC_REPLACE                     18015
+#define IDC_REPLACEINSEL                18016
+#define IDC_REPLACEALL                  18017
+#define IDC_SWAPSTRG                    18018
+#define IDC_TOGGLEFINDREPLACE           18019
+#define IDC_BACKSLASHHELP               18020
+#define IDC_REGEXPHELP                  18021
+#define IDC_WILDCARDHELP                18022
+#define IDS_FR_STATUS_TEXT              18023
+#define IDC_TOGGLE_VISIBILITY           18024
 
 
 
diff --git a/language/np3_af_af/dialogs_af_af.rc b/language/np3_af_af/dialogs_af_af.rc
index 86b26ea17a18d405283a152f7759b73926e3706a..c35f73e08533233d0846e0759e340ce3245f5fd7 100644
GIT binary patch
literal 15086
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
bfyc?Fc7HxUlV62L8M&P7-=N)e4_N;PjoV7D

delta 38
wcmV+>0NMZUb<`iQLIaapGcvOf1;PT8hBBs;<OBMXco`P6%q_A6v$!`l140@Q1^@s6

diff --git a/language/np3_af_af/np3_af_af.rc b/language/np3_af_af/np3_af_af.rc
index 92b6b28acf73a11be713e5f8cddadf58a4fe3cb5..4f564bb3dca885b2fb3416db3ec4eab9fb8c1a56 100644
GIT binary patch
delta 24
gcmbOsHAQNJ6Z2#<u0@lXIDTz*VwPjs#3{i70A}+CQvd(}

delta 29
lcmbOtHA8BH6Z7VKEOIQ9HF)Mte!%>1@-_~I%@Uk{m;t5R3n~Br

diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index f05c45029de3c9e243e7d668822b4efa3df1dd28..eb4d526ff7b9557ab612c30ae5317a6842df0d8f 100644
GIT binary patch
literal 15078
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

delta 30
mcmaD>dP;tS6Z7T=Ec2KbKVfE^+#xBn`G)Qqmd(4&b(jItatwX|

diff --git a/language/np3_de_de/np3_de_de.rc b/language/np3_de_de/np3_de_de.rc
index 6e74be68d05719007355eebf80aecc5828db4277..90dc63945da6662ac6fdced053582dc187f2c9bb 100644
GIT binary patch
delta 25
hcmX>hbwp}|6Z7OWu0@N@I2bp(G5fJ>Hscgx0RVMp2a^B*

delta 30
mcmX>ibwX-`6Z2#(F0Re5SUgxJNAS$s{D7H-akCMp5DNgO<_V|(

diff --git a/language/np3_en_uk/dialogs_en_uk.rc b/language/np3_en_uk/dialogs_en_uk.rc
index 853e83100c100fc6f572972bfda8e1215933f9e9..5d480c85d96e48c08d47807829adfafff06b8645 100644
GIT binary patch
literal 15120
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
TR%As?8P%NZKcjc~4zB+Lg$PiE

delta 35
rcmbPG_Dg<)6Z7OEW3$Z$tQpLkpD;@?Zoa2`gk|zEE2+)z%$1k{{&x+#

diff --git a/language/np3_en_uk/np3_en_uk.rc b/language/np3_en_uk/np3_en_uk.rc
index 7ee8496912939725a4a542a4b4aed09e66c4b009..17f468157edc13b81f9af124003725c002084646 100644
GIT binary patch
delta 26
icmca5bxmr66Z7OEo_U+4IOG^NyD^)wY_{N3VgUeuF$c{6

delta 22
ecmca6bxUf46Z7U@ELJR=otXD9ZZ_dmVgUeW2?vw_

diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index 9512e8f581fc8ff97c78640fec832746bf1b06ea..de48344876817f60e70c847e855620697154e042 100644
GIT binary patch
literal 15108
zcmeI3`%hch5y#KZmHI!pL~^q#N_Z2hRV%Q0SOEuN2NEd~$_B!sB_`rgHd6ogw%^Z;
zXYT_WV`C}@MV5W<J@>rk%*=P@%o+dpKQGhER7pGOG<`}J={#NP`#D{yY+q%U={kK(
zXL_oozv)v+C+RqK^u18|m99rByU>+(*Sh<p`--0E?KFK=ofqlP=}#KvrCpz?w4=9Y
zs(oa2r*5@>k$z26R-2a3tlnp9N8hVyH?>kby-oGhNN>_%+Dq#yt?Ry-w$po+wDh}^
z)>N{s`xu`&Ox`DE7uQPK)Vh?{__J2&Jbe-US6Us`p)IQ4>9--OYoe3&SXcR+zGaRK
z=E04vueZzAzZbV&h@&sXL1yzsza6c2xn0mQd8^HgnB6nUU#BZsqsr9eQwg;dNkvC`
zdnOKFN_Hygxn!lIr_kS)?p&KM(@#C5=Q5{@r$UEH`b$A4kJRI8+K@E5F1Dn1Z>5zr
zjeIDn+}4MF|E*7@Z_Bp&*puuZs#R0%f3i`xRoYbPTU|FzzN5tJZL05vbbKpKtM8WT
zt*OM@lxrO7t)qcU0JMNXP;?tr(5rn>@>-+TzdH=+jSeBPT=~w5^4>Ko_I^#YZyLf-
zyVCviM(hu1ri<F}&sU6A;L#{!^unI0bQ`Cp(g)$s2T8QsjBJ*@dl-aY{rl@j;rxgc
z_M3OVah{o7IFjZfvHo!lzmN0=&nFX;1DEsHilpe&{Eu_t7xRy|+&A>LF0|N@RyTCr
zFgdMjUGNK5g#vF3G2W?U#?Zlk=hAYTx93@1XRKfRiT7%O{j3Wk@F3PzwxK?nx`JKt
zW=Cap>wiOdwW{%HmAz*k?^H%V@Ab{UYpU&r+B7s)t?Rd-8(!zYM&4DOUD32#D6Og0
zu4aPA(=5F4QJ4j&$;y=LPH9ZME_}7NWaxL{z3WOw-z!^@DN)0WTjpb&ndev6?}_Sz
zulaSHQ9r(Vy-{LYW4VVCvRb@OX_RAe7oQQUgcZVP?4+v3`@4+@k88#atOL~7G>_%(
zcOfn5?v>FTeb=-;?)l;U!TaJTdJJiaIeM?N*7s~$5o%2f9cOKXnrsR(Q5VPH4W8z~
zA6$sHt6KfG-fXEZyv6t2*62uvb9TS)8>nLp+V9??2MP54inQ<q$FSYLhE-iZ%E})X
zRxfBpE|BYKy<L<4bEOad8@zQ2gNB-@SQizqRqm^pQBj<$uiLz>+oI{!Y*#8`u5e@+
z3T`9~=aRW&QFo)e3zJ*sd6vHQr0YN<?1?Mmr)xoyfQ0e;P`Z8*MJFcT_+EHq6;TJ0
z-;YY90}rYF2y`xqI+u4ee0WN$niV_3j%4q%@r<3yFDm(zepA_*NhSN1%bpxWzVX>w
zhPZpC!L3K2(~<vGS{#YWJ>%fDQF9^ss(SuidtBfBT#BnmDZAec*U+sp=CEJImwhK)
zAHU2xbt{Hk!*jAO8rc0;wYLjgfol~#VGr{3fP-z};*NON7FulS9=p3eW~yeTfz#4K
z(0*w|-c^MUaObZ^-Hl1>SEGu3weJP<v|*_aOe)9CqgmM&<j*m4c|>|@;?S99j;z5O
zVm3r&D!Ox9pQk3X0C+{?w*f(u<K?J4!jfGGFOa@BLXJ=3%Y{BfLx?LCvBM?pP&I4%
zu-`<lh=r_+!tv@=(C0YmC^Ecm9f+<|aqURdKq>xM-UrHa?7)0PydN+hUy>LXdun#N
z<FwyFo8!h(Pa95TX+vnm{&`D20iF)N3ZAHYA=R9Z*%Ytb$8_vt4?QiZ$DeY4VX-Uq
z3k6@NfB!K`=Eqhw8zkdjhPu}!*$8>xHJRAYjXswa^fc=DwLf$&;}v!bnFIBp5zleO
zJcdOZYgWH_<@fi8ewK9nLly!gK36;J&R30$HAUN>Ydn1AGeu;#6esyv`yyIob2>Ec
zY^o3TG_e}!$F53NZNAfmS;g%7UGdhxX_dDPU4FB%d<THP;E0Asu(Mk3((Sv0=y9+g
z=yX3%|Lj9k-frTbZg=hHT{D|8s}U9--Vd+0gXXnnEBab1#M+`E!_6-6<Z)(KMw0u^
zZN;?pVJjCB$?l2WGW%-Z$$=zDsqYX$w1`4-5<$C`)o}T3OUJOs?&oKAnVlf0!W9|B
zPv`6VE&9$zWbeqX9M3DSkM}{HbIl2i@$-(VosAsJZx8y|qk@N_afhlwRI(wgWUt@Q
z+xIp{$3VA`MHDJV&3Z*RiuyZDoMTa1K#xy7&QV6nAJGnvpM(X-^vyNLe<vr}F*s&a
z<}mT#EBRHw4vZMhn<ZE<+ca9tsHlI%wOsfSIWhzsHgdFNTzPttqh;H(KK;niip7Mn
zYEL_I1buk+qjD77I*|{77eBeNBlw6Hy3$3nVLkZCjUL4wWz^Wj<i(F1ImaJAx+v^6
z^B!(^5oDV@W)#V>b9qD=oct(~V`l97hSjmjjv@tuJpDKlk&faHE+QR+ca+sqOee2p
zMK3dpn=M#uWz-QHb}~`b4)9nu=ve#ND~p`@>0g{s6vrk5hPY!ywus*O9(&YTl)d+=
z;w9x%h2k9IJRyr75<4Gt{Fe6Y9~Dc>pEjSAVuvk74<es}d?X?ai{{<Tn+M=AZtTf$
zQH1-%4*e8vuIm%~Db+)xhgr-tA2;0S6JyIqF#_+49C?hmA$b^&7dL!Je9m{s?)$lK
zH2(M@>l^2R_l?fYbgg5|X%b_HVGCl8!&<sP#m9{vdPLxRiXN_*k6y&U`$P}l+Ih{O
z?5H`5pjPzz|B4wtUf$E5o$Nk-t`o84>@+O=fb5EWB}XlC)%J9P))eA}-HoWY=QsIY
z+GE;SggK#O-qs9`lC^bK^Ho+p%NFm*?tQTm&pG+1cVsS*Sx4r^7mdT&F_|~y#9r9*
zk)DZs)3PIvfjVU5RO}SUPn^kACu4wpL;ha?)FmT?Q_cgcPj5G>L&gi|pl7-}w|SB^
zK^)I#K>y$L=31HNfdRL(z~)U(BaZ1AI?IK1BHB;nJtB1(Km0CM-*d*uVjypoXnj+N
z>?cK>(_@F>0a*y-3{LAUm=xJk#f+~!rv`h1Yg#v7m19xMr$}*j>dR?{&&qx4C8Ix3
zz;!h!9DH8OnQV;Y=d&KcysOv2)YOdQoKog9Me--4$TsWQYn<B{##(+~`Km}pL)N@$
zQbc}b(7=^1S;@oYos<2Jtm28gY?7nNbFZ<A*_ezNQb8ZRGG@`#yj94zDfSjU#Whan
z&>ehbW=C&DJ&f9WdcUc&(Y9p_<?G||79}{^?2Afr-m*35-@j*1-fu4CHF^%i&aK(t
zx6GH2B%je9b1ScB*-!qls(Bvc1s3gCQQ!Nos@uwOuV&egkMZx4QZmu<+7WH;k|s{j
z^KFV$XHVnF?(g5rc>V=6*=Wo<^L329>;GLK)%W}Fo`?NIa9#*q_STC35R7%4Y;O0L
T^^SZhyvc~;Wd9Yt&G-KSGFMN-

delta 21
dcmZoETc^0;49Dg-x*J#~uVa_m{Ki~@831oi2_XOg

diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index 719c1ca67590542e93e2ba7a2cde3aa69e592649..f77166a8ece5ca39834412b5446d4b1f5e894597 100644
GIT binary patch
literal 15168
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
VfeU$-c$$&p$^Kt@pY8$c{{eSCS@{3}

delta 31
ncmX?5woGAz9rI=p)>+J(A23@mPTnRdw3$tB6U*jz=0VH=zN!mk

diff --git a/language/np3_es_es/np3_es_es.rc b/language/np3_es_es/np3_es_es.rc
index 6778d6e681a3c538894c11df53dcb30a0fe52f1d..596c432f160b07c0af75f34502d5c89b1450a01c 100644
GIT binary patch
delta 22
dcmeB@?vmc%#JstJ{TAb9CuTF2%|V<NEC5&E2FU;b

delta 22
dcmeB@?vmc%#JpLC)r@7c6Z0*`%|V<NEC5fK25SHS

diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 859f29697f8e8173ad87ff55bfd18db4fcb7c4ef..8d81751d9431ea5522366f6d83342bb54590f3fe 100644
GIT binary patch
literal 15066
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

delta 34
scmV+-0NwxEb-*96LIaalGcuFjIIOe41-Jr}<OBY*zAeNAv$QuR0~ys1o&W#<

diff --git a/language/np3_fr_fr/np3_fr_fr.rc b/language/np3_fr_fr/np3_fr_fr.rc
index ee1112b5c8d4476a69f0b14396c6c873cba157c2..fb02f75d0aaf9efa40b26d10ad55f94a403b9873 100644
GIT binary patch
delta 29
lcmZ1>wM1%z6Z7N}=0%g`IR0&RVzy$LY{o9N*^2WWGXR~Z3E%(#

delta 26
icmZ1?wL)rx6Z7UrELJR&ZFuHwe!$GcxLJaehXnwE1qed`

diff --git a/src/Edit.c b/src/Edit.c
index be9ec3198..1102978f3 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -5738,8 +5738,8 @@ HWND EditFindReplaceDlg(HWND hwnd,LPCEDITFINDREPLACE lpefr,bool bReplace)
   CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_SPEED_OVER_MEMORY);
 
   lpefr->hwnd = hwnd;
-  HWND hDlg = CreateThemedDialogParam(g_hInstance,
-            (bReplace) ? MAKEINTRESOURCEW(IDD_REPLACE) : MAKEINTRESOURCEW(IDD_FIND),
+  HWND hDlg = CreateThemedDialogParam(g_hLngResContainer,
+            (bReplace) ? MAKEINTRESOURCEW(IDD_MUI_REPLACE) : MAKEINTRESOURCEW(IDD_MUI_FIND),
             GetParent(hwnd),
             EditFindReplaceDlgProcW,
             (LPARAM) lpefr);
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index 6df28e700..dfe84cc68 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -297,70 +297,6 @@ BEGIN
     CONTROL         "",IDC_RICHEDITABOUT,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,20,80,360,168
 END
 
-IDD_FIND DIALOGEX 0, 0, 273, 130
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Find Text"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
-    COMBOBOX        IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10
-    CONTROL         "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
-    CONTROL         "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
-    CONTROL         "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10
-    CONTROL         "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10
-    CONTROL         "Dot &matches all",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10
-    CONTROL         "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
-    CONTROL         "C&lose after find",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10
-    CONTROL         "Mark &Occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,73,10
-    CONTROL         "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,63,10
-    DEFPUSHBUTTON   "&Find Next",IDOK,211,7,55,14
-    PUSHBUTTON      "Find &Previous",IDC_FINDPREV,211,24,55,14
-    PUSHBUTTON      "Close",IDCANCEL,212,99,54,14
-    CONTROL         "<a>Goto Replace (Ctrl+H)</a>",IDC_TOGGLEFINDREPLACE,
-                    "SysLink",0x0,125,103,74,10
-    CONTROL         "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,106,85,14,10
-    CONTROL         "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,106,73,14,10
-    CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10
-    CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,117,259,9,WS_EX_STATICEDGE
-    PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14
-END
-
-IDD_REPLACE DIALOGEX 0, 0, 273, 156
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Replace Text"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
-    COMBOBOX        IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Replace wit&h:",IDC_STATIC,7,36,44,8
-    COMBOBOX        IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10
-    CONTROL         "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
-    CONTROL         "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
-    CONTROL         "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10
-    CONTROL         "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10
-    CONTROL         "Dot &matches all",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10
-    CONTROL         "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10
-    CONTROL         "C&lose after replace",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10
-    CONTROL         "Mark &Occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10
-    CONTROL         "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,63,10
-    DEFPUSHBUTTON   "&Find Next",IDOK,211,7,55,14
-    PUSHBUTTON      "Find &Previous",IDC_FINDPREV,211,23,55,14
-    PUSHBUTTON      "&Replace",IDC_REPLACE,211,43,55,14
-    PUSHBUTTON      "In &Selection",IDC_REPLACEINSEL,211,59,55,14
-    PUSHBUTTON      "Replace &All",IDC_REPLACEALL,211,75,55,14
-    PUSHBUTTON      "Swap Strings",IDC_SWAPSTRG,150,32,49,12
-    PUSHBUTTON      "Close",IDCANCEL,211,126,55,14
-    CONTROL         "<a>Goto Find (Ctrl+F)</a>",IDC_TOGGLEFINDREPLACE,
-                    "SysLink",0x0,125,130,74,10
-    CONTROL         "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,107,102,14,10
-    CONTROL         "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,107,114,14,10
-    CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10
-    CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,144,259,9,WS_EX_STATICEDGE
-    PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14
-END
-
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run"
@@ -824,31 +760,6 @@ BEGIN
         BOTTOMMARGIN, 270
     END
 
-    IDD_FIND, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 266
-        VERTGUIDE, 7
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 113
-    END
-
-    IDD_REPLACE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 266
-        VERTGUIDE, 7
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 140
-    END
-
-    IDD_RUN, DIALOG
-    BEGIN
-        LEFTMARGIN, 10
-        RIGHTMARGIN, 218
-        BOTTOMMARGIN, 85
-    END
-
     IDD_OPENWITH, DIALOG
     BEGIN
         LEFTMARGIN, 7
diff --git a/src/resource.h b/src/resource.h
index 6c4a65fe4..bae786ed6 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -5,7 +5,8 @@
 #define IDR_RT_MANIFEST                 1
 
 #define IDR_MAINWND                     100
-#define IDC_FINDTEXT                    101
+
+
 #define IDC_LINENUM                     102
 #define IDD_ABOUT                       104
 #define IDC_VERSION                     105
@@ -21,7 +22,6 @@
 #define IDC_GETOPENWITHDIR              116
 #define IDC_RESIZEGRIP                  117
 #define IDD_OPENWITH                    118
-#define IDC_REPLACETEXT                 119
 #define IDC_COLNUM                      121
 #define IDC_DEFAULTSCHEME               122
 #define IDC_GETFAVORITESDIR             123
@@ -43,7 +43,6 @@
 #define IDC_RESIZEGRIP4                 139
 #define IDC_NOUNICODEDETECTION          140
 #define IDC_COPYRIGHT                   141
-#define IDC_FINDCASE                    142
 #define IDC_OPENWITHDESCR               143
 #define IDC_SAVEMRU                     144
 #define IDC_AUTOSELECT                  146
@@ -55,7 +54,6 @@
 #define IDC_ASCIIASUTF8                 152
 #define IDC_WEBPAGE                     153
 #define IDD_DEFENCODING                 154
-#define IDC_FINDWORD                    155
 #define IDC_RESIZEGRIP3                 156
 #define IDB_NEXT                        157
 #define IDC_STYLEFORE                   158
@@ -66,44 +64,32 @@
 #define IDC_MODWEBPAGE2                 163
 #define IDD_ENCODING                    164
 #define IDC_MOD_PAGE2                   165
-#define IDC_FINDSTART                   166
 #define IDB_PICK                        167
 #define IDC_AUTHORNAME                  168
 #define IDC_WEBPAGE4                    169
 #define IDC_MODWEBPAGE                  170
 #define IDD_RECODE                      171
-#define IDC_FINDREGEXP                  172
 #define IDB_ENCODING                    173
 #define IDC_EMAIL                       174
 #define IDC_NOTE2WEBPAGE                175
 #define IDD_DEFEOLMODE                  176
-#define IDC_FINDTRANSFORMBS             177
 #define IDC_EMAIL2                      178
 #define IDC_NOTE2WEBPAGE2               179
 #define IDD_FAVORITES                   180
-#define IDC_NOWRAP                      181
 #define IDD_ADDTOFAV                    182
-#define IDC_FINDCLOSE                   183
 #define IDC_EMAIL3                      184
 #define IDD_FILEMRU                     186
-#define IDC_FINDPREV                    187
 #define IDD_CHANGENOTIFY                188
 #define IDD_MODIFYLINES                 189
 #define IDC_MOD_PAGE                    190
-#define IDC_REPLACE                     191
 #define IDC_TITLE                       192
 #define IDD_ALIGN                       193
 #define IDC_WEBPAGE3                    194
 #define IDD_ENCLOSESELECTION            195
-#define IDC_REPLACEALL                  196
 #define IDD_INSERTTAG                   198
-#define IDC_REPLACEINSEL                199
 #define IDD_SORT                        200
-#define IDC_TOGGLEFINDREPLACE           201
 #define IDD_COLUMNWRAP                  202
 #define IDD_LINENUM                     203
-#define IDD_FIND                        204
-#define IDD_REPLACE                     205
 #define IDD_STYLESELECT                 206
 #define IDD_STYLECONFIG                 207
 #define IDD_WORDWRAP                    208
@@ -114,25 +100,17 @@
 #define IDD_INFOBOX2                    213
 #define IDD_INFOBOX3                    214
 #define IDT_TIMER_MRKALL                215
-#define IDC_ALL_OCCURRENCES             216
-#define IDC_DOT_MATCH_ALL               217
 #define IDT_TIMER_MAIN_MRKALL           218
 #define IDT_TIMER_UPDATE_HOTSPOT        219
-#define IDC_BACKSLASHHELP               220
-#define IDC_REGEXPHELP                  221
-#define IDC_WILDCARDHELP                222
-#define IDC_WILDCARDSEARCH              223
 #define IDC_SCI_VERSION                 224
 #define IDR_MAINWNDTB                   225
 #define IDC_REMOVE                      226
-#define IDC_SWAPSTRG                    227
 #define IDC_CHECK_OCC                   228
 #define IDC_PRINTER                     229
 #define IDC_USEASREADINGFALLBACK        230
 #define IDR_ACCCUSTOMSCHEMES            231
 #define IDC_NOANSICPDETECTION           232
 #define IDC_REMEMBERSEARCHPATTERN       233
-#define IDC_TOGGLE_VISIBILITY           234
 #define IDC_DOC_MODIFIED                235
 #define IDT_TIMER_UPDATE_STATUSBAR      236
 #define IDT_TIMER_UPDATE_TOOLBAR        237
@@ -161,7 +139,6 @@
 #define IDC_CHECK3                      409
 #define IDD_PASSWORDS                   411
 #define IDC_EDIT3                       412
-#define IDS_FR_STATUS_TEXT              417
 #define IDC_CHECK4                      418
 #define ___SCI_CMD__SCEN_SETFOCUS___    512
 #define IDR_MAINWNDTB2                  550