From 6caaf589f17accf2e29292b669f525b74ec3cef3 Mon Sep 17 00:00:00 2001 From: PB Date: Fri, 1 Sep 2023 13:45:52 +0200 Subject: [PATCH] Use more modern appearance for wxMSW wxTreeCtrl by default Change wxTreeCtrl default style under wxMSW to make it look more up-to-date by default: use twisting buttons and full-row highlight and don't display connector lines. Using wxTR_LINES_AT_ROOT together with wxTR_NO_LINES may look odd but it is needed because without wxTR_LINES_AT_ROOT, the buttons would not be displayed. Also update wxTreeCtrl screenshot in the docs. Closes #23844. --- docs/doxygen/images/appear-treectrl-msw.png | Bin 1723 -> 1948 bytes include/wx/treebase.h | 3 +++ 2 files changed, 3 insertions(+) diff --git a/docs/doxygen/images/appear-treectrl-msw.png b/docs/doxygen/images/appear-treectrl-msw.png index d390c93f124fca2b74c3364d1236aeda89da81c6..1ae17be890f014b4159de8dedd418c609fd9bcef 100644 GIT binary patch literal 1948 zcmchYcQhM{7srEEBBe-+)-KN$JR_B~)UNT07b8Y$6!}rqu83LVsS@LdrZ%-|JR^cf ztfIB~*{cMhl+c#iBR~DSzrTOyeD3|8d(XN5-0wZ-#+e#FWCQbp0RRA-fxZs%QZp_i z0>pTk3G3*#OJVWWxAp@7u6O?ohIE6CFSuH5T-mFa@kW5~3;cHI znVD-?(i;T)ka@U0rjgSo{ygN!qsnS%LejzGBjH&-qWA z(g!E=#0hPd{oc^pJ$op$PBeKqkJu>Ktu1#dzIIZDrVM?Gpckq%waEy@rk@~JZ!{u8 zj>*P?O&6dMg64>|%BO0l`Be1D!8>^*@H@&0B=Mq|&?)PeUnoQDnb_ zeb!}Jkwb)VeJ1X?&o1>!Jk!1L#l2X{AC7iWBn>7;+-5`5K-H@M;#yz)1~v@p7d;jt zzT zKkqmI4{jKRF~xTo1S8dQQ+WdhYej_;&-Z=lvms!OBkD*hyLu2TuNh~?ckErc3IBTV z1=1g_-y=l4c$K{se6Alv-vq>37S9DSeU)X|~A-2z;EXL(r*m<#haU}^48%K((m!6?i zvA_s(PUFYIC9}aH!TRiLvq(cJCD(7DLqWShYZBZV_RiPVdPCc|H5PJv8gL`sT6!#AisYb*TQ;w4KGtm5m{>Cu`6?lfPq0F-AQl?f&`V+gO-nG)L!M9%9aN ziMY~>^#&0E#JHfGcVU{4cWS4(lb<6IuXwKM08R#fSb`|>N7>l!MTspq#kxkEE9=JHu7MD3uR@a4c&uVXhfEPtA@WJ(X!w7kLYB#(@`*Ce0;pbx@q)< zTjuz<#a)EtSa&mHuwQ*+*3@C4?Xs_zmlp=}Q6UkAP+)b!U@%_Qn|i=l<+7>{FtF}J zu{(m)xi&NNro^qxyk8+ftH9xwo^<+{vZqJoi5~Ewa!Zvk0rb);>0Ct1-Mj%4E_5f_ zEfat&o0yx+^qkKu$-q3auV4nK@FpF1T7EVUN00DVNc4&^iejbhP4_?~+FZ|QnVZdm z$P2wGF00hSR_ZFVbDU+BE)O^ckH>2jm}<`_To3=Gj%c8U@$1pLM52hW+pRZWZOK6y z)Xc*C&sGnpt2WBhTqGGZO5^r(1K_XV6MgsujvAhPh!R$`gPyK5 zN5W#Zz>;16%h_MO{=ap+cbp|*zfYcoDbR&{yuH1rLLGRSMr!>X2tPUEF>iMAD`L@J Rx_q|)16^aCDlLb|{{rT9%%1=N literal 1723 zcmd6o`#aMM0LH($v{8molRIa*l__CUn@d}zh1y|ewNmDiOIXM<5ozX8RCAY!L{@fI zE2U|PIL{WjBr@hs6m99yN*q6&=Q+>$56<&^-uLtC``gPr;(b6veXBYE02-bLG59qX zttAbtwAKUgUys+Me9ptu7YqhVMtw#AVEs8yjJt1Q>D(=!oPqtiFWDTr?jAgt{nGFz z3VJdOg3d2FLnT%o;-floX{pjR7L}@6T7+%^++?$L02i;dyJ(~zMJ6Frg=mZIGLv_5YL^sdlsqgj<OjYZHl*c`}wntI|052uNm5Z*lg6v_=plj0iks3xE6dmz| z<5bV0x$TC0PqK1;g!EyT&{5gE)fX4Nq|l&yb5TZdNsf}Ip`wN}qJ=hIDB&3O7$~4G z7~CK~jNB`wac#BVvMQ_dT`m(jiEPdnvUwTWIrI$0vDHQ+*`5jjrPpnnWdk5!^#WM0 z_bHDvw*gd2F#7D3KGXl;IQ6Xc2>;IQ&CAlLk2_89<^UCY$S^|>xk1NiR>!R9SBkYC z<@~HN!ovSkxV>PpNobsQHw(xL-bb!UZ&aMOiKqnwBR*tkJVulMMGKvR~lJp zIkWUL#~5{}m0MSre}!P4RMr?MnHD(3aH*@avo?+^UTs*z95T5KML&`qq0~ZBkJZRQ zs84Ltw2b!*^(>;|3&bXFOpARqCP;+at7{LxmH!8|C}c@75w+vi<}q8h*KcqE37^_l z@_ydm2Da#|uitK~`UVF84-J?~0 zzfsZE+oq%WlHKs|!_g@oR*V^4mq7hf9KU33Wwao>Sx&K5N=UfhyvIzeM?KX@*5dtj zu&Y9LR{Pswq;%JV4m*Mgk>pKg6o}0Fk}>1EYRgn!XW4-6+@4aMxl4S4t^rl46dOl8 zBPFJmjZMOM8QoJbo&y%016xf0x=E8&kXSBgQJ#buTfyaSG$uo7Dwq(j+EoW8_6fE) zz#VFAWgqz3$DKUAtISRb9g{#Y{rf?rKEuUAu3@zJ((6T4JXSi$zfYO}`fFln+|uWU z+?jhanpAGCKUCXEnVsF5$nL$f2nB#|{dlpdRY{0rRn=Lz*9F?m*vFS*W8-4`Oewzp zBmA^pHrTpOym3~YPSCla_a(PIUF0?uv>l+Ye3LWS!>txwB*ntQ!bPFUV6^~0Q;51Z z*$--*6Lro$BI(#EG`w?w++WMEpwG>WlpFQ&2Fk&H{;9XiO@Di<5GOmk5XTP2tFFAu zaOW4S>&Pjrh6XKRc;CD4F~bI9EdFx;tT(8h;*{;UBX8nU?)7K5fsZ2;%KQx{7lb}` z<*>(R(6g3($m88D({`+8m=}HC19=>O;@_SkiFuF`Va5as~wPT3s&MsP44LXp~ z+3IM20;C|L|Dzi(va$a;(Ui31)=~GgsOm+wNd|FCGXC1*u1mY;GBlsi+mEi8io}vv zb7HY%ZKU%5iRSL5Zgf)9R~N{bL_6eBfV9oc5VSQ&?q>HNWUfBCC&v<_D|l;f1bAY- KF?Ak+X@3KzU_C$p diff --git a/include/wx/treebase.h b/include/wx/treebase.h index bf3d0f5fa9..ce7f218b3f 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -138,6 +138,9 @@ static const int wxTREE_ITEMSTATE_PREV = -3; // cycle to the previous state #elif defined(__WXMAC__) #define wxTR_DEFAULT_STYLE \ (wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_FULL_ROW_HIGHLIGHT) +#elif defined(__WXMSW__) + #define wxTR_DEFAULT_STYLE \ + (wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_LINES_AT_ROOT | wxTR_TWIST_BUTTONS | wxTR_FULL_ROW_HIGHLIGHT) #else #define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT) #endif