From 5fa429c32615480a8cabec03879d7beeb7ff749b Mon Sep 17 00:00:00 2001
From: burniouf <remy.gibert@free.fr>
Date: Wed, 19 Oct 2022 17:23:41 +0200
Subject: [PATCH] LIBGUI:more bugfix

---
 .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes
 LIB/LIBGUI.S.DRAW.txt    |  47 ++++++-----
 LIB/LIBGUI.S.MENU.txt    | 170 ++++++++++++++++-----------------------
 LIB/LIBGUI.S.SYSBAR.txt  |   6 +-
 LIB/LIBGUI.S.WND.txt     |   4 +-
 5 files changed, 102 insertions(+), 125 deletions(-)

diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index ddaa3e2c0f70a00daadb2cf9d1d43efc1c447740..31098df04e0f09b049c98ae09f35c461828ba845 100644
GIT binary patch
delta 17615
zcmbVyd0bRg|NotZ@yMX8vjOTw<>G=PiwjbT+!+y!O+keoHApBiw_Hlw2A-UgnPX_>
zji)U1iFz=`#1`u*OIvNxu+nl#Ez`8b@M&==_4_{e++k7w_`QDhdOP=??ejUG^EsdG
zQvLUp&}v{a4boe~A738yoZb@t%0Sa|-F3o4pM*aANvICc0|vkd1a18!)Koqp>`;H<
ziNv81!sTOvSTw{MzBRqvw0pW|bZ<fZuSwh|o*O=OM9qj*BTf##AtgHAF?{Us{87J-
zvZu%25H;F5Z2rK}HzdpHvRj@kFPB%#b@F=oCHXCRul%cgv+EJp$F3lEushuCaL2g^
zxfi?FxOccmkG^d*9lde%?$JMvzBoE8BQL|3@kz#|jJPqA#ym1++nBSSF`=2snMIk4
zGn+HdW<DGDY+QZZ#kk_W@Aob4`!4=}tKa*51;Jk>xAYV1lEs*`&9P$7ftzjqS#p~}
z{2*DpGp$ho<Kn6jXR2g-*=~$9h%qVlGT&Z#gX7t~@~15q%U1p&`u-F*IJRB6vJNd_
z=gRCaOlz^!3yq3thbby%uRMO^+q2~j!nVEgn&~H|x9CsYdUAQ#*)snGW%v$LdDUKd
zpl9R#Yeail(?QvPNdEki+<I9q)aO)(Wi=g<{YT}`FUYMI)t01TP3L6)d3odK`{mXH
zyvek3zr5;z-1L|1{~I0O$*qU^Y}3l`<W+~kcv@N0e%XIu>y;fQeNWF{a_irL<-e2t
zhvm=D$*t!D%U_WF7qQAgx%E(B`GfMRLvqt4*?$=wN95L{f#r|LtB$J6i@W=8uKa)G
z%)>UOvDWneL5*!ktn1H6p7WoR(^~h--h7Az;_wzQsU;2f@0abB`98L1xw61_K=yyH
zHheGpe~>+B`9by{m(z~t`;N>06Y}u_-wC;PqyIZB_7_|1Fq4qBSmd=Mm-sJW<Uuy_
zA`??P*@G$-^$<biknBIEHXM`vKQcakl>I-+X(K@PC)t0Jkv%EbCi;(Hu}f^RqwL(<
z$zo{dk;<!kOt*XX%bO0!;<*0*@gI~o9g@ZQ{k^x8)eB&K(_!9zMBa2%ZU0AEc3SH>
zd4+bgVL?xI*Ig`|$+oycQ-CDnQ{DAtPqBd)(8yJc4J7KoOK9VY$OalQ&;w!E=j@lW
zA+<RN<c%|1bf2dCR4v2S>~jvH=cGL6P@qRu5Uzak=N)>N)^xSrN!O@;)HSNFx0iWv
z^cNDg96E8x_pPk{?32ad0qV)AYJihtYLG;N@>?<+N%bvIg-zgZzYH#+4UiJ9itn(@
z<Ol8!%0Aq%LriASao<rHH~x6OHy{5NcncbJ-l^*G;H(ST@$|%DPe_UgDs1V~X!7k<
z8oo01)9qD0`N}jnbU%#48K@dlf~mfPis5V1l-_8JKx1`}hROEIiQdT#Q!0zRQ`*NY
z!5EJ=;p#zWv<1b~xa#+=yY0qc*dg)BxXp&#)VQ+75b>xeUgFX@#ijEz|M{kqtlG!F
zT_J9(6qjXtygAiTffsMi2E%Ll>-NKroo@`m@{ReveR3o5eIsu$)CV<ZuRAU;hmC8<
z_MMU&a(q9_xsJF-D=4d{(aH&(kpp~mKBacbD_dpX8F|&Wa<%<{c+4a6_ls!gMBK`V
z3$t>nyBiq?I&c6|8@g5NHy9W#mB&BJ*yD!ZMd62KZtqxe@_>5M?Dn0LcjDjka(yCx
zE~qaT<@zMNTv1;H7wgxl|LQ%ird-jVC+3z7f8O0Nc3G}Bubyl$iYo`yCvGsYAF_e)
zw_x_utvR<Xc;oWsTyHMTtNz+v)|_j9V6P0@zq2{_fqnA2eRA0g)7q-CZ%Itd2s4QP
z8qp}MnSSp~@x|d=#<XQVKc*p5JS~1=ZHaBHW#>01HE#20RW>+j|0#LHW$dP!1X{L?
z8NYGcY&orRjCV}!yC*WM-)fjvF>S-27^JSB`|Jofj&#v~gD9pC+$^q=GMa7_{Wqy^
z5vvk18oQ<Y24zJ124qA>`vxj;-<Sr31P-8a4U~A&H>O<A_rn^k_Db0+*XmEWD)K7|
zw&b==dp^IRK>TG`L%w~^S8i{9t=?OpH9eo(khe+75N{pGI*-G8H5AM_ft%N<A2Y@2
zarL_9T=DF%E$p9$Tzi$?n_K(u6M5Co&9s*_219Wg+4<h29<YDE8~0j0!u{$&9gyoo
za8lo?FNfv&L3lZ+z8q5jJ)-`5RGIdz$&mwnSr$+gzm&mN(l=+>>&abixPp2^b5?zK
zJYr2OW3STjm8t|7>PC~jGRxNrg{vIrJEOe&ttlhM;M#6%n=CFKyrB)U-dwOO%R6qx
zCWC98(WN-{oBH;8c`)9#8C_ic&?}Be<Sl0mE~R9@>D$nS$q-}6CwhbvUnhz+O2z?G
z*=^HYt<zn#q4mMdS;q@kXYIt#gw<KkXElry%Z8VM=iHs)xoyVAaPL&{=b>E6n~uvr
zPGqjCsJ0tr58fj2_o15|?Y$osv))PQ#e<?dXtL>Y6~{qSFOSMY1bFDSqCR*}Zd;J}
zL~`|M)r($E64l;Yx8$NfQ5>DzP?$DnK!&%tVM3MQom3AyDDF+IwXs7C3(2Woohx1z
zHy4U$oMKIK^@prEDKpSK3e8x^)Z%Z-7ySjI_}l>T?2x{j`&O^x4Y|(^@V_ZPBDRI%
z%wLirfL!0pa;{hT=AbFf^UI*kBwI{%Ufir(QPv^T%%sguMs%P!AHN#IX0WO;akiaU
zqOd*eFJIX9vPM%tt+-b0Q?;tchM?vwSPf>rV1T*Zhs75iarHf$vpi4-wBa<M54;&>
zZ!hCAOVt$C4sXK!2s{Xz7lJ;uiA_`e3TzY;W{aKq2U*qaPE0Uk$&7YK`=+nm;?beC
z#uc8ND;r?}8wx>;odI}hm;jQ{PnE|r2bq6SS+G}i1JzpQZN!g;Lbq}gz?i+>dKcq{
zxBom8%QEeFm-VI9+togJz@2zFAcIF^OHZak-L-Lj-c3*s&!G;F?mB!!NUrk1ccyGl
zQqm)1+Jfp$A|6CMbjL$|_vYMnJKWE{=WePH{gsGgv)_Epjg~g!$(_}|&qTb|*b^rL
zJ1VFru=C_m(((ta-G+<oX2q}iMP5-KwK|JCoG{$s`Y?6qaT!C6>QLxwt$mZn;A)#k
z+U+Xyc#R^)4<PK~89J`wRkW^JuRf|d%lC`S?Cmey-fGjCRUNR~;HuTP_&cmC3{n>C
zg*Sia)aESQi-P*F=B%_+25$+D{gmJ>g$=AMfnqciRF*<Bn98v6h3Llc31tl|7HwdG
zXc;q{%O-oL@QW9YYiCk#5pJb2?T9H}H&A)#h-vUBS@z5FCuuDQ%Y3sCV*A(1zGvj|
zK4*siN!j<bJj*vE!~c}*t4CW>hF_6=&!KH-hJTjw(-Bib_#WB!rCi1m8OKM5)*Nc=
zsnmSbEmBE2YKkzekz0mh-1wuW_=xrL>fGgF=W#@kKwBS(P^md;it^ynn=XFZ@?%=r
z#nb5McJhGua8mVexpxeKvndh%r6TMC;*Mh@MCV9M4tBL&T-DvREm%7OIAd(f&2&VZ
zm|9!e0E0{Z(=fJ**^|xVxfw8se~)6ec-Je;jJLiD-%}ljr(Lgj0u4dpsX^5})i$kZ
zb2l|7gYyVOYGyCn)ZO)Ii&t$+E325woJZOzU0$=?!ls=P^0vq=#zv!eDo#c1c|~rq
z@t#-ZmL3gL+kzTN?z!QOCJceI!NKLd=HX+iguK@SV}jWjwoFexW~<y1ie)h54Y`Fc
z(J-~;LR#6f@!p#ekvGeG#_#lRk<X5=P2A~!MSXjfz4hMNJbqU*b~C<pi(DJV-q`-f
ztNUkW`I(pG9{vOG>{^2?H20NZII2EBm=Zke<+_)c@%pn-598@?lpis+Mft~y?0o%h
z^+%jKg0=T=3l*zVYGcJWQfh7DXDPK2ewfC1n8tw~-zGRY%x7_vH&^{PuRiq6m$)9-
z%TAy@tt@-v+jn9d^L%e_wl9;tu9;Aq187w~`@s~eJFA@h!SrUx=Hb5P;Ts}Z=KHJS
zKW2*aRLh@cKeet}p809mZ?JnynCcGB_#~`$c69V7u`T+>FyG(|zZMs58l16hiRk-6
z_U3L|D*9SvL|*WIzR!?JyenrTobr7x&)FVGCf=7<eE>n_`gWmz2k+l4&v`G<|Dn9f
z^O20jlU!<87}#Eb93p_+x*-`*cQ&REI0GLh#AnYWW~eVoCh^%3yAw0Y8pY~?V9q}z
zBkfXhhVNb3@60$Q__oXbp=e3T@a>TONv!2Pxv{tJZCP_cFAn!KWsCkCQCx$V9M%P=
zIXBGByjP}JKC)?|=r3Yk(SIvHwCVh(#ibtM7yRc-{<BB@5#ba~zJc!CRA*UYm^&=$
z8NOVP_T}JH?PZKY1e!$8S0lwgHA3j=6ku^DwAam6(dS%2aI~S@ws5x^MW2H!^M^z8
zjYvWxpwiv~e<ZsINP42!>x2z@abkix#L_<GL?J2}6Z~QB;HF~HKS_kM$sPJ>LPty&
zAjxStG+L?)4ESey!u0xyZu$FAXWCl$Hu;wx4-cPyhXCDyV89H706l=7KqwFfuyGMU
zBoGBy04rbv?0^G^24a9%pcl{^=mUsA9ME^`>38}?{SwiY(>QRdm^b#1w@h#~jS>Bs
z;>s1W?@^Y6tdvo-8N0E+=y_6xNnZI6mv5?TWu43SFW1U%T)uBz{(%|3{VryYr@2s>
zaQU8g`S!Sck#1j%+t<&Hj&z^R?d#+ACAhiPtbEMnt97m1<?`)zA^vMB6#WxK_Q16T
z4*}^S*k<W>mEC7?kMlX)O_N3c6ef1wkyb@~z1(mQX|287c=E-$!6KBjx7*j3wcGI=
z&mQnAxy783tO7OorT)FF!LIFNYC{?y%x>&{;!t|aUo*>KPv2CgztsO0-5%x5m-^pi
z=<YiGdQ<;bsv{zVCq=c`_x9yucNP^5i3(RfOpIR{_P-Rh^^MENdS(_4N$<I}d`SGu
z+jZlVaAW-WZjt;yMfd29ZLhb*_X-^sJw)f8m^sC{M9y0|I@evAS(EFO^A;v95n`OY
zXKA^d_vq-NVszb7DCZR}S|EfC)z#g$pu9$%Dd!1dveM^Dd>>tkl5r(o>SZ3LtD9Z1
zq^4i05IREVOjc%BU~CCnbEHmL?~xq6(sXqdl}iNkC@eI8c8xPx5O3h*<h(UX91XYV
zqi<Bo?vd>Jq|wUSEAd1189JrrLCI#xWQ&*A^eb|@WM`h!l{`YQ%gUIAlC_W7-A*_n
zi#;x7!{j{Yl)<TjHT%i=l0}!Jl-(`alBa+hGM;g<R3JBN+~jK9qzGa8oJwHFy$aa0
zXp0arp-ac$WTDSQ*44{kE7mEihbLINPtpzAE)5Y%Co4DTq>}Da_-p?X<r$sSPgkmJ
z*GU%BExI~E{D*Q-C-pH+#j|yql6g7aVw#TUKDR10m*Z_@X4bs9i-g!R_03aIC<K+G
z*K(V#Zq~vDT=<2HXV0FJ?-qh)ur(@pk1IE)kO{|CK4WI3V6McjW-P36rU_AZV8ERD
zHRv0cRWfBk)gp9P>6~fGf<+5!1Tu@WI_OS*6s4KPl}i?_;%Be?kma=KV`nRyQ>3U#
zoVAEKo%Dc>706t^gk@gmB{CPeOWdUbnXjvxKXZv-y-VX0EY7YhU%>h7vp{LnOTD`<
z#Gu(rgxEzYrASW6e0TfF4p;(RmJ;+!xhnO!S3A7>+Epq30ZyE8^r-TjS+W{agy;uV
zb?R%b<_Fj>NwC!D>K4pfKwU*OH`P?ly}NS3!b-vMPvw4tWKVoZS2qtT&eg1-&{;IL
zSg?9^gP!V8KD3q;OcWec*^U|3<=VoUV&)a(7YO!8m}c7ak8<58Ua5)4$2nxjSDI3i
zQkq<nESOhmdmJf5KGsRFY*2|{U)^a6hCi&`Fw5i09-|bce}ao6@kuU@$hBM?>J{ZH
zkf*TSMGFN|$C-%zmy#GH#ps?^>hF?lQP1e=0=FC*#jg3VXO)FPQfl;be0)?r=U`mr
zqMW&ND;HptBEB^sO80MN^(-k;sWM6SwI<2fy+K!3HFv3Cc|ke5Sc+0Mm?WE0*jEbD
z+ZvS&lVsJsq)yPsG%5AnBx{e-WP$j#Ih**LxNefITWK<`m$g~hZo<8Nh0lq8Rh<(u
zMIf(fQ(osiv0K$1#}qc{O|_5W^uVQ4Wj9-S88$*6{T3T$Q@&d$_14F}!(L)iw`1>`
z@hgzWYZoVK2fr<>rKoZdPANqo?{Qg(?<;4zNqwvzbO;R+OBSL&V)jm{CsHq6vhog*
z#^C1)k)q=xcC*t}4H8=r=N<lqcHXMOl%xob7G(#K?7A<Rlq`|qUv=&WamUxJ-{x`b
z>$23$!pw<d^NX?V$ZuFjdCh=Z3K=&86PF6MZ=na3cj5MXlaiJ!fuhfJSKcj<1G>6J
z<uHK<xe1Isbj{4r!@9bKi^^g2)t!YOVXsT@>S6DoW<JW56vjLF2WCWO%$^~TW15ov
zs42~Ht~8ky6@|&Ai{`oH5+U-$HN?nIx;i#J@}#b=ykZ8kP^wjcm5w~c`DkzQfbF08
z*+>3z%}SQjT~`>Kj5RE+UDr?>$r+8+UpcFmHqL6+?8OUb%8PF=o>!VFgq~#-mekC2
z$!HQn{->++aCs&P<acJz$_4TV`-Q@vgFvbl)f5&_blx_(YGKuFvteJ)^NR>6MPB4~
zkM(C)Ra822gdTqf{3EkRmpGR=K9w5eJWwE4m_3A(67={j7i{_*y=woN7O7W}o6jht
z-kG9$T6MZQ*BqqR4qu4qrq@)QEskCxj_8%iW~tABV13;TI0bI$TzPIMvl+!>ONvtj
zvl$D_t*mj55C-&6)|sUQT~8(M3&|qoxrL}u&PW$;5{3!P*^Cmb5&Ami-ViA!HdTnS
zTsyRnP47%ql<-u^(v9)su<MnU3ofhM?7$i@z0Q$>Jx1>wp)hZEl~0S+$cz-CdSAPA
ztf=@wcvhUgZuY_j0_m$)mEGD8@3<aJljc<9R?Z#5bi>?VU$?Mw28Bk4#p_k=3y3I8
zLYI04xX8>2jO>gWXNnLpP!A(F1J^<AdZDMJ_aOT|htxZJo7uH4*md%Bu&d?w-NCMz
zKH_4TxubJh-Z(~dj%EqNhvJGG{lwK2?5Z=n&U8xL5qz@#28<jzx*l2cM&!BmgIBv(
zEMM)eD5)rAnf*Xy_KiC6zzy||W{<mtAaQdK?A_L{q0~NSV1~C;t+C>1wOdV+SGzHI
z<Y<uGd{2E$v%5{|I&eS+BT^;Q58-4Q^=$NzLG``5j79F9*2>4866%L)V@*aj_(|nb
zm}EC1y&{SuTpH>@nav%j2iJ?J9A8~p#@7KPIcjkaq)}_@T5NWz^#Zjfh&qB+DeQ}N
zPRTpN-EHjYXSpJzqDMu~iqQJh4Tfg7_H{%pWO<NP@n{~In0M;+i;@I1j!#8(2)hRj
zl;?PZR*Ph9YBdtg?5mPm2nVaY`p7B~>{Ao3Tk<V*R4zTN4yCTHR?O9vP}{qzeyOgY
zl`z=~fg)z7G>(1z+4QYjJ>fBJhE3nNQKzhD<y4l^v2tpY`lWSQJ}P4%=~ZjUKC@b!
z_o9&OJF2uqNO7K$1Tp`n&G}5qX{VA<PGft<99AeIZ9(|TGBE+Aw5l-nso?}~4@0}@
zI_*ZZ8_{krtG741Q7drYyD5QXLa5C_N7xq$w6&g)$KTG_A`q3QGJnV(e8xa~B|h$T
zo@dWR;(FbxF(%@4)Jc#HW<e_;ajm@PRtvP=30)Ki=dKoc{Rf!J1?sl-J)z26nKV_3
z4e%{xfd1ByD5*7Q?Gs|i){tn)J|!aB$BnicNU5%2Ysy{H{icZMzj=7jspIW?q#LcT
zuaX?mVRwxRWM_}17Y#vPJ@7x$I$c<|?rQV9mycbTrKV^58l?etU0>zO4#^fWwzwp@
zBxMRhW!sBNpB<7lxiR1#0xn%JZ`2(6Fd@9DtM?OZew{Mr4awr!q>V`tESov|d1Lb@
zIVV;wtVAd-1T`aD=(&Z@c9(it0QL%ePvs0D{8jEgi%N^K3i6%Vf(2m~vw=DJW4!<Z
z2t*=1UJuM=allqS1s<&D8|q*W8;zdm|7vkn4${A6CCP~;DT$@YiCDn$mc~}WBt&Nu
zD`zZ%uQk67wwZZN6(ZkZ1k`9LFQ<5Hp0h}Ze7Eav5!{#&x2fr4iV%cgO^AI@S64Z2
zL5*_j2a+Z4{dR8(_o4<v5g&4@%wtt9V*cFx5hJPktDujuf^BCfak&?i-;<ZKsB(@F
z^Qm(5eJOg_XBf>qQ?g*$rGxjnnng9n>k@wr{z7qnAPqwPUiyI)bL*Ga@Dzk7Pl)*X
z8pigvGiF0n$6TO#gdIGE@9!!PA?AQiIsLWd=z*9{b=t{-?K_=PKTV1%ibgQko-}p|
zaO{ZU+E>r7yr*dKZF!Y*7YpX^+ZhP@0W6vk*lBxr9M?IADa!h3Qluvuu^dY&J8nTB
za*9GI$GmM`(YV1yPW+2Av>=va5fWkzwZZAiy;(3LnByUp5QX54&C&XcojC|IwAig<
zonj#fp_>r(D`K%OCxFqBZC#}TEwLbkV;bDC0LIyW<9u_WRxVt$VBXTq*|UY9-*rz2
z=0CJ>c9{_Tr_MQwrN;s}$HT<v^E!2sDl4VxBdO<<3p{v@KzyeLuk#kqT~xVX*%ZP2
z7bnf`9L$B#0}&qEpSuLNBjR$G;b`fBSdVe4b~|*+?vEt9N6&+nfB|4?Z$K<pIH@Q*
zQy@mYTEd7#q{kNSJj&EQDx7GKQ}{g;!n=1glrF>d4@aQaSqlVnh!$Z@9VPVaiO_Rq
zIi1P&Ekq#1YahzgQ6S+gG({wZh%a!NBK36wi9+19q+AF>^e33DdM?Oi0<r1U3W>$8
z?D$xU>h9pLanZ`*k0sF)1KzZ96C=oC!=PCG!$L%_PK1lf??!Bm*iR!EA$Ej;+SNw%
zr*%3I_;q1fp0}U^*}h;$z}Ma}j+<ZI6y>p<Qkv6}*r_jIIc-BaHFn%Zhf_JaQ?iE*
z1xaon9LaiQMCu(WicaB^uDv5csgO*_F#Qvw-DBlR<7$N95t@_)GLlOrDoxLI6q0Ud
zdzA9vZpo%gU%N!ISa0M<&*OKkQsKBs*|8fniP4?=@|?UTk)eFQM2a%z3DIMeyOu}}
zT_%g^qen%#*yxTFHH8^>H)}&JZ@6I3(rdLmXqk30EX9l&$JVnd_2*s2m~5_(1WAfo
z;2RH#@B*Jh*>S&Q34*dY@{~PG@t7jS<m;97wb4<EcsAasA6%feE4BAYM&<8MrEuK@
zCHw)&8d=nZFSrkDv6A_@WKqf=&{mwR&J00<K83~QO9g8Q8xf_CDP=tlz4Mm#wR<QB
zK9kJ4sY>&Gs6|XyE`0`3-m0cGHl#HX<z1<vnsA#+O*exrVKob+LZeZs(YT${aLiO{
z???V##pGc@%_(LUYp@1Ej)`}wjf!~}XwKo=n%9L83INvmoX}lL`7W%pK%K%iwNN9t
zNF%sdY2GD8>+a@jo_;_IQCfFNX8jVqT7n#~l<Q8PdpmSTb!4=&jSy`2DFwSFtK)v0
z5t6)iHB*Ns3-$+@mZ4(eQDqYi*;uL>%U4y!95r0m{@J-Nplc5?7FAvIa$TdUt{H60
zIjh|t;j9i?p+vVx1N704b`V?HdBK2U`#7;xo%;gB9#e_M=Al@|x|h@xP8^#BR|6~J
zD#%5t&b~(3{FP)K8S*%@4Tv<7hYRFMZl%K4>eb+(pUXKV8!?AK6rMKrse|4RUyI_0
zQj2r#VSbv^MwsS!MpcPefvi)LNFn@Lo<X*UPmbqQy$eUoR3DfIb%<H7s!R{_20k9K
zQ_R2Bk;?YPQjqR>rks{g(!iyY@Pe9cDq(-cNA*rmp1-7KPWgg6s^$tIFY>c<CPUjA
z*&ro}CDgGmf#;O9O6J<=$Ph$#O~~<4UWxZBTfUU~=^dMxq->!fF9+lRmYVfS+h6ha
zH2W)<o4mHeE~4HyW8PfB{3-^sQWCP?*E?A>_JKf%c|)(1_m`~0LF`RVEb_l>!#sv#
z(Pz~Z!TJ{8ZdU{1cw6J<9gUk5aI>9r6K#JFb&amvsFh~>2ka<q@gMS&p2;PS0$eA~
zcmZ2*>}1!_mP$V1hZOl~SH>2BvCpo{*yk!^`j}nnJ?@8tBfGV$_{H@m#I&%B>9`^M
zOMcb?cP!YyYA>?zcov}z!dk)nwRV1~LeO6Lg6Mt9T?pYqzG0F;Seh!>_pAF%J8;!L
z4_>>^$nRK1rOOqMIjsEhwG<t4L?e?XIKJ0}@q;FeV_k)DCxr3i_4ejCt_kC(4q=?s
zgmLP66JmZ=h2gTC=B)R_hnO6<b7Ic8>|!Cj75oR{Mtpn{f`4TWQ!OF3>3N;{ELZ;c
z|LK*8eNsQqZ)}~eG0yMWzHl&qYLU>nYe${OD76MEkc<3IhyBHO-TtxbZ$3+XXVt-n
z@(c27ZW%kVKnT9X7()c;5rVHU52%*>1Otz|bcU;WB6<U=O-qGvgMk(7X!}AW$iVky
zGN|E?t(!qLxj74qDrX}Ds;uy`Dk346hpJ*^Fk8A)3Y3W)$b2oi5JO%0!r4M_PXppB
zRv{#zj4&1o)98hBdi^4lMc+t$J&}ewAu{UPg)E#du^Lnl8fm+Bh+SLRp{*RvSGL3$
z25EI-<cITB4HrnP*4c}16B*adl}n2jc@|X7y+g3{zG`<jk1Z7<`&>iPCaQv_u;OYS
zh+%mJ2=n6%>gSoj1!GZhUjskoQ7GxLbr7^936av(OL_!zf;JMDZUBT~8Hjh5mGH%#
zuHuQgf_acOC|L*^j6t?UjbUvNiuUTTAqF*qbPf|NLk-Z5&I=VFr%lq9LC%|^uHb2>
zQ{-d=QactHZa@jQ^8zmPkLX}_q~Qs{l6DOr7&NMV5!(%hs}oajEJWTIkb|fF+d#xk
z1~uJawO)Br7HXkUqgl(nHCl^WCXX6pX#Y5(wF@NEp!yRcYl`6FXC3S|ATwmzYsoS=
zhpV<IATJzI#5gSPL4wmk(VVSqZ-fw(V|W<fWSRD%!hbW@LUS(qSx7xx2+lX47_4e|
zAtxI=k?A}uTaY4+kz&rsph;ZmSeo!?N5sOa+e+;LDNHw6S${yXj408BiKE~jWz40l
zMO7X9KiGL{7N>K(J5@<uf$v&ndnD7iX`D?mowIGb6@r0#?w968xdXKhR`Ea`y$rix
zb##0ox{V)I=c>8ALdiRb`cEZB@nS@;JCykcrPzK|uqDW#9JAW_R87XrqRh!i7_tQG
zodzZRH7U~Im}5{x8jfgfF5}J;gJ{h<pPzY0W`J3O<1Ur`QTU!5zOa2+wteKQi#m3H
zH&e!Ici-zCzWbJbl5r?hhAhz}u#`(6^j=K@!@N@xvjy{g+Rjsis0Wnwhos0D57(XG
z8g_VUX8lioXtsxxFAhmo&oV=uGrOo}RFYSAxr8V$KT0=G(w8$AVSAYKsS2ZLQTdEJ
zoi2PTH!lY<&Csu4)@;6DS&61=zRCE|$g`5j$M|t{`X*zFS<Mcf{}qCD4O5gTgX0N<
zGWTJ~*YTvf|5Wxlel6?*QJ77fF9g>yc`=f<r?1PL?HT3D1((HOUuRIhcf?rqQO_!w
z=UtH_>$@BR`w+ao;}rhQZ?o$4I_u!`hSv{E-u#H@9)fCrI&#ack0&N%>*Asl&=GL3
zT`E4o0|n-3UvMVq*ZwoqXdEOsN3Bgtcse3_<keHQHYOz$cGIWKTbq_JEOfD35DFK}
zyJJE5oP~mE%~n@h!s|Mko<P$F(DZ>ceGp9_Ow$u-`VgA#r0GLxdJ;`frs*j(J(Z>p
zqv^wG`UsjnlBTE8^iecDou=RLLi&xx9+qbgf{$kRJVgjkWDb{Up7zl#6iGL;O4_T{
z$qEFeMXt=;+?1NE1(lU~DA8Gxu)x&^9g>VjcF<|?1gSjYU?*KPbKX7p`eq&uN=a+O
zm`Zidytg*5i7n7Qew6ghnUCztZB&h2k1Qk9f)#iW`J2ZXd8r1q+H9kmOsLA3kH0zK
zHNzg`jj&{FFt*nxSGlvByLVKcQ9YERJFDhrvZ|y&@{L>Lmi6%J=$aepnw#jF(R57)
zT{DKR$)s!K7uL9LUmKDTq}cjNVQPYXM}v0VUeFBAi`O?e|Iw~pst~@hi+<sfzto{#
zerB()bICV#T=MDclE17`-K<^m=B}4~i$-mj;CQv2+Ete7HP&&p9`|}(skz{awZ3t!
zQS9|!+>;5>kxK2n=x%z)Tgn#~Tz305&ihpt-}Vl>TUO7za8=i6M$mS4O?U8XYI~2x
z6Ek?S+sSggj~%dtaHL@VP}@w3VEfqM9H~0wuAg*wVuY$yLgc4l9Jh=sl}FX8;Li<#
zNOqUzm3DIj7x#r03bhydy;_8)c^_-b^@K$BaEodF5}_W{uOF_<SKM`@ut>h<XJg%K
zn0g%voA+sxl7t@L1SUZv!}qrz6u14>1J|W}5Od&Q2OUz*UUUucM105BaJAPs$zhHD
zk?YMjAI13Fz;lui@qL%6?9w0OQ`jzk<a-P|&e_%07aS+FN&F82l+i1sZv9az>G4xw
zD%OcO*<})1Voq@dKDtXn9VX%zHn_d8g%XtY^!1n}t(u@;_}gXjoavDEubc_od(x)u
z_U!c*F#oSZ*uMqlfF1IOrU-v(p6(o11g)&NoLvkE!EwIRW|bRPNZljg4tiYZwAGl4
zd}C#;@j+wB-`cX5__CJEeA%q3xfOw&LI}SSh~Koo<OmUrT7lJ#za}s$;tnZF3Njdx
z6&RU?({8Ey(L^u@!MHJ(I!ds0Gpb*gMiZ?m1v!c_AlUZLG-lS+HA@S@ggI5P!h)lx
zQThIT$$~F0p=ji_(%^7o;KD>0)f6cx65RBRG9p0Wf0yGH!Yu)=wQU4hF^1S+hM}I_
z?dn9-mK{blxe}v|un}9sgLS_$LmsXqo7^#;7;ed}u||H8cx}kZzVR#+LVIzOuB{){
zhi|04)`@epihSbGE)&D!I!|QB-Is5J^yAD#^=HgXa(ddm12ic-zN?@FBJsW05{$eM
z707vt@yBO{f_Z=@cKjj9AU-uvWnxZhu;!$Obaqls&KRiKhGKRcES$<nJ0C)i<j!6y
zm3ygS*LbPnMrHj7(-V}qDH%&i7A4~-$)+TSlJS(>Oi3;!d6eW+Qb0)|B@-x_NJ$YT
z#gt5<WHKdFC@G<&l#*L0`3EIaDVavebV_ceq>PesN^YZM1|=1gR8n#~C3jFVlaeY*
zW>In{C9^4+L&;o9=20@AlDjBbK*>T%7E!X8lDjFnhms|fET!aLO75fNeo7vo<UvY2
zlvGnvL&-lWd5Dr_lz1tjlsrtya!MYdWCbOUQnHc~A0?|Od5n@;N>)>{hLXoA!Iqz-
zWGy8MB~MXON6Eh^d76@EC|O6zvy?nXNj)X&DcL~DzbSd1k_Jj%pyWkL{zFM4B^xPu
ziIOHt{FH2><Yh`WQ_@Vy7D`^B<W)*uqvUl;wo>v2C2vylUrOGh<ZVi}QSuHY?^3dz
zk{y)1N6Gt?d_c*Elzc?V$CT`(<P%ChrQ|b8KBr_CCA%s4f|3?W_E7RAC0|kUH6?o~
z*+<DYlzdCceo78da*&cklzd0YVM>lra+H$qDfxktW0d?z$#F_fQ1TNcCn-5a$<LJh
zLdj`LS}8e0$*+{OQF4}&|55TACBIYh2PJ<}a*mSolw6?XA|-!O@;4=yD7j3@l@&y{
zis%46U;vCj5MTnj0j$3}5Db`s5TFOp69@&ufN&rJhy<bl3t$CofE{oE(Lf9k3-khd
z1APDyhy(fp{eb>JJRkuHzyM$%FbEh7BmzSKComL90+N9gAQcz}3<pL4BY`wv6p#+w
z0Ne=N1dIkUfH6QOAOkMI4U7e{fN?-JkOPbdZU%CJJRlz^01AN#z(k-3C<Z10lYuEf
z2~Y~$0{jD*3QPm01GfTYKsj(5FaxLnDuLU9JAj!$6)+396POLm0p<epfcd~(zye?)
zun1TT+zs3VECH4R_X76;_X7_A4+0*b8mIyO2|NTW1H1qQ9tM^Jj{qxxM}d`q4_E~}
z2Gjzpfi=M6z!Siez*;~7o&xHCe*sSe&j9OyXMyK{dSE@U0r)rYJkS8V0K5qN2WSK~
z0xtngfFIZdybNpxnt?6AE5NJ3YryNkR^ScbP2j)4Tfp1EHsBrLU0^$~19%U3ANT<H
z5cmlA7}yDX0(=U527C_e0(Jvm04=~C;7i~u;A>znun+hK_!ig?8~_dihk);Z!@v>X
zDDXY-18@xZ5jYN<0Db~a0;hnVfnR{rKr3(t_!Vda&I11fegl37{s8_2&H?9v3&2I-
SFW_(B5^!0!34gr!=l=mG8HcI>

delta 18347
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

diff --git a/LIB/LIBGUI.S.DRAW.txt b/LIB/LIBGUI.S.DRAW.txt
index fd178815..3d2b5b37 100644
--- a/LIB/LIBGUI.S.DRAW.txt
+++ b/LIB/LIBGUI.S.DRAW.txt
@@ -298,18 +298,13 @@ DrawBitMap		lda #S.CB.CMD.BITBLT
 
 .8				rts	
 *--------------------------------------
+DRAW.xBM		>LDYA L.BMs,x
+DRAW.yaBM		>STYA ZPBMPtr
+				bra DRAW.BM
+
 DRAW.xBMAtDXDY	>LDYA L.BMs,x
 DRAW.yaBMAtDXDY	>STYA ZPBMPtr			Src BM
 
-				lda #S.CB.CMD.BITBLT
-				jsr CB.InitCacheA
-
-				lda #S.CB.OP.MASK+S.CB.OP.ORA+S.CB.OP.COLOR
-				sta CB.Cache+S.CB.OP
-
-				lda #S.CB.M.C16
-				sta CB.Cache+S.CB.M
-
 				ldx #3
 
 .1				lda DX,x
@@ -317,6 +312,15 @@ DRAW.yaBMAtDXDY	>STYA ZPBMPtr			Src BM
 				dex
 				bpl .1
 
+DRAW.BM			lda #S.CB.CMD.BITBLT
+				sta CB.Cache+S.CB.CMD
+
+				lda #S.CB.OP.MASK+S.CB.OP.ORA+S.CB.OP.COLOR
+				sta CB.Cache+S.CB.OP
+
+				lda #S.CB.M.C16
+				sta CB.Cache+S.CB.M
+
 				ldx #3
 
 				ldy #S.BM.W+3
@@ -356,6 +360,10 @@ DrawText		lda #S.CB.CMD.DRAWTEXT2
 
 .8				rts	
 *--------------------------------------
+DRAW.YAText		>STYA CB.Cache+S.CB.TxtPtr
+				stx CB.Cache+S.CB.hFont
+				bra DRAW.Text
+*--------------------------------------
 DRAW.YATextAtDXDY
 				phx
 				jsr CB.ClearCache
@@ -363,11 +371,18 @@ DRAW.YATextAtDXDY
 				plx
 				stx CB.Cache+S.CB.hFont
 
-				lda #S.CB.CMD.DRAWTEXT2
+				ldx #3
+
+.1				lda DX,x				DX,DY -> S.CB.X1,S.CB.Y1
+				sta CB.Cache+S.CB.X1,x
+				dex
+				bpl .1
+
+DRAW.Text		lda #S.CB.CMD.DRAWTEXT2
 				sta CB.Cache+S.CB.CMD
 
 				lda #0
-				ror
+				ror						CS = inverse
 				eor #S.CB.OP.INVERSE
 				ora #S.CB.OP.SET
 
@@ -377,13 +392,6 @@ DRAW.YATextAtDXDY
 				lda #S.CB.M.MONO
 				sta CB.Cache+S.CB.M
 
-				ldx #3
-
-.1				lda DX,x				DX,DY -> S.CB.X1,S.CB.Y1
-				sta CB.Cache+S.CB.X1,x
-				dex
-				bpl .1
-
 				jmp CB.Cache2CBBuf
 *--------------------------------------
 DRAW.PullY2X2Y1X1
@@ -485,7 +493,8 @@ DRAW.AddP1YtoCBX
 				sta CB.Cache+1,x
 				rts
 *--------------------------------------
-DrawCBBufToYA	ldx hCBBuf
+DRAW.FlushBufToYA
+				ldx hCBBuf
 				beq .80
 
 				pha
diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt
index 727dc9dd..97594f66 100644
--- a/LIB/LIBGUI.S.MENU.txt
+++ b/LIB/LIBGUI.S.MENU.txt
@@ -418,8 +418,7 @@ MENU.FindMItemByID
 .9				sec
 				rts
 *--------------------------------------
-MENU.Enter		jsr MENU.GetDXWIE		X1,W,X2
-				jsr MENU.GetDY			Y1
+MENU.Enter		jsr MENU.GETX1X2WDY
 
 				jsr MENU.GetMItems
 
@@ -430,6 +429,8 @@ MENU.Enter		jsr MENU.GetDXWIE		X1,W,X2
 				cmp #S.MITEM.T.SEP
 				beq .2
 
+				jsr MENU.ResetDX
+				
 				lda DY					Y1
 				sec
 				adc SYSFON.H
@@ -474,7 +475,7 @@ MENU.Enter		jsr MENU.GetDXWIE		X1,W,X2
 				bne .1
 
 				>LDYA L.WND.Screen
-				jsr DrawCBBufToYA
+				jsr DRAW.FlushBufToYA
 
 				jsr MENU.NewSubMenu
 				bcs .9
@@ -482,7 +483,7 @@ MENU.Enter		jsr MENU.GetDXWIE		X1,W,X2
 				bra .1
 
 .4				>LDYA L.WND.Screen
-				jmp DrawCBBufToYA
+				jmp DRAW.FlushBufToYA
 
 				lda	MSG+S.MSG.S
 				bit #S.MSG.S.CLK
@@ -545,20 +546,20 @@ MENU.Draw		>SYSCALL2 GetMemPtr
 
 				jsr MENU.DrawBorders
 
-				jsr MENU.GetDXWIE
-				jsr MENU.GetDY
+				jsr MENU.GETX1X2WDY
 
 				jsr MENU.GetMItems
 
 .1				lda (ZPPtr1)
 				beq .8
 
+				jsr MENU.ResetDX
 				jsr MENU.DrawMItem
 				jsr MENU.NextMItemDY
 				bra .1
 
 .8				>LDYA L.WND.Screen
-				jsr DrawCBBufToYA
+				jsr DRAW.FlushBufToYA
 				
 			>DEBUG	
 
@@ -630,41 +631,24 @@ MENU.DrawBorders
 
 				jmp CB.Cache2CBBuf
 *--------------------------------------
-MENU.DrawMItem	jsr MENU.GetDX
-				
-				lda (ZPPtr1)
+MENU.DrawMItem	lda (ZPPtr1)
 				cmp #S.MITEM.T.SEP
 				bne MENU.DrawMItem1
 
 				lda #S.CB.CMD.HLINE
-				jsr CB.InitCacheA
-
+				sta CB.Cache+S.CB.CMD
 				lda #S.CB.OP.SET
 				sta CB.Cache+S.CB.OP
 				lda #S.CB.M.MONO
 				sta CB.Cache+S.CB.M
+
 				lda PREFS.BORDERCOLOR
 				sta CB.Cache+S.CB.COLOR
 
-				ldx #3
-
-.1				lda DX,x
-				sta CB.Cache+S.CB.X1,x
-				dex
-				bpl .1
-
-				lda DX
-				clc
-				adc Counter
-				sta CB.Cache+S.CB.X2
-				lda DX+1
-				adc Counter+1
-				sta CB.Cache+S.CB.X2+1
 				jmp CB.Cache2CBBuf
 *--------------------------------------
 MENU.DrawMItem1	lda #S.CB.CMD.FILLRECT
-				jsr CB.InitCacheA
-
+				sta CB.Cache+S.CB.CMD
 				lda #S.CB.OP.SET
 				sta CB.Cache+S.CB.OP
 				lda #S.CB.M.MONO
@@ -680,109 +664,91 @@ MENU.DrawMItem1	lda #S.CB.CMD.FILLRECT
 
 .15				stx CB.Cache+S.CB.COLOR
 
-				ldx #3
-
-.10				lda DX,x
-				sta CB.Cache+S.CB.X1,x
-				dex
-				bpl .10
-
-				lda DX
-				clc
-				adc Counter
-				sta CB.Cache+S.CB.X2
-				lda DX+1
-				adc Counter+1
-				sta CB.Cache+S.CB.X2+1
-
 				lda DY
+				sta CB.Cache+S.CB.Y1
 				sec
 				adc SYSFON.H
 				sta CB.Cache+S.CB.Y2
 				lda DY+1
+				sta CB.Cache+S.CB.Y1+1
 				adc #0
 				sta CB.Cache+S.CB.Y2+1
 				jsr CB.Cache2CBBuf
-
-				inc DY
+*--------------------------------------
+				inc CB.Cache+S.CB.Y1	Y1:1px margin
 				bne .12
 
-				inc DY+1
-
-.12				lda DX
+				inc CB.Cache+S.CB.Y1+1
 
+.12				lda CB.Cache+S.CB.X1
 				clc
-
 				adc #MENU.LMargin		TODO : Checked
-				sta DX
+				sta CB.Cache+S.CB.X1
 				bcc .11
-				sta DX+1
+
+				inc CB.Cache+S.CB.X1+1
 
 .11				jsr MENU.GetIcon
 				beq .2
 
-				jsr DRAW.yaBMAtDXDY
+				jsr DRAW.yaBM
 
-.2				lda DX
+.2				lda CB.Cache+S.CB.X1
 				clc
 				ldy #S.MENU.iW
 				adc (ZPMENUPtr),y
-				sta DX
+				sta CB.Cache+S.CB.X1
 
 				bcc .21
 
-				inc DX+1
+				inc CB.Cache+S.CB.X1+1
 
 .21				jsr MENU.GetText
 
 				jsr MENU.IsSelected
 				ldx hSYSFON
-				jsr DRAW.YATextAtDXDY
+				jsr DRAW.YAText
 
-				lda DX
+				lda CB.Cache+S.CB.X1
 				sec
 				ldy #S.MENU.tW
 				adc (ZPMENUPtr),y
-				sta DX
-				lda DX+1
+				sta CB.Cache+S.CB.X1
+				lda CB.Cache+S.CB.X1+1
 				iny
 				adc (ZPMENUPtr),y
-				sta DX+1
+				sta CB.Cache+S.CB.X1+1
 
+				lda (ZPPtr1)
+				cmp #S.MITEM.T.ITEM
+				bne .3
+				
 				jsr MENU.GetKeyString
 				bcs .3
 
 				jsr MENU.IsSelected
 				ldx hSYSFON
-				jsr DRAW.YATextAtDXDY
+				jsr DRAW.YAText
 
 .3				lda (ZPPtr1)
 				cmp #S.MITEM.T.SUBMENU
 				bne .8
 
-				lda DX
+				lda CB.Cache+S.CB.X1
 				sec
 				ldy #S.MENU.kW
 				adc (ZPMENUPtr),y
-				sta DX
+				sta CB.Cache+S.CB.X1
 
-				lda DX+1
+				lda CB.Cache+S.CB.X1+1
 				iny
 				adc (ZPMENUPtr),y
-				sta DX+1
+				sta CB.Cache+S.CB.X1+1
 
 				ldx #BM.ID.RIGHT
-				jsr DRAW.xBMAtDXDY
+				jmp DRAW.xBM
 
-.8				
-*				lda DY
-*				bne .80
-
-*				dec DY+1
-
-*.80				dec DY
-
-				clc
+.8				clc
 				rts
 *--------------------------------------
 MENU.GetIcon	ldy #S.MITEM.pICON+1
@@ -944,9 +910,7 @@ MENU.Destroy	clc
 
 				jsr PTR.Hide.I
 
-.1				jsr CB.ClearCache
-			
-				lda #S.CB.CMD.BITBLT
+.1				lda #S.CB.CMD.BITBLT
 				jsr CB.InitCacheA
 
 				lda #S.CB.OP.RESTORE
@@ -1008,26 +972,7 @@ MENU.Destroy	clc
 .8				clc
 				rts
 *--------------------------------------
-MENU.GetDXWIE	ldy #S.OBJ.W
-				lda (ZPMENUPtr),y
-				sec
-				sbc #3					2Px border + correction from W
-				sta Counter
-				iny
-				lda (ZPMENUPtr),y
-				sbc #0
-				sta Counter+1
-
-				lda Counter				W
-				clc
-				adc DX
-				sta IE					IE = X2
-
-				lda Counter+1
-				adc DX+1
-				sta IE+1
-
-MENU.GetDX		ldy #S.OBJ.X1
+MENU.GETX1X2WDY	ldy #S.OBJ.X1
 				lda (ZPMENUPtr),y
 				clc
 				adc #1
@@ -1037,9 +982,25 @@ MENU.GetDX		ldy #S.OBJ.X1
 				adc #0
 				sta DX+1
 
-				rts
-*--------------------------------------
-MENU.GetDY		ldy #S.OBJ.Y1
+				ldy #S.OBJ.W
+				lda (ZPMENUPtr),y
+				sec
+				sbc #3					2Px border + correction from W
+				sta Counter				W
+				iny
+				lda (ZPMENUPtr),y
+				sbc #0
+				sta Counter+1
+
+				lda DX
+				clc
+				adc Counter
+				sta CB.Cache+S.CB.X2
+				lda DX+1
+				adc Counter+1
+				sta CB.Cache+S.CB.X2+1
+
+				ldy #S.OBJ.Y1
 				lda (ZPMENUPtr),y
 				clc
 				adc #1
@@ -1051,6 +1012,13 @@ MENU.GetDY		ldy #S.OBJ.Y1
 
 				rts
 *--------------------------------------
+MENU.ResetDX	lda DX
+				sta CB.Cache+S.CB.X1
+				lda DX+1
+				sta CB.Cache+S.CB.X1+1
+
+				rts
+*--------------------------------------
 MENU.FindSelected
 				>LDYA ZPPtr1
 				>STYA D
diff --git a/LIB/LIBGUI.S.SYSBAR.txt b/LIB/LIBGUI.S.SYSBAR.txt
index fb01e070..0936d1ba 100644
--- a/LIB/LIBGUI.S.SYSBAR.txt
+++ b/LIB/LIBGUI.S.SYSBAR.txt
@@ -10,7 +10,7 @@ SYSBUT.Enter	sec
 				jsr SYSBAR.ShowSysBut
 
 				>LDYA L.WND.SysBar
-				jsr DrawCBBufToYA
+				jsr DRAW.FlushBufToYA
 
 				>PUSHW L.MENU.Sys
 				>PUSHW WND.SysBar+S.OBJ.X1
@@ -36,7 +36,7 @@ SYSBUT.Leave	bit WND.SYSBAR.bSysBut
 
 				>LDYA L.WND.SysBar
 
-				jmp DrawCBBufToYA
+				jmp DRAW.FlushBufToYA
 
 .8				clc
 .9				rts
@@ -52,7 +52,7 @@ SYSBAR.Show		jsr CB.GetBuf
 
 				>LDYA L.WND.SysBar
 
-				jmp DrawCBBufToYA
+				jmp DRAW.FlushBufToYA
 
 .9				rts
 *--------------------------------------
diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt
index e639b625..21853e37 100644
--- a/LIB/LIBGUI.S.WND.txt
+++ b/LIB/LIBGUI.S.WND.txt
@@ -394,7 +394,7 @@ WND.Show2		jsr CB.GetBuf
 
 				>LDYA L.WND.Desktop
 
-				jsr DrawCBBufToYA
+				jsr DRAW.FlushBufToYA
 
 				lda WND.hWND
 				pha
@@ -505,7 +505,7 @@ WND.fPaint		>SYSCALL2 GetMemPtr
 				jsr CB.Cache2CBBuf
 
 .8				>LDYA L.WND.Desktop
-				jmp DrawCBBufToYA
+				jmp DRAW.FlushBufToYA
 *--------------------------------------
 WND.ShowBorders	sta IY