From d41dbeac75bcc42c5554d9902d4dbecf3833a3c8 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sat, 27 Oct 2007 09:43:30 +0000
Subject: [PATCH] added checkbox, radio button; removed unnecessary setFocus
 override in Nexposee and ModalController

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2855 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/menu-div0test/basecheckbox_c0.tga  | Bin 0 -> 3942 bytes
 data/qcsrc/menu-div0test/basecheckbox_c1.tga  | Bin 0 -> 3942 bytes
 data/qcsrc/menu-div0test/basecheckbox_f0.tga  | Bin 0 -> 3388 bytes
 data/qcsrc/menu-div0test/basecheckbox_f1.tga  | Bin 0 -> 3938 bytes
 data/qcsrc/menu-div0test/basecheckbox_n0.tga  | Bin 0 -> 2911 bytes
 data/qcsrc/menu-div0test/basecheckbox_n1.tga  | Bin 0 -> 3693 bytes
 .../menu-div0test/baseradiobutton_c0.tga      | Bin 0 -> 3777 bytes
 .../menu-div0test/baseradiobutton_c1.tga      | Bin 0 -> 3777 bytes
 .../menu-div0test/baseradiobutton_f0.tga      | Bin 0 -> 3550 bytes
 .../menu-div0test/baseradiobutton_f1.tga      | Bin 0 -> 3811 bytes
 .../menu-div0test/baseradiobutton_n0.tga      | Bin 0 -> 2814 bytes
 .../menu-div0test/baseradiobutton_n1.tga      | Bin 0 -> 3302 bytes
 data/qcsrc/menu-div0test/classes.c            |   2 +
 data/qcsrc/menu-div0test/item/button.c        |  49 +++++++++------
 data/qcsrc/menu-div0test/item/checkbox.c      |  56 ++++++++++++++++++
 data/qcsrc/menu-div0test/item/label.c         |   4 +-
 .../menu-div0test/item/modalcontroller.c      |   7 ---
 data/qcsrc/menu-div0test/item/nexposee.c      |  25 --------
 data/qcsrc/menu-div0test/item/radiobutton.c   |  37 ++++++++++++
 data/qcsrc/menu-div0test/nexuiz/mainwindow.c  |  19 +++++-
 data/qcsrc/menu-div0test/oo/constructors.h    |  10 ++--
 21 files changed, 150 insertions(+), 59 deletions(-)
 create mode 100644 data/qcsrc/menu-div0test/basecheckbox_c0.tga
 create mode 100644 data/qcsrc/menu-div0test/basecheckbox_c1.tga
 create mode 100644 data/qcsrc/menu-div0test/basecheckbox_f0.tga
 create mode 100644 data/qcsrc/menu-div0test/basecheckbox_f1.tga
 create mode 100644 data/qcsrc/menu-div0test/basecheckbox_n0.tga
 create mode 100644 data/qcsrc/menu-div0test/basecheckbox_n1.tga
 create mode 100644 data/qcsrc/menu-div0test/baseradiobutton_c0.tga
 create mode 100644 data/qcsrc/menu-div0test/baseradiobutton_c1.tga
 create mode 100644 data/qcsrc/menu-div0test/baseradiobutton_f0.tga
 create mode 100644 data/qcsrc/menu-div0test/baseradiobutton_f1.tga
 create mode 100644 data/qcsrc/menu-div0test/baseradiobutton_n0.tga
 create mode 100644 data/qcsrc/menu-div0test/baseradiobutton_n1.tga
 create mode 100644 data/qcsrc/menu-div0test/item/checkbox.c
 create mode 100644 data/qcsrc/menu-div0test/item/radiobutton.c

