From 91feb0d1ae0931e4164d9dea977151bc0e9c098a Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 28 Mar 2006 11:12:48 +0000
Subject: [PATCH] Use XPM for symbols and pictures on all platforms

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 demos/forty/card.cpp     |  14 +---
 demos/forty/forty.rc     |   2 -
 demos/forty/pictures.bmp | Bin 2818 -> 0 bytes
 demos/forty/symbols.bmp  | Bin 1182 -> 0 bytes
 demos/forty/symbols.xpm  | 171 ++++++++++++++++++---------------------
 5 files changed, 80 insertions(+), 107 deletions(-)
 delete mode 100644 demos/forty/pictures.bmp
 delete mode 100644 demos/forty/symbols.bmp

diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp
index 25c9d532a4..7f126fdafa 100644
--- a/demos/forty/card.cpp
+++ b/demos/forty/card.cpp
@@ -36,10 +36,8 @@
 #include "forty.h"
 #include "card.h"
 
-#ifndef __WXMSW__
 #include "pictures.xpm"
-#include "symbols.xbm"
-#endif
+#include "symbols.xpm"
 
 wxBitmap* Card::m_pictureBmap = 0;
 wxBitmap* Card::m_symbolBmap = 0;
@@ -61,11 +59,7 @@ Card::Card(int value, WayUp way_up) :
 {
     if (!m_symbolBmap)
     {
-#ifdef __WXMSW__
-        m_symbolBmap = new wxBitmap(_T("CardSymbols"), wxBITMAP_TYPE_BMP_RESOURCE);
-#else
-        m_symbolBmap = new wxBitmap(Symbols_bits, Symbols_width, Symbols_height);
-#endif
+        m_symbolBmap = new wxBitmap(symbols_xpm);
         if (!m_symbolBmap->Ok())
         {
             ::wxMessageBox(_T("Failed to load bitmap CardSymbols"), _T("Error"));
@@ -73,11 +67,7 @@ Card::Card(int value, WayUp way_up) :
     }
     if (!m_pictureBmap)
     {
-#ifdef __WXMSW__
-        m_pictureBmap = new wxBitmap(_T("CardPictures"), wxBITMAP_TYPE_BMP_RESOURCE);
-#else
         m_pictureBmap = new wxBitmap(Pictures);
-#endif
         if (!m_pictureBmap->Ok())
         {
             ::wxMessageBox(_T("Failed to load bitmap CardPictures"), _T("Error"));
diff --git a/demos/forty/forty.rc b/demos/forty/forty.rc
index 8457ac83a3..e1fb6e531d 100644
--- a/demos/forty/forty.rc
+++ b/demos/forty/forty.rc
@@ -3,6 +3,4 @@ aaaaa    ICON   "cards.ico"
 #include "wx/msw/wx.rc"
 
 CardsIcon    ICON   "cards.ico"
-CardPictures BITMAP "pictures.bmp"
-CardSymbols  BITMAP "symbols.bmp"
 
diff --git a/demos/forty/pictures.bmp b/demos/forty/pictures.bmp
deleted file mode 100644
index d8c3345521fe4640eb1297930d4d98f955ec5054..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2818
zcmbuBO^)0)5QQs2fEk93=o;DN64~c2Ud37Va)L2nEkmdQUx7;t)Iv))M2xPG0}Ko<
zV?Y4&6)CBEJnco08vT~)@jX@*+4Jjf-&-m6JJ+8%|KR+E^E>&0tH`?_%k9Qx6ycC@
ztT(Paa*lF59{G^VAvx<4Cx7bF%m1*30o06XooRVUIjz2Aecv|9fVcXR3!x9e@pg&J
z$zd8`n;q+|Ym&ZQ;!GD@*DJ^U9#_>XLGL%LcoousHG5p4D762)+2Y`{O;(Bv)<Ro(
zudpRO8h3?F9zJ~6noXM^)WB`NIq`_xSJ)!&iZ>hbRK#3zK<ZL+3(Jt#noAYG#%jz>
ztWNmCk)>6wFMQ?o7WVC%<^`{6R@GPIHQH6Tu%bD*<T**o&MEeiD_(NC*IB>JbD>DG
z*HW6A<9zMoS?+1)Ypj-6DNw!DToM&gjTawMQo6r?z_atFZAB!KyJBzncGrbh<PfX<
z&6KNV26L0n4#k{hJbYGYdkH)hUV=`~oi2s$bZ~8%F9hjePJUs?)Hg*7aX`FrE$gdO
zEFNdTbgu8*)3fjiv^|WCjFs3r(o9@l_yn;?u+DSiL0s#e&W^=(`aF3rrfm+v$Bj7k
zAFOJLadD?vtmo*vk%@@0oj5a|mG^XL#qv?+X(Iekh*RH&0qim_?mT1(Ay}{ofhEBF
zR8#frkY&ZrOYm7@WX9P#JI&+@>?wr#=*5RW!Rm^4)&X8kq&1*F%#)^)kCQ0vlI4(d
z98RZCk0#iU8!!7*@a&55fZ4!nYh8wTS<QwypS`M{VtnvnY9AG=^KG5&2VhNNfT{EB
zc-F-@`15KONX=^;K0W#&`tWXws>(Pcg|`sf0JOEIuX(}Jnuq?caO@`kk)da{6eZRg
zSCim8ubKIpP6llTsyHlPw4PwQk0iN?D2h3cLP6an&y;}r$})IIiqCC~l9}+b@^+6j
zfL}s5&&!;sH0be6SM}7_N$=YxDJ^SdaP(J_VOW&EXtp8vW;!{=YDw(y`RqbZTRWqT
zPPqTlHF1WR-i$WT3gi{dp4tUDoZU>Lmj-@%)^6_Icy3uGtohs^ndJj9y*W}LC8iU!
z>u71?W?BQU0n=-)dfHmI1YI}K#*LVTnVP%zQfL_*yeV-k68WjNWE}Cprdy5fU4<CF
z;sdMAPGVbKOU1_xo@yn&@V@rly=RZytPTtZ?WKp;8LBBS4u)p4Q-b1CY<f5z)wgl5
z@fB>@?AEyAQ#WhAxXOH$_b7bZeU?J%o^*}X4YTgeE5(LQN4}^iwbUp!-MxK*O~@|+
z{Hj#bJnMi*oy(5h;;wnCkG-+}suYeLOJTP0ie`qqfrVq8+N!zmmP9JLY9=Y)z`oLq
z7=EUTu?oEo!5I3ZvieG{_|&kbHs7k5`f;prHP2V&MN5K?DyQVUj*M-&D$Vf{TRNsj
zX<WggjO}NyW#uhf#Ez|+)wjC97R~TFzfFYkC{H$B&tgTDT8)E1_o?bqpPD4oS-*3X
U@%Xo{tN+#!P}b$v;s5piFSyfTwg3PC

diff --git a/demos/forty/symbols.bmp b/demos/forty/symbols.bmp
deleted file mode 100644
index c993a061de4b08fe4d9aec7ba9cf6af5d15b7531..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1182
zcmaKr%}d*09LIk}u_7V0w-luHxMQV<B`h<t!?w%VzmPH5E7maCOPy;f!QnwrJXI{s
z?$Yg6al?}0W-2)I2gtTa4;>TJ#v){zHG9$~wtIv<;d$Wm{NBGjxp61o5A8LM&MRm?
zNBbt)0ra_xNA}NTXSXlB!*LvF>N;bQ(LSkM9i^{T;7}20izNF3neu2nQUPT@Wr^Aj
z$K-Ys&1?l0Z`l?bs>Q-C=Wav(o|U4=;F6R<oF9aY&`7P?K~0)NEF+%1--y^XExfdw
zIEfBIKK(Er*{f-cx|@i*@e@2_5kW0bEyro9f>=n|(U2yYRa#&wz$${sMnkfsW*Zjj
zhgEovCW3OHy37mA0<c=m%_lSF%7bSS3P5eeV~E4nN?OR$0EdlfZZ9ZH%1U}V`wG}b
z!=#B2>epo&C_81*BaRx*Azr0mZhzKhY_ZC;c>%T+K25jvSms?lYP!zRArk48)oJD@
zsMJ-78ryj^_6e!!SWrA}o*x;T1>>N@Gp*C@W0#LQ{F;4HBF*`N(d=;FfnG9<t->$g
zezft?FuoOvemwC~jhaUCv6p{_c!T&jcjEK;7V<xRI=SKH6W^T~#_y>oAG~_G$+M_g
zo=VCd8>erb<mOb;vlr{BlJg$17q3y*(L7(W{ye55GJo9A_Od{4jSpKsqIvZe3xeoh
zSYX;Cz;j(*qY0RZb$MtQJ;qR%fg&N(!$Tvnz<dv{jdRjhx$AGXIJLLFB8qjL>)LU~
z{qcNwy-WRI{o?cB^Wu8odf|H3zuy)8?%nsJE)HBw<MMicf2`Mze%%Xo+V%nBAA5Z%
aCieQPKT6#H824Yt@?ENj^@I0|&+``+pXd1i

diff --git a/demos/forty/symbols.xpm b/demos/forty/symbols.xpm
index d15a98adff..b72ffb1849 100644
--- a/demos/forty/symbols.xpm
+++ b/demos/forty/symbols.xpm
@@ -1,93 +1,78 @@
-/* XPM */
-static char *symbols[] = {
-/* width height num_colors chars_per_pixel */
-"   117    70       16            1",
-/* colors */
-"` c #ffffff",
-". c #ff0000",
-"# c #000000",
-"a c #b40000",
-"b c #000000",
-"c c #000000",
-"d c #000000",
-"e c #000000",
-"f c #000000",
-"g c #000000",
-"h c #000000",
-"i c #000000",
-"j c #000000",
-"k c #000000",
-"l c #000000",
-"m c #000000",
-/* pixels */
-"```#``````.````..`..````#````````````````````````````````````````````````````````````````````````````````````````````",
-"``###````...``.......``###```````````````````````````````````````````````````````````````````````````````````````````",
-"`#`#`#``.....`.......`#####``````````````````````````````````````````````````````````````````````````````````````````",
-"#######..............#######`````````````````````````````````````````````````````````````````````````````````````````",
-"`#`#`#``.....``.....``#####``````````````````````````````````````````````````````````````````````````````````````````",
-"```#`````...````...`````#````````````````````````````````````````````````````````````````````````````````````````````",
-"``###`````.``````.`````###```````````````````````````````````````````````````````````````````````````````````````````",
-"``###`````.``````.`````###```````````````````````````````````````````````````````````````````````````````````````````",
-"```#`````...````...`````#````````````````````````````````````````````````````````````````````````````````````````````",
-"`#`#`#``.....``.....``#####``````````````````````````````````````````````````````````````````````````````````````````",
-"#######..............#######`````````````````````````````````````````````````````````````````````````````````````````",
-"`#`#`#``.....`.......`#####``````````````````````````````````````````````````````````````````````````````````````````",
-"``###````...``.......``###```````````````````````````````````````````````````````````````````````````````````````````",
-"```#``````.````..`..````#````````````````````````````````````````````````````````````````````````````````````````````",
-"````###`````````.```````..```..```````#``````````````````````````````````````````````````````````````````````````````",
-"```#####```````...`````....`....`````###`````````````````````````````````````````````````````````````````````````````",
-"```#####```````...````...........```#####````````````````````````````````````````````````````````````````````````````",
-"````###```````.....```...........``#######```````````````````````````````````````````````````````````````````````````",
-"`##``#``##```.......``...........`#########``````````````````````````````````````````````````````````````````````````",
-"####`#`####`.........`...........###########`````````````````````````````````````````````````````````````````````````",
-"###########``.......```.........`###########`````````````````````````````````````````````````````````````````````````",
-"####`#`####```.....`````.......``####`#`####`````````````````````````````````````````````````````````````````````````",
-"`##``#``##`````...```````.....````##``#``##``````````````````````````````````````````````````````````````````````````",
-"````###````````...````````...````````###`````````````````````````````````````````````````````````````````````````````",
-"``#######```````.``````````.```````#######```````````````````````````````````````````````````````````````````````````",
-"``#######```````.``````````.```````#######```````````````````````````````````````````````````````````````````````````",
-"````###````````...````````...````````###`````````````````````````````````````````````````````````````````````````````",
-"`##``#``##`````...```````.....````##``#``##``````````````````````````````````````````````````````````````````````````",
-"####`#`####```.....`````.......``####`#`####`````````````````````````````````````````````````````````````````````````",
-"###########``.......```.........`###########`````````````````````````````````````````````````````````````````````````",
-"####`#`####`.........`...........###########`````````````````````````````````````````````````````````````````````````",
-"`##``#``##```.......``...........`#########``````````````````````````````````````````````````````````````````````````",
-"````###```````.....```...........``#######```````````````````````````````````````````````````````````````````````````",
-"```#####```````...````...........```#####````````````````````````````````````````````````````````````````````````````",
-"```#####```````...`````....`....`````###`````````````````````````````````````````````````````````````````````````````",
-"````###`````````.```````..```..```````#``````````````````````````````````````````````````````````````````````````````",
-"``##````###``#####````#``#####``###``#####``###```###`#``##``#####``###``#```#```````````````````````````````````````",
-"`#``#``#```#````#````##``#`````#`````````#`#```#`#```##`#``#````#``#```#`#``#````````````````````````````````````````",
-"#````#`````#```#````#`#``####``#````````#``#```#`#```##`#``#````#``#```#`#`#`````````````````````````````````````````",
-"#````#```##```###``#``#``````#`####````#````###```#####`#``#````#``#```#`##``````````````````````````````````````````",
-"######``#````````#`#####`````#`#```#```#```#```#`````##`#``#````#``#`#`#`#`#`````````````````````````````````````````",
-"#````#`#`````#```#````#``#```#`#```#```#```#```#````#`#`#``#`#``#``#``#``#``#````````````````````````````````````````",
-"#````#`#####``###`````#```###```###````#````###````#``#``##```##````##`#`#```#```````````````````````````````````````",
-"#````#`#####``###```#`````###```###````#````###````#```##``#```##``#`##``#```#```````````````````````````````````````",
-"#````#`````#`#```#``#````#```#`#```#```#```#```#``#```#``#`#``#``#``#``#``#``#```````````````````````````````````````",
-"######````#``#`````#####`#`````#```#```#```#```#`#````#``#`#``#````#`#`#```#`#```````````````````````````````````````",
-"#````#``##````###```#``#`#`````#####```#````###``####`#``#`#``#````#```#````##```````````````````````````````````````",
-"#````#`#```````#````#`#```####`````#``#````#```#`#```##``#`#``#````#```#```#`#```````````````````````````````````````",
-"`#``#``#```#``#`````##```````#`````#`#`````#```#`#```##``#`#``#````#```#``#``#```````````````````````````````````````",
-"``##````###``#####``#````#####``###``#####``###```###``##``#`#####``###``#```#```````````````````````````````````````",
-"```##``````#####```#######``````##```#######````####```#######```#####````#####``##``###```#######```#####```##````#`",
-"``####````#######``######``````###```#######```#####```#######``#######``#######`##`#####``#######``#######``##```##`",
-"`######```##```##`````##``````####```##```````###``````````###``##```##``##```##`##`##`##``````##```##```##``##``###`",
-"###``###``````###````##``````#####```######```##``````````###```###`###``##```##`##`##`##``````##```##```##``##`###``",
-"##````##````####````####````###`##```#######``######`````###`````#####```#######`##`##`##``````##```##```##``#####```",
-"########```####`````#####```##``##````````##``#######````##``````#####````######`##`##`##``````##```##```##``####````",
-"########``###``````````###``#######```````##``##```##````##`````###`###``````###`##`##`##``````##```####`##``#####```",
-"##````##``##```````##```##``#######``##```##``##```##````##`````##```##`````###``##`##`##``##``##```##`####``##`###``",
-"##````##``#######``#######``````##```#######``#######````##`````#######````###```##`#####``######```######```##``###`",
-"##````##``#######```#####```````##````#####````#####`````##``````#####````###````##``###````####`````######``##```##`",
-"`##````##`#######```#####````##```````#####````#####``````##`````#####``````###````###``##```####```######```##```##`",
-"`##````##`#######``#######```##``````#######``#######`````##````#######````###````#####`##``######```######``###``##`",
-"`##````##``````##``##```##``#######``##```##``##```##`````##````##```##```###`````##`##`##``##``##``####`##```###`##`",
-"`########`````###``###``````#######``##```````##```##`````##````###`###``###``````##`##`##``##``````##`####````#####`",
-"`########```####````#####````##``##``##```````#######`````##`````#####```######```##`##`##``##``````##```##`````####`",
-"`##````##``####``````####````##`###``#######```######````###`````#####```#######``##`##`##``##``````##```##````#####`",
-"`###``###`###`````````##`````#####````######```````##```###`````###`###``##```##``##`##`##``##``````##```##```###`##`",
-"``######``##```##````##``````####`````````##``````###``###``````##```##``##```##``##`##`##``##``````##```##``###``##`",
-"```####```#######```######```###`````#######```#####```#######``#######``#######``#####`##`#######``#######``##```##`",
-"````##`````#####```#######```##``````#######```####````#######```#####````#####````###``##`#######```#####```#````##`"
-};
+/* XPM */
+static char *symbols_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"117 70 2 1",
+". c Black",
+"  c #FFFFFF",
+/* pixels */
+"   .      .    .. ..    .                                                                                            ",
+"  ...    ...  .......  ...                                                                                           ",
+" . . .  ..... ....... .....                                                                                          ",
+"............................                                                                                         ",
+" . . .  .....  .....  .....                                                                                          ",
+"   .     ...    ...     .                                                                                            ",
+"  ...     .      .     ...                                                                                           ",
+"  ...     .      .     ...                                                                                           ",
+"   .     ...    ...     .                                                                                            ",
+" . . .  .....  .....  .....                                                                                          ",
+"............................                                                                                         ",
+" . . .  ..... ....... .....                                                                                          ",
+"  ...    ...  .......  ...                                                                                           ",
+"   .      .    .. ..    .                                                                                            ",
+"    ...         .       ..   ..       .                                                                              ",
+"   .....       ...     .... ....     ...                                                                             ",
+"   .....       ...    ...........   .....                                                                            ",
+"    ...       .....   ...........  .......                                                                           ",
+" ..  .  ..   .......  ........... .........                                                                          ",
+".... . .... ......... ......................                                                                         ",
+"...........  .......   ......... ...........                                                                         ",
+".... . ....   .....     .......  .... . ....                                                                         ",
+" ..  .  ..     ...       .....    ..  .  ..                                                                          ",
+"    ...        ...        ...        ...                                                                             ",
+"  .......       .          .       .......                                                                           ",
+"  .......       .          .       .......                                                                           ",
+"    ...        ...        ...        ...                                                                             ",
+" ..  .  ..     ...       .....    ..  .  ..                                                                          ",
+".... . ....   .....     .......  .... . ....                                                                         ",
+"...........  .......   ......... ...........                                                                         ",
+".... . .... ......... ......................                                                                         ",
+" ..  .  ..   .......  ........... .........                                                                          ",
+"    ...       .....   ...........  .......                                                                           ",
+"   .....       ...    ...........   .....                                                                            ",
+"   .....       ...     .... ....     ...                                                                             ",
+"    ...         .       ..   ..       .                                                                              ",
+"  ..    ...  .....    .  .....  ...  .....  ...   ... .  ..  .....  ...  .   .                                       ",
+" .  .  .   .    .    ..  .     .         . .   . .   .. .  .    .  .   . .  .                                        ",
+".    .     .   .    . .  ....  .        .  .   . .   .. .  .    .  .   . . .                                         ",
+".    .   ..   ...  .  .      . ....    .    ...   ..... .  .    .  .   . ..                                          ",
+"......  .        . .....     . .   .   .   .   .     .. .  .    .  . . . . .                                         ",
+".    . .     .   .    .  .   . .   .   .   .   .    . . .  . .  .  .  .  .  .                                        ",
+".    . .....  ...     .   ...   ...    .    ...    .  .  ..   ..    .. . .   .                                       ",
+".    . .....  ...   .     ...   ...    .    ...    .   ..  .   ..  . ..  .   .                                       ",
+".    .     . .   .  .    .   . .   .   .   .   .  .   .  . .  .  .  .  .  .  .                                       ",
+"......    .  .     ..... .     .   .   .   .   . .    .  . .  .    . . .   . .                                       ",
+".    .  ..    ...   .  . .     .....   .    ...  .... .  . .  .    .   .    ..                                       ",
+".    . .       .    . .   ....     .  .    .   . .   ..  . .  .    .   .   . .                                       ",
+" .  .  .   .  .     ..       .     . .     .   . .   ..  . .  .    .   .  .  .                                       ",
+"  ...   ...  .....  .    .....  ...  .....  ...   ...  ..  . .....  ...  .   .                                       ",
+"   ..      .....   .......      ..   .......    ....   .......   .....    .....  ..  ...   .......   .....   ..    . ",
+"  ....    .......  ......      ...   .......   .....   .......  .......  ....... .. .....  .......  .......  ..   .. ",
+" ......   ..   ..     ..      ....   ..       ...          ...  ..   ..  ..   .. .. .. ..      ..   ..   ..  ..  ... ",
+"...  ...      ...    ..      .....   ......   ..          ...   ... ...  ..   .. .. .. ..      ..   ..   ..  .. ...  ",
+"..    ..    ....    ....    ... ..   .......  ......     ...     .....   ....... .. .. ..      ..   ..   ..  .....   ",
+"........   ....     .....   ..  ..        ..  .......    ..      .....    ...... .. .. ..      ..   ..   ..  ....    ",
+"........  ...          ...  .......       ..  ..   ..    ..     ... ...      ... .. .. ..      ..   .... ..  .....   ",
+"..    ..  ..       ..   ..  .......  ..   ..  ..   ..    ..     ..   ..     ...  .. .. ..  ..  ..   .. ....  .. ...  ",
+"..    ..  .......  .......      ..   .......  .......    ..     .......    ...   .. .....  ......   ......   ..  ... ",
+"..    ..  .......   .....       ..    .....    .....     ..      .....    ...    ..  ...    ....     ......  ..   .. ",
+" ..    .. .......   .....    ..       .....    .....      ..     .....      ...    ...  ..   ....   ......   ..   .. ",
+" ..    .. .......  .......   ..      .......  .......     ..    .......    ...    ..... ..  ......   ......  ...  .. ",
+" ..    ..      ..  ..   ..  .......  ..   ..  ..   ..     ..    ..   ..   ...     .. .. ..  ..  ..  .... ..   ... .. ",
+" ........     ...  ...      .......  ..       ..   ..     ..    ... ...  ...      .. .. ..  ..      .. ....    ..... ",
+" ........   ....    .....    ..  ..  ..       .......     ..     .....   ......   .. .. ..  ..      ..   ..     .... ",
+" ..    ..  ....      ....    .. ...  .......   ......    ...     .....   .......  .. .. ..  ..      ..   ..    ..... ",
+" ...  ... ...         ..     .....    ......       ..   ...     ... ...  ..   ..  .. .. ..  ..      ..   ..   ... .. ",
+"  ......  ..   ..    ..      ....         ..      ...  ...      ..   ..  ..   ..  .. .. ..  ..      ..   ..  ...  .. ",
+"   ....   .......   ......   ...     .......   .....   .......  .......  .......  ..... .. .......  .......  ..   .. ",
+"    ..     .....   .......   ..      .......   ....    .......   .....    .....    ...  .. .......   .....   .    .. "
+};
-- 
2.50.0