From e841e90fef03f533046f5537c02e71c9118cc553 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 5 Dec 2014 22:18:32 +0000
Subject: [PATCH] Make all bitmaps of the same size in the toolbar sample.

This is a requirement under MSW and resulted in problems when a secondary
toolbar was created.

Closes #16707.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/toolbar/bitmaps/new.bmp | Bin 1318 -> 1318 bytes
 samples/toolbar/bitmaps/new.xpm |  32 ++++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/samples/toolbar/bitmaps/new.bmp b/samples/toolbar/bitmaps/new.bmp
index 92aeb12e7c80f2ceb93e05eb93b15438c4aaee97..0ca66897850f1a70d101e68fb96422333ed878e2 100644
GIT binary patch
literal 1318
zcmZ?rRbyoU12Yx|1`Qxf0Eqd4n2~`4EdBvV3Ufm+P!J4m&M0K~_UsPB|Ns9Po@|@N
z@aw}XhU=3u87{R&F#P@bo#D^d4-793tYA2B-~hw_e}5T1Ts^|@<JBXEv*peV=c+vz
zu20EkxWBTK;bKcD!~RTDhEoMr3}5bFV%VK#%&;OxkKx~+UkrbLd}X-Wm&|aXDTv|C
znH>x#^UN8dU#@{TV3ZsUfzc2cun^$l;zG6?$mL>S0s?Lcc1aEvRu~_`<&}c+p<G5b
z2p`531@Xmz0Hl|fQItm-#Fvv3gK}l~L9#%;m>5V_hLaB@3j$(bF0%-n50YgT1oENk
zd1UzcrTIjl=J5b!`I(rQ!R7;%fE4pXxIp)VWSIr|1%yDZ1M+31`T0bI#Th^x07?r{
A>;M1&

literal 1318
zcmZ?rRbyoU12Yx|1`QyKABq_nIKbi`fTR#N1T!!KIUo!M4GauG#L&<Hp@1Zi$#CGn
z0fqy24lsN;wTxj!j2^@8G-HPSnWhXU^UN7e6<9HxEq7)(SM9-Yp(%*rVoNB)rM3u$
zt9{7~*C%B%T%VH7aC1f>L-flv4EI-dGCbKfi{ZtA6%23A>|pqC^$5e4`<EELJ-fs3
z<JBXEUmspE{Q3HU;qQ;H41a%qXZZK$7sLO5e;NM&{||K3C>RZa(GVat1U~%!&#+{{
z0$@IF0BQy1BT!ZX<|i-(BtcmVl)u>7*~O6nn6C~5YN{&AN{XT|K7^|v0_8)w^1={4
zj4KD?a{~cLuY$astRRRlA;Ash$_Ow3C4qcyZjh{uG(Q872Ljw+t`r}f50aIV1oENk
zWn}~e1o`=(=E(wO1=Q80z~%#$fD{V=x$I!~fMlg41;m8dA$(pz0e(InE^(k=832pJ
BbL{{C

diff --git a/samples/toolbar/bitmaps/new.xpm b/samples/toolbar/bitmaps/new.xpm
index f16c1f6caf..f9ee034b6e 100644
--- a/samples/toolbar/bitmaps/new.xpm
+++ b/samples/toolbar/bitmaps/new.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char *const new_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 31 1",
+"16 16 31 1",
 ". c #7198D9",
 "2 c #DCE6F6",
 ", c #FFFFFF",
@@ -34,19 +34,19 @@ static const char *const new_xpm[] = {
 "X c #376EC9",
 "< c #ACE95B",
 /* pixels */
-"   .XoO+@#$.    ",
-"   .%%&*=-O;:   ",
-"  >>>>%&*=O,=o  ",
-"  ><<>%%&*O,,=o ",
-">>><<>>>%&OOo+@ ",
-"><<<<<<>1%&*=-@ ",
-"><<<<<<>21%&*=@ ",
-">>><<>>>321%&*+ ",
-"  ><<>456321%&O ",
-"  >>>>7456321%o ",
-"   .,8974563210 ",
-"   .,,897456320 ",
-"   .,,,8974563q ",
-"   .,,,,897456w ",
-"   ............ "
+"   .XoO+@#$.     ",
+"   .%%&*=-O;:    ",
+"  >>>>%&*=O,=o   ",
+"  ><<>%%&*O,,=o  ",
+">>><<>>>%&OOo+@  ",
+"><<<<<<>1%&*=-@  ",
+"><<<<<<>21%&*=@  ",
+">>><<>>>321%&*+  ",
+"  ><<>456321%&O  ",
+"  >>>>7456321%o  ",
+"   .,8974563210  ",
+"   .,,897456320  ",
+"   .,,,8974563q  ",
+"   .,,,,897456w  ",
+"   ............  "
 };