diff --git a/data/qcsrc/menu-div0test/basecheckbox_c0.tga b/data/qcsrc/menu-div0test/basecheckbox_c0.tga
new file mode 100644
index 0000000000000000000000000000000000000000..ca97309454e02db4ec7fc983c87eab77c7079680
GIT binary patch
literal 3942
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
Q=-#bfAOC<Zem({M2>`6Td;kCd

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/basecheckbox_c1.tga b/data/qcsrc/menu-div0test/basecheckbox_c1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..ca97309454e02db4ec7fc983c87eab77c7079680
GIT binary patch
literal 3942
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
Q=-#bfAOC<Zem({M2>`6Td;kCd

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/basecheckbox_f0.tga b/data/qcsrc/menu-div0test/basecheckbox_f0.tga
new file mode 100644
index 0000000000000000000000000000000000000000..c0d328b9aca923875d190bb546446fd30fd464b5
GIT binary patch
literal 3388
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
NZ^e(ajE(fS`5SIA)-eD8

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/basecheckbox_f1.tga b/data/qcsrc/menu-div0test/basecheckbox_f1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..b893726ca733584a92adf85b1615736ad01868bf
GIT binary patch
literal 3938
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
R^mi@G#Ws#^-l%+re*<Ij@dp3^

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/basecheckbox_n0.tga b/data/qcsrc/menu-div0test/basecheckbox_n0.tga
new file mode 100644
index 0000000000000000000000000000000000000000..b21bd65282cae3b153114a36a46f617ca990abfa
GIT binary patch
literal 2911
zcma*pS!`5Q7{Kv6w4KfXL5L(O(snTLLIP2u6lD#I+9=c%3NDcFM56IUq6sl6#ZuqY
z7fm#TlrAYt<VB+*7y$vr<%tATh!xUyw20yg;gSFUZe?g~JI!zInRCwl?sv}p?sS4+
ze2}~f0e`uje#{|*GL)kN*|=R9AG5DH;OOWh&KQSGD{p}(h9SL#Lw8~(9zd<5k2rae
z4J<UJ(w-K3OlkohL;+J^!Wl=Si%g|qz6Ni^4!nzYbYl<pqAfmla_qv0V<y;E&RY{U
zVlE~l<47>kH(sVU16%M3deDa=E~6J$;^Tm47L7Ulh-*kjexv;ZPQ#s<k6e1?44)?9
z2^_=#{>AV31xb{#UfFn_)8`egx~A*+4$tErI3uXRI84J!Fu`l^k|(hrBW^0=Bi#&d
z%n|&EKXDOnVK&MT?z#z7p&1wO56++kE3pt3)M$le^)JPXI0Sdxg|wp<?m{pDUa$tO
zFr)wAZP|o7;6!g~)}!~T!ZU{U_zbSV`)=|T*K+`i;hA9tdtx=V!_B>lV_1irI}s*h
z=q1=^pkEENFYa+94CL*aj%{#rT%3!13WI^Xu7M7eWMog8(Qtu2WkP8nx4=E`Fi_Eq
zI^v#i7cJ~$Y0b2g`+Jo3(4|@Gy9{*EK)Ya1x-<h7(284c$FqFSm+a9P0@cKUe&YBy
zzJ!6IJ+eexfF;$1BKpye1#m3AZ%L>mr>_`$22oCiavL7Qhww@DiR;8eC<#?f$94=~
z0*1<C15V&C{ERm+3vSSeMNrT9-~y-c=>?p{4S3O)aThX3LltN@;~bKDT1~t1P2SR3
zchla6@8P5QH8x{{cQl;kU7drs(F>pS!zhjADy-lpoQJc%z<T7<SZ<qlVlV!Hd+{+I
z$6#K@x(~0T2j+Dg4T!!}oneKgMci*sH<mb(uF%|P!#cBOyoDdY>xKU+!`(M4BXyhS
zWh0rNJr!vr=hUJDeodSGK`h76NL@xM8p%2=jbz>rqYb_2Lpv6sJlrYIOLFQgiL{K7
zi931AJI4aGvMR%#@wfKSo`mJt57#|_ZuoRmgx9IE75BJeXE^gCY(*oiT8}>Wwr@ZF
z-<Xe*b!DX(vxq%#52LH+Xt@{G!){!Hv%bM;e1?<edE8m2@Hrgu7>)RSfBT4^zlD`!
z753vj+>dB~lXcId=N&l1CnWhQ@L{*+tWG1?_I_W-SjRl)8qC5)%tTqZ>#p0o=hN~W
ztPpqn5PWjZqQ{x%%WdHt%+2E{BNsf!DAr~J{1q4d1hQIu<uL<`u^Jok3SPB}c9>Zc
zOrU9KPm6QPc=L>U7%6LS^xG~=!w?=V$jP`DF1Fg3H6~b%Diq@5Xd_;58jNP-=*MI$
mt?-rctI4azKV_}6^tG;`an<^|wRQDt<~;pq-IJ^41~&mwZAzB_

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/basecheckbox_n1.tga b/data/qcsrc/menu-div0test/basecheckbox_n1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..0612bb7ad38413e245877eb90704e7780cd7b0b4
GIT binary patch
literal 3693
zcma*qduWzb9KiAS-ObHqc?-*Qo230=Xjyqlow91Pkvf`gni?vVQV3-fSTHZ!il7w2
z%8<~xxp~P7%ajuH7HLX_sg;+xaK1J*Elnl5(f9kj&$~7Z=Nq5rIq!4MbAIRi&N;6u
z5@{bvd~zcEmtNu5bVQMi6r>_8EVm2qX$!2dw(S~QBq3VKCE|-gmxi#a3wmP!23tGS
z#=|XOm_us)q}(SCY6$K@4m!aBN3D$q=}N)z+Ib1)V+pEIi{+@pvhZHby#`mUbAZcI
zxRhZE`lBPF)<mxJ!pGtD!VGLgJsJ_iDICX{@ZRK`G5h@g8t0IxIZgR{?1GsYg!Jaf
zQNCS|hp-M!_zgefBoe(`Yh?TLokk;^b557B7f<45*dkcLB<|fY8xHUi47n4lan+<!
z-*Pcl8E$1p_?FA^DSp5&Xuu-$MKXe%8@?yz;V>>>AIk9nhQaOBdRv*R5h%boOu|^?
zVI*c@6U@4ksls5GiAW|4n~h31u8Y`>$IuNPB^#$9#j&J%;{4{8xdVoDy02p@`oK+e
zKi;+CjB{LrT=-^iXbqf&xiH-(#&vlGMKC!X5I+uyq29=oQFs~KaRf1}gqd-0<|9~u
zpA5VzeB$nGUhp22=ipnMgWVj&7F590dH8}fakr!HC`BEP!39ce&9#)Bo%1&QnpX4n
zNigrkerp;2S1Qlq54h#_V=?mK5S&pjnA-Po8o$F~JLL6nFW(B!*-)%7e9S?w2%iKK
zF?=HJ^C%yJGiZXdaqT^5-@(<)!|iw+8*vhU!QpO&eT;^o-Rq`!5SALg!SGANC(X$>
zd=4tn0B3CSci?NBz$tu#S1}9ga0c#>M!bjVFs#|JPd{yh??MxsX2bADaUOe60cW!l
zE{M<F8y~^V=`h`9Zl+?G$>ee_&F918Sp!=+i7NQ(9wfdqg_fb6xyk+l({L}$nIWB}
zYiqJC+s@29g`1G%Sc9;x_9%P^m(9FYV<1|E&EmmaI1{_xit*?QckM##hckB@y2kE{
z%@_wydbByLD?I@_;2X#A8v4LV20x}z?ulK#kFvXV6N+F5oiG|};n)rN4@|VPErUDR
z%>9>W-!cye;2Cg2&!HQP7|h5*4qVTJNQ53k*_7RYvG@S)<UjE@E{EUua5p0kFB=&P
zxI{g_rhg7R9~a>7<TPa3BKYx6=H3sBaU3q-Copyg41hmyhv5Y5#nb1Gv8}6P@9wkN
z7y&2exJ{>N@zmOOJ4z9ZFNp4<4?!Ky!qxd0g~-87xaEBA_Oge!upD2(L*`;Q^1bl%
zJ`8uetNRk_;i$Kv81a9)U3ZV4OBVe2oG@3l$iv-Of*8)jygh@vFcL4oEZMi4*!~;v
zCURlBMK}uU*W*D1f5HWOE|qV_u3f<8l(Ef$eGkV<_@3{(GJ{}7Gtn25;qx6ZFXrJh
zOhP_Zz-Q)k9qz-Gv1^PSGj<J(dmCn;8Vli$^2|ly$1%9NuGzELh$C=*<57TRIF3eC
z!G2SW)N0<<tzzd<YroFT91KJjoNoq<>%BcX<4#OP1st#AF~6%}-kMO0VMq;P+k-jx
zNgZrq%MEZQrM7yc3zrF)2<KxtaW4tWk8*zkPh%#gBe5UsF^1(BjCkyHO71mB`3`=B
zt-i!AY{pLGZ?o0s*aB<3$7{@lHLmjR@a}idemy*2C-64RPCVm1DLHHR;~TKWX*A#>
zJUbWQ`LYMg?wQND);iz01V`Z{dL!9F@ROg!y$2@4UA6(6a0mxbZ_7g|mT(Y`&3hX)
zhkeIh+~37;?V>^4c9i^Npcis622=1nUUb{ccVuPom9i_Jl-nkmi*FRcp3;08yb=6)
zWEW|0TXw`PaI#tUne71G#66J{-rK4%V0YM?J;(o+tfUltq8@sqhW}&dK5PDrFD}V1
TEgV-^G`8Qwg2K`H{UiSZj~>LU

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/baseradiobutton_c0.tga b/data/qcsrc/menu-div0test/baseradiobutton_c0.tga
new file mode 100644
index 0000000000000000000000000000000000000000..da391af38e364ff5084690c87fa48bd268bd4e7b
GIT binary patch
literal 3777
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

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/baseradiobutton_c1.tga b/data/qcsrc/menu-div0test/baseradiobutton_c1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..da391af38e364ff5084690c87fa48bd268bd4e7b
GIT binary patch
literal 3777
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

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/baseradiobutton_f0.tga b/data/qcsrc/menu-div0test/baseradiobutton_f0.tga
new file mode 100644
index 0000000000000000000000000000000000000000..f4502dd4850cf69f33b19acb9d9cd27dec8a0650
GIT binary patch
literal 3550
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

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/baseradiobutton_f1.tga b/data/qcsrc/menu-div0test/baseradiobutton_f1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..5ef088aeb20ea576fd6c0cff62a7f0a6776bc3ce
GIT binary patch
literal 3811
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
J0ta~;{ST_sC9?nk

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/baseradiobutton_n0.tga b/data/qcsrc/menu-div0test/baseradiobutton_n0.tga
new file mode 100644
index 0000000000000000000000000000000000000000..a7cff9f0f4d91481b693dc1583bb2f8d5dbcdd58
GIT binary patch
literal 2814
zcmY+_X>3(R7=Yos_LeRv8j7;SR#I>)ia}5Wgdk#@A_giDG)96ZN?a16k|<H2Kv{o?
zae>Gp$f6OosF0{=q6QaK5EqmvE!0A#Km`TS^oQ>|xA)e2$usAi;hb;g`)1B*BvKH`
z{7NJI%U|rJolzuEj0@2Vy>SuFLq3v-Euo3j*>r`E*<FHxsKEo6jVCb^(=ZO#;}SST
zY!OXlp-ne9vLUX+y?6niVmA(8Klb5EY{$!Z3{@yc5uzd50?tALagKd38HU@1CY;3y
zoJJe|z@Ipd7VJem=3p#(A|9g7=Pb<Bq`PAZw&BQJnp0NE0DItIALDBr#9_3;fju^0
z3#Q|8g!$KU5($I!;3S0`@DiGF4oC4h*5FaxjXN;|KD`P%@Eshc9Zt!q%)v06kLWy_
z@I<7Gm*|a$VU;bBL%o6fF$6u$vB-J4J1)f_+>WR44$RSFTGVf`6eduZJD3BGz<QXM
zb^j3ez)2(#b+E8coLU_Ax^MbnBA&r+{Ek!j2D8u?@$hsQHJ?jETnsaD|9JbaScVED
z>u4f{h{07Hj3@9JoZd0G>n6i>H)13kKf%S-Sb>AE;P1nQxd73{G@;I>Zq?kV-^1O|
zh?N)$XPb_j>bR=rXl<RrA-KT4BdH}c*|l>?Z^b4!`rp`#88Gv7IgRejOYjifB;NTG
zEL|@|U9>O{i|*_5ATo6@JF9jD(nWTjR;?UP$va&CPcRil%W1+^cJ$#`3wOWStbuta
z=hB3`TxRoI50}>J`-Y80DjUlY`=bu~;hk@z3aOk}esb2~H#B1dZbULCmYc>kaaXuI
zoc$!^hggp08oMi2+0$T;D`8I}CsG+bi{N;^uwUUW6y!u2LeFY@8jZ9X_T)w?rKc7@
z<0L*p4bu7foVD_W-ejZ}dt85eI<t#&bs1c>Mws1Bj7Mj7d0dUeRwK0;$v1x#^0L`E
zn$>juns5|bFcNt_7uL@@{r@g&z8Ry@8LNORXRrgUID}_WfkaNM0rWfvM?40fn1Esv
z3i~w5u@7e92b{%^n2Da~-23L`2j&sDF2}JCPs19;vwPq7^d@Y888}DZ!fF&E{f-*1
z7?r4Z)~zX;_b?4*Fi&f1?YuiWpC<d)*51Bwrq0K2r#o;7u7tHrkJObDpD%|4HJ}~t
z`*$%LQ*bk^em``Bd4ziAIqQ6Mhc%s!tvC#$<b1EVPXBH2+fjsZcoVL`8Js{PzQ6}~
z3rpb_Z!~<TeanWU3in|dtc@8S$1hlcK}hfETFyd2;~cMng>We?%sH5{N0<07G+`%R
z$6D*M(S*0bi5);IPQuOV0!~E_q&GzvFta|_()~OP+J=Ad?>w4ztM9M|Gjs2-W=A@X
zr#YHY3--Y2m~nrkjF2v7W*{?L4(DemA8&K^XB^19>~Y2h%`8xJ$GIQaUD%ArQHfG?
z3CV<}gv%Iu!IfK#m3R%W!a{6^JEtD6z;M3V8?g>AVj;|96v|MHSlGd#F(0>-^}Gs$
zF$`hh&1Zy@$n*@eXK0dU2nM1YZpQ+|9V@cH#$U{v6HyumNtjjAV2MnR|DWxNa}ixc
d6Eg4^el-*B7&EDIV&(YTDyH00Sv_Vz<Uf?jJcR%N

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/baseradiobutton_n1.tga b/data/qcsrc/menu-div0test/baseradiobutton_n1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..1b2a9127613751ecd5e693b48e7c014442f8aad9
GIT binary patch
literal 3302
zcmY+`d2AI`6oB!0@Ac7AC<+8nmPjRKQ9vOG3S|o-mVg-cpfM6OQR7Nf5=8~dPWeNK
z3xrLOMI$JPkceoa22oTH7nBIJK%vq?Wk;>l@4K%L>5$(n_s!gM@408DL{WB>-dace
z%bMe*jWJ{(2aVAJEpZ*LK^BsT&t(_Qa@PPpW^+??!ALxc$#@YHF&;y4J8pm>;<MRB
zGu<_Wk?rC(JcKv!C3ayy_F*r+!4|xQ=P(#~sE=6aZ3bsy0tt?-Fa~zF14nQHCvgUq
z_!DPQfimpDMohsVG)E%zI-RpHQYYO6W3dUxrm{P2mh50R4E8y`!$BNIISlOa5Y}M=
zIv|X{kdr6`X~sz=?!Xe1;u4NyCzjz^Jb?S~7<_s$w&F(^rV0+pp-e$Ou0?DbyYNI*
z*Gsg-lQ7Gs$WR;b2zsEobFA+;t&SVf4fo<@Y=(0*nI`oI%!3oCS38&i`(P!UmwEpb
z55hqt5i?k*6Ni?7t=3IjjKHhdg+Fi_-(wQmAQ7GpQM0(Ti|gS`tRHVbfFg84au&O&
z9^!BnyW<6X1&4P6R^1r5?)Dgk{>?`QZovW^gbCjU7p4)y-8IKdjtw1NJzJer+^et(
zCdQmv#y`PYDaIo7gmXznHBDX(fth!FC2;wDgN)+l$U0ygEDv8uvoHWA%81U{u~-&&
zV-3o15qn^1nZ4AK_(FMiQ#=6+%{zaE>2Cpl_tVf9%VDjbhk19od^hI9B1q>a!MS}u
zj&#<|Wf5*dYDsfAbG&(&3-7SnzJPN~uZB5TjkCCn>ZzXibQLPF1YKcVH?!Fr>G76u
zz6|C)>C@pG>3Z4sN;ngH+Jr$c=g!)E9i73h+R+$&KOCLec5?>pFbn%&Pak41GHb>1
zgSi4nQHoXQg*tErX5(C~Sf^-t23E71vD(0zvgTa_vo#u7A(nSoC*85wmP1L;YFdos
z>Mz8_Y3!;IT@Gi)ID@Bgb-Y}z9hsx{qxCKBM|Q1vJ!n~KOR+JQ!WLs&6EDG)y&Ps|
z?<E)t$Li*|TcZ%a!I^)Ckw|6HJM1qXYm8K8q%}1y{*nzd;oJ7_bar9Q{^Ddk@(_bt
z0_{<RVwlJ67>57zX#f4N-e{Fp#0K<-zc?QIG?4GaKi*aCe5?{PwG*RI$6rE4IZCU*
zx;%p8SciT{-PM>g`?&h9Qm)rx0F3PBTsy+*_!uQPhM!@N=FOT)z2}bIC!F6_l*1>i
zgHFh}GD2f_#%pkdC*TvqkrVF9;>^43-6}JZ-^M{`j|ND61-&zdR+t3Gb^*U&BAO#L
zKJPT2E%6kru?p<PE3n_hG<IPNUyn?CHlOiA8|}e2vM*M_oH@(Q7=lpIp$Fsm?I^%T
zXH;%>%;9+C!c3Xx&^yQ2batUN9kUJB&cJc{H}U}H;%1ne)OS5(f{Q#D$SSFVUx<$|
z8DnuLT<^AM2<H)2q>iI@W=-I#On|j~81}La=DraeTk8J+zTx#T6z{_|Jdcwo#@F}+
zA7CErVE}rf7kXnb9!3$&jWevk?^u9tNWGVZoP~rYINk~q;S!seOK{2_UHWr4g6((@
z%gxJbC%g#`Y(L6z3di9Bjzcq~iX{Y0uTNK+Ux%Gm!ngfz*SX5<8`jR8xp$Z|-x7~!
z;Ec+!8xF@Aw?k&Alv;tD*?c%YyYlf$M}OWx&dU}@Y^Ui3Dy=y`$Z-eO;&~LHHR^^K
zVb_$)I9kA!n}bDo7w^DCY=M=t5pTop{Fbc73cQJ#a31}UiyXv51&5u9v!u*tM|4L%
z!ooYBJ`N(?l5b1TB)cByf;?D`*+>{Gn&HkZy!9C|&J2>_tde$?k#4cGD=i5wVzb$W
c8F&oa$l;>~jxHEcFzlXAWA7>$GO%;>A38a8O#lD@

literal 0
HcmV?d00001

diff --git a/data/qcsrc/menu-div0test/classes.c b/data/qcsrc/menu-div0test/classes.c
index 45db05ae6..9883252f9 100644
--- a/data/qcsrc/menu-div0test/classes.c
+++ b/data/qcsrc/menu-div0test/classes.c
@@ -6,4 +6,6 @@
 #include "item/image.c"
 #include "item/label.c"
 #include "item/button.c"
+#include "item/checkbox.c"
+#include "item/radiobutton.c"
 #include "nexuiz/mainwindow.c"
diff --git a/data/qcsrc/menu-div0test/item/button.c b/data/qcsrc/menu-div0test/item/button.c
index 8e5ccf925..503e80c8f 100644
--- a/data/qcsrc/menu-div0test/item/button.c
+++ b/data/qcsrc/menu-div0test/item/button.c
@@ -10,6 +10,7 @@ CLASS(Button) EXTENDS(Label)
 	ATTRIB(Button, onClick, void(entity, entity), SUB_Null)
 	ATTRIB(Button, onClickEntity, entity, NULL)
 	ATTRIB(Button, src, string, "")
+	ATTRIB(Button, srcMulti, float, 1)
 	ATTRIB(Button, focusable, float, 1)
 	ATTRIB(Button, pressed, float, 0)
 	ATTRIB(Button, clickTime, float, 0)
@@ -68,28 +69,40 @@ float mouseReleaseButton(entity me, vector pos)
 }
 void drawButton(entity me)
 {
-	float division;
-	division = min(0.5, 0.5 * me.size_y / me.size_x);
-	if(me.forcePressed || me.pressed || me.clickTime > 0)
+	if(me.srcMulti)
 	{
-		draw_Picture('0 0 0', strcat(me.src, "_cl"), eX * division + eY, '1 1 1', 1);
-		if(division < 0.5)
-			draw_Picture('0 0 0' + eX * division, strcat(me.src, "_cm"), eX * (1 - 2 * division) + eY, '1 1 1', 1);
-		draw_Picture(eX * (1 - division), strcat(me.src, "_cr"), eX * division + eY, '1 1 1', 1);
-	}
-	else if(me.focused)
-	{
-		draw_Picture('0 0 0', strcat(me.src, "_fl"), eX * division + eY, '1 1 1', 1);
-		if(division < 0.5)
-			draw_Picture('0 0 0' + eX * division, strcat(me.src, "_fm"), eX * (1 - 2 * division) + eY, '1 1 1', 1);
-		draw_Picture(eX * (1 - division), strcat(me.src, "_fr"), eX * division + eY, '1 1 1', 1);
+		float division;
+		division = min(0.5, 0.5 * me.size_y / me.size_x);
+		if(me.forcePressed || me.pressed || me.clickTime > 0)
+		{
+			draw_Picture('0 0 0', strcat(me.src, "_cl"), eX * division + eY, '1 1 1', 1);
+			if(division < 0.5)
+				draw_Picture('0 0 0' + eX * division, strcat(me.src, "_cm"), eX * (1 - 2 * division) + eY, '1 1 1', 1);
+			draw_Picture(eX * (1 - division), strcat(me.src, "_cr"), eX * division + eY, '1 1 1', 1);
+		}
+		else if(me.focused)
+		{
+			draw_Picture('0 0 0', strcat(me.src, "_fl"), eX * division + eY, '1 1 1', 1);
+			if(division < 0.5)
+				draw_Picture('0 0 0' + eX * division, strcat(me.src, "_fm"), eX * (1 - 2 * division) + eY, '1 1 1', 1);
+			draw_Picture(eX * (1 - division), strcat(me.src, "_fr"), eX * division + eY, '1 1 1', 1);
+		}
+		else
+		{
+			draw_Picture('0 0 0', strcat(me.src, "_nl"), eX * division + eY, '1 1 1', 1);
+			if(division < 0.5)
+				draw_Picture('0 0 0' + eX * division, strcat(me.src, "_nm"), eX * (1 - 2 * division) + eY, '1 1 1', 1);
+			draw_Picture(eX * (1 - division), strcat(me.src, "_nr"), eX * division + eY, '1 1 1', 1);
+		}
 	}
 	else
 	{
-		draw_Picture('0 0 0', strcat(me.src, "_nl"), eX * division + eY, '1 1 1', 1);
-		if(division < 0.5)
-			draw_Picture('0 0 0' + eX * division, strcat(me.src, "_nm"), eX * (1 - 2 * division) + eY, '1 1 1', 1);
-		draw_Picture(eX * (1 - division), strcat(me.src, "_nr"), eX * division + eY, '1 1 1', 1);
+		if(me.forcePressed || me.pressed || me.clickTime > 0)
+			draw_Picture('0 0 0', strcat(me.src, "_c"), '1 1 0', '1 1 1', 1);
+		else if(me.focused)
+			draw_Picture('0 0 0', strcat(me.src, "_f"), '1 1 0', '1 1 1', 1);
+		else
+			draw_Picture('0 0 0', strcat(me.src, "_n"), '1 1 0', '1 1 1', 1);
 	}
 	me.clickTime -= frametime;
 	drawLabel(me);
diff --git a/data/qcsrc/menu-div0test/item/checkbox.c b/data/qcsrc/menu-div0test/item/checkbox.c
new file mode 100644
index 000000000..3ce59ab08
--- /dev/null
+++ b/data/qcsrc/menu-div0test/item/checkbox.c
@@ -0,0 +1,56 @@
+#ifdef INTERFACE
+void CheckBox_Click(entity me, entity other);
+CLASS(CheckBox) EXTENDS(Button)
+	METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))
+	METHOD(CheckBox, resizeNotify, void(entity, vector, vector, vector, vector))
+	METHOD(CheckBox, draw, void(entity))
+	ATTRIB(CheckBox, checked, float, 0)
+	ATTRIB(CheckBox, onClick, void(entity, entity), CheckBox_Click)
+	ATTRIB(CheckBox, srcMulti, float, 0)
+ENDCLASS(CheckBox)
+#endif
+
+#ifdef IMPLEMENTATION
+void CheckBox_Click(entity me, entity other)
+{
+	me.checked = !me.checked;
+}
+void configureCheckBoxCheckBox(entity me, string txt, float sz, string gfx)
+{
+	me.configureButton(me, txt, sz, gfx);
+	me.align = 0;
+}
+void resizeNotifyCheckBox(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+{
+	me.keepspaceLeft = min(0.8, absSize_y / absSize_x);
+	resizeNotifyButton(me, relOrigin, relSize, absOrigin, absSize);
+}
+void drawCheckBox(entity me)
+{
+	vector cbOrigin;
+	vector cbSize;
+
+	cbOrigin = eY * (0.5 * (1 - me.realFontSize_y)) + eX * (0.5 * (me.keepspaceLeft - me.realFontSize_x));
+	cbSize = me.realFontSize;
+	if(me.checked)
+	{
+		if(me.forcePressed || me.pressed || me.clickTime > 0)
+			draw_Picture(cbOrigin, strcat(me.src, "_c1"), cbSize, '1 1 1', 1);
+		else if(me.focused)
+			draw_Picture(cbOrigin, strcat(me.src, "_f1"), cbSize, '1 1 1', 1);
+		else
+			draw_Picture(cbOrigin, strcat(me.src, "_n1"), cbSize, '1 1 1', 1);
+	}
+	else
+	{
+		if(me.forcePressed || me.pressed || me.clickTime > 0)
+			draw_Picture(cbOrigin, strcat(me.src, "_c0"), cbSize, '1 1 1', 1);
+		else if(me.focused)
+			draw_Picture(cbOrigin, strcat(me.src, "_f0"), cbSize, '1 1 1', 1);
+		else
+			draw_Picture(cbOrigin, strcat(me.src, "_n0"), cbSize, '1 1 1', 1);
+	}
+	me.clickTime -= frametime;
+	drawLabel(me); // skip drawButton!
+}
+#endif
diff --git a/data/qcsrc/menu-div0test/item/label.c b/data/qcsrc/menu-div0test/item/label.c
index 04a5cf776..2ce9ab0b6 100644
--- a/data/qcsrc/menu-div0test/item/label.c
+++ b/data/qcsrc/menu-div0test/item/label.c
@@ -7,6 +7,8 @@ CLASS(Label) EXTENDS(Item)
 	ATTRIB(Label, text, string, "Big Red Button")
 	ATTRIB(Label, fontSize, float, 8)
 	ATTRIB(Label, align, float, 0.5)
+	ATTRIB(Label, keepspaceLeft, float, 0) // for use by subclasses (radiobuttons for example)
+	ATTRIB(Label, keepspaceRight, float, 0)
 	ATTRIB(Label, realFontSize, vector, '0 0 0')
 	ATTRIB(Label, realOrigin, vector, '0 0 0')
 ENDCLASS(Label)
@@ -23,7 +25,7 @@ void resizeNotifyLabel(entity me, vector relOrigin, vector relSize, vector absOr
 	// absSize_y is height of label
 	me.realFontSize_y = me.fontSize / absSize_y;
 	me.realFontSize_x = me.fontSize / absSize_x;
-	me.realOrigin_x = me.align * (1 - me.realFontSize_x * draw_TextWidth(me.text));
+	me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - me.realFontSize_x * draw_TextWidth(me.text)) + me.keepspaceLeft;
 	me.realOrigin_y = 0.5 * (1 - me.realFontSize_y);
 }
 void configureLabelLabel(entity me, string txt, float sz, float algn)
diff --git a/data/qcsrc/menu-div0test/item/modalcontroller.c b/data/qcsrc/menu-div0test/item/modalcontroller.c
index a629e2dce..461c1aebc 100644
--- a/data/qcsrc/menu-div0test/item/modalcontroller.c
+++ b/data/qcsrc/menu-div0test/item/modalcontroller.c
@@ -3,7 +3,6 @@ CLASS(ModalController) EXTENDS(Container)
 	METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(ModalController, draw, void(entity))
 	METHOD(ModalController, addItem, void(entity, entity, vector, vector, float))
-	METHOD(ModalController, setFocus, void(entity, entity))
 	METHOD(ModalController, showChild, void(entity, entity, vector, vector, float))
 	METHOD(ModalController, hideChild, void(entity, entity, float))
 	METHOD(ModalController, hideAll, void(entity, float))
@@ -242,12 +241,6 @@ void addItemModalController(entity me, entity other, vector theOrigin, vector th
 		other.Container_alpha = 0;
 }
 
-void setFocusModalController(entity me, entity other)
-{
-	//print("focus to ", etos(other), "\n");
-	setFocusContainer(me, other);
-}
-
 void showChildModalController(entity me, entity other, vector theOrigin, vector theSize, float skipAnimation)
 {
 	if(other.ModalController_state == 0)
diff --git a/data/qcsrc/menu-div0test/item/nexposee.c b/data/qcsrc/menu-div0test/item/nexposee.c
index a4abd3c1c..d82a80741 100644
--- a/data/qcsrc/menu-div0test/item/nexposee.c
+++ b/data/qcsrc/menu-div0test/item/nexposee.c
@@ -8,7 +8,6 @@ CLASS(Nexposee) EXTENDS(Container)
 	METHOD(Nexposee, mouseRelease, float(entity, vector))
 	METHOD(Nexposee, mouseDrag, float(entity, vector))
 	METHOD(Nexposee, resizeNotify, void(entity, vector, vector, vector, vector))
-	//METHOD(Nexposee, setFocus, void(entity, entity))
 	METHOD(Nexposee, focusEnter, void(entity))
 
 	ATTRIB(Nexposee, animationState, float, -1)
@@ -322,28 +321,4 @@ void focusEnterNexposee(entity me)
 	if(me.animationState == 2)
 		setFocusContainer(me, me.selectedChild);
 }
-
-void setFocusNexposee(entity me, entity other)
-{
-/*
-	if(me.animationState == 0)
-	{
-		if(other != NULL)
-		{
-			setFocusContainer(me, other);
-			me.selectedChild = other;
-			me.animationState = 1;
-		}
-	}
-	else if(me.animationState == 2)
-	{
-		if(other == NULL)
-		{
-			me.selectedChild = me.focusedChild;
-			setFocusContainer(me, NULL);
-			me.animationState = 3;
-		}
-	}
-*/
-}
 #endif
diff --git a/data/qcsrc/menu-div0test/item/radiobutton.c b/data/qcsrc/menu-div0test/item/radiobutton.c
new file mode 100644
index 000000000..82672ec86
--- /dev/null
+++ b/data/qcsrc/menu-div0test/item/radiobutton.c
@@ -0,0 +1,37 @@
+#ifdef INTERFACE
+void RadioButton_Click(entity me, entity other);
+CLASS(RadioButton) EXTENDS(CheckBox)
+	METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float))
+	ATTRIB(RadioButton, checked, float, 0)
+	ATTRIB(RadioButton, group, float, 0)
+	ATTRIB(RadioButton, allowDeselect, float, 0)
+	ATTRIB(RadioButton, onClick, void(entity, entity), RadioButton_Click)
+ENDCLASS(RadioButton)
+#endif
+
+#ifdef IMPLEMENTATION
+void configureRadioButtonRadioButton(entity me, string txt, float sz, string gfx, float theGroup, float doAllowDeselect)
+{
+	me.configureCheckBox(me, txt, sz, gfx);
+	me.align = 0;
+	me.group = theGroup;
+	me.allowDeselect = doAllowDeselect;
+}
+void RadioButton_Click(entity me, entity other)
+{
+	if(me.checked)
+	{
+		if(me.allowDeselect)
+			me.checked = 0;
+	}
+	else
+	{
+		entity e;
+		for(e = me.parent.firstChild; e; e = e.Container_nextSibling)
+			if(e != me)
+				if(e.group == me.group)
+					e.checked = 0;
+		me.checked = 1;
+	}
+}
+#endif
diff --git a/data/qcsrc/menu-div0test/nexuiz/mainwindow.c b/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
index e76511c80..13a75c88d 100644
--- a/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
+++ b/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
@@ -31,13 +31,26 @@ void configureMainWindowMainWindow(entity me)
 		dlg.addItem(dlg, i, '0 0 0', '1 0.2 0', 1);
 
 		i = spawnLabel();
-		i.configureLabel(i, "Swim swim hungry, swim swim hungry...", 12, 0.5);
-		dlg.addItem(dlg, i, '0 0.3 0', '1 0.2 0', 1);
+		i.configureLabel(i, "Swim swim hungry, swim swim hungry...", 8, 0.5);
+		dlg.addItem(dlg, i, '0 0.3 0', '1 0.1 0', 1);
+
+		i = spawnRadioButton();
+		i.configureRadioButton(i, "RadioButton1", 12, "qcsrc/menu-div0test/baseradiobutton", 1, 0);
+		dlg.addItem(dlg, i, '0.1 0.4 0', '0.4 0.1 0', 1);
+
+		i = spawnRadioButton();
+		i.configureRadioButton(i, "RadioButton2", 12, "qcsrc/menu-div0test/baseradiobutton", 1, 1);
+		dlg.addItem(dlg, i, '0.5 0.4 0', '0.8 0.1 0', 1);
+
+		i = spawnCheckBox();
+		i.configureCheckBox(i, "Do not show this dialog again", 12, "qcsrc/menu-div0test/basecheckbox");
+		i.checked = 1;
+		dlg.addItem(dlg, i, '0.1 0.5 0', '0.8 0.1 0', 1);
 
 		i = spawnButton();
 		i.configureButton(i, "Close", 12, "qcsrc/menu-div0test/basebutton");
 		i.onClick = DialogCloseButton_Click; i.onClickEntity = dlg;
-		dlg.addItem(dlg, i, '0.3 0.6 0', '0.4 0.3 0', 1);
+		dlg.addItem(dlg, i, '0.3 0.7 0', '0.4 0.2 0', 1);
 	me.addItem(me, dlg, '0.2 0.3 0', '0.6 0.4 0', 1);
 	
 	i = spawnImage();
diff --git a/data/qcsrc/menu-div0test/oo/constructors.h b/data/qcsrc/menu-div0test/oo/constructors.h
index b936307cf..ba2238ce5 100644
--- a/data/qcsrc/menu-div0test/oo/constructors.h
+++ b/data/qcsrc/menu-div0test/oo/constructors.h
@@ -14,8 +14,8 @@
 #undef ENDCLASS
 #endif
 
-#define CLASS(cname)                 entity spawn##cname() { entity e;
-#define EXTENDS(base)                e = spawn##base ();
-#define METHOD(cname,name,prototype) e.name = name##cname;
-#define ATTRIB(cname,name,type,val)  e.name = val;
-#define ENDCLASS(cname)              e.instanceOf##cname = 1; e.classname = #cname; return e; }
+#define CLASS(cname)                 entity spawn##cname() { entity me;
+#define EXTENDS(base)                me = spawn##base ();
+#define METHOD(cname,name,prototype) me.name = name##cname;
+#define ATTRIB(cname,name,type,val)  me.name = val;
+#define ENDCLASS(cname)              me.instanceOf##cname = 1; me.classname = #cname; return me; }
-- 
2.39.2