From 7d2ff522c1f846ec4803cb65d29ecf2a19a60dae Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 20 Jun 2010 20:04:29 +0200
Subject: [PATCH] give an icon to bitmapt2component frame

---
 bitmap2component/bitmap2cmp_gui.cpp   |   8 ++++++--
 bitmap2component/bitmap2component.ico | Bin 0 -> 2238 bytes
 bitmap2component/bitmap2component.rc  |   2 ++
 bitmap2component/bitmap2component.xpm |   2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 bitmap2component/bitmap2component.ico
 create mode 100644 bitmap2component/bitmap2component.rc

diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 679c636446..be1d52a68c 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -29,7 +29,7 @@
 #include "potracelib.h"
 #include "bitmap_io.h"
 
-//#include "bitmap2component.xpm"
+#include "bitmap2component.xpm"
 
 
 #define KEYWORD_FRAME_POSX wxT( "bmconverter_Pos_x" )
@@ -82,9 +82,13 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL )
     m_Config->Read( KEYWORD_FRAME_SIZEX, & m_FrameSize.x, -1 );
     m_Config->Read( KEYWORD_FRAME_SIZEY, & m_FrameSize.y, -1 );
 
+    #ifdef __WINDOWS__
     SetIcon( wxICON( bitmap2component_icon ) );
+    #else
+    SetIcon( wxICON( bitmap2component ) );
+    #endif
 
-    wxString msg( wxT( "  0000  " ) );
+    wxString msg( wxT( "000000" ) );
     m_gridInfo->SetCellValue( 1, 0, msg );
     m_gridInfo->SetCellValue( 2, 0, msg );
     if( GetSizer() )
diff --git a/bitmap2component/bitmap2component.ico b/bitmap2component/bitmap2component.ico
new file mode 100644
index 0000000000000000000000000000000000000000..476513d76f6110b8bd037cc5ed7c83c6ad845626
GIT binary patch
literal 2238
zcmchZ&2HO96oo(8l4Z$1L>JAPXg4WP2>wCSfGmN^Bo)h+M1iC%2Owa`7U9q}DM6GI
zI}5);mwko4K(~E{zCquk=%SaTtT;{GO@WTU;qabw@0@#P7J`!eR27-m`FS0l0ng=;
z5Z}v_#XlLPB2xb9HRV@7@!P=X^IDDavj)E$ALD-c1<yZID8K%d%|A9NzyFil{XNRx
z-teRT9p&hE$}1JdBL`xSzUnh;oiT|_F0T)ng*KzqBo2;gwG5)D$MuCn_y*GG5F>Oj
zXI-?^CQvQ<7cR3&n@N1aWo$FMF&HJ1pK7Q9w5&s^;c)%7OL%INs(tX9cyD~{(IMW<
zzzYM~V+$vk(9<vIjc;gbG2I}<K1eV|bIkWClaWd?8j;QtCi<A`u}Y|UAUrRgbC=FZ
z?;_@DLa1L7k5eoyU=~~v#Z%r!5GEarOX=a=E3`m7IPc*_9(Rdo(_QAA5cX~2ri<$v
zOb!DkcEJ4f2*dAV8YWspwlsSTodNA`S2Q1BHEbN)Wq5jqXFD|X7CVhIIOyX`E!%hK
z>Lz{R8K#HX_0TMbK=!m69?pq@d9cSo+Ue>Jw#4owwtFxnup_SYglS_;a5SOgy~EK{
zOsU^I>dCh+d&0fmXSXpT7|!v%H-vJ2vG_D?XfO;U)}?zG(dQVW?_;_lnsX|>s95$M
zj@Q8SUNUe3x^9ep7IEMFfn9eloRF)-Tc+)Rz(1!WnjAC1^mUp8la8y2hJbrx$nI^M
z;AId0g++)%+#fP^r7@?$z}(4swwL01cUVq}BlWvyA<cG7+uElmT8y5~kuQF=HO!V=
zr1p@3-Nti!*oK9B>(F~Sr1`?5t2VG(J91BSu40pEB>i3o4DN<_Y8(4S4>!B3T?cnE
z#2I_E!UpZ@9XfJJ?OhM!n>$Q3Mf0TBd59IpOs4x>O!v5n0^(#yczI5uhRk<k(tREE
zYm1Spk-Q2Rhbd}ugLiXI7`<hl2rrxwwNsKL;&MJA4HE*<b;UW;zFbB(;hlILnL3GW
zG4?bfPwuPZW4IH{vl&`P^w<-IClPHsrPmQ{hDYtGp=5xP&reY@!oOfSq&zXQ+${MC
zxPXe{Rb``CEN4ktu4}bwSy|nB^exLJL8(@&tJF7@YNb}ItZl3;cnd<YJN5c@Ia}sa
zQMy2uc)eayl+AiQ59Bo-5hOpaP+H(h?O~guzpTEbE9DZ8vR2nJRu-VXp6^^;qNP%4
zbF-ZFo#RE?qiwSd>(bTZ@u4$CDe$^fT||r5;%h6%x3dBtIV;t2-o`_|h~C<&ZEc8m
z`B>zy75H|YYOe2*ZG~XLrFwmRA&>360r7t;=NJ0KlIlbM3j<ak_oL+EvPkZ)G`m^f
zE(jYkwko;F3w%2}LGeGAQfMux3%p(uq+H4!`#UW6Lj<m^tW=fN2R|e&qbW+IQmG<J
ya|@Qox`2fsBuRVf`Yr7EAZ5AAi|5la^wHu0m-l}eixc~Y5{v#m`Csrq2mS)Dm>~NA

literal 0
HcmV?d00001

diff --git a/bitmap2component/bitmap2component.rc b/bitmap2component/bitmap2component.rc
new file mode 100644
index 0000000000..98ff16a927
--- /dev/null
+++ b/bitmap2component/bitmap2component.rc
@@ -0,0 +1,2 @@
+bitmap2component_icon ICON bitmap2component.ico
+#include "wx/msw/wx.rc"
diff --git a/bitmap2component/bitmap2component.xpm b/bitmap2component/bitmap2component.xpm
index b33d7a583b..e968612ef9 100644
--- a/bitmap2component/bitmap2component.xpm
+++ b/bitmap2component/bitmap2component.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *bitmap2component_xpm[] = {
+const char *bitmap2component_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "@ c #592904",