From dc8174d2a9827c8663ab955765865256bb0b2eb8 Mon Sep 17 00:00:00 2001 From: "Bart A.M. Jourquin" Date: Tue, 1 Feb 2000 14:52:25 +0000 Subject: [PATCH] icons fix for unix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/dbbrowse/bitmaps/col.xpm | 46 ++++++++++++------------ demos/dbbrowse/bitmaps/d_closed.xpm | 52 +++++++++++++-------------- demos/dbbrowse/bitmaps/d_open.xpm | 52 +++++++++++++-------------- demos/dbbrowse/bitmaps/dsn.xpm | 46 ++++++++++++------------ demos/dbbrowse/bitmaps/dsnclose.xpm | 46 ++++++++++++------------ demos/dbbrowse/bitmaps/dsnopen.xpm | 46 ++++++++++++------------ demos/dbbrowse/bitmaps/f_closed.xpm | 56 ++++++++++++++--------------- demos/dbbrowse/bitmaps/f_open.xpm | 56 ++++++++++++++--------------- demos/dbbrowse/bitmaps/key.xpm | 50 +++++++++++++------------- demos/dbbrowse/bitmaps/keyf.xpm | 50 +++++++++++++------------- demos/dbbrowse/bitmaps/pgmctrl.xpm | 54 ++++++++++++++-------------- demos/dbbrowse/bitmaps/tab.xpm | 52 +++++++++++++-------------- demos/dbbrowse/dbtree.cpp | 28 +++++++++------ 13 files changed, 320 insertions(+), 314 deletions(-) diff --git a/demos/dbbrowse/bitmaps/col.xpm b/demos/dbbrowse/bitmaps/col.xpm index 81cc251bed..67e0e1a8fa 100644 --- a/demos/dbbrowse/bitmaps/col.xpm +++ b/demos/dbbrowse/bitmaps/col.xpm @@ -1,23 +1,23 @@ -/* XPM */ -static char* COL_xpm[] = { -"16 16 4 1", -" c #000000", -"! c #000080", -"# c #C0C0C0", -"$ c #808080", -"$$$$$$$ $$$$", -"$######!!!!!### ", -"$######!!!!!### ", -"$######!!!!!### ", -"$######!###!### ", -"$# #!$$$!# # ", -"$# ####! !### ", -"$# #! ! !# # ", -"$# ####! !### ", -"$# #! ! !# # ", -"$# ####! !### ", -"$# #! ! !# # ", -"$$$$$$#! !### ", -" #! !# ", -" #!!!!!# ", -" "}; +/* XPM */ +static char* COL_xpm[] = { +"16 16 4 1", +" c #000000", +"! c #000080", +"# c #C0C0C0", +"$ c #808080", +"$$$$$$$ $$$$", +"$######!!!!!### ", +"$######!!!!!### ", +"$######!!!!!### ", +"$######!###!### ", +"$# #!$$$!# # ", +"$# ####! !### ", +"$# #! ! !# # ", +"$# ####! !### ", +"$# #! ! !# # ", +"$# ####! !### ", +"$# #! ! !# # ", +"$$$$$$#! !### ", +" #! !# ", +" #!!!!!# ", +" "}; diff --git a/demos/dbbrowse/bitmaps/d_closed.xpm b/demos/dbbrowse/bitmaps/d_closed.xpm index a32bbd2138..0c88399966 100644 --- a/demos/dbbrowse/bitmaps/d_closed.xpm +++ b/demos/dbbrowse/bitmaps/d_closed.xpm @@ -1,26 +1,26 @@ -/* XPM */ -static char * DocClosed_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 4 1", -/* colors */ -" s None c None", -". c #000000", -"& c #ff0000", -"+ c #ffffff", -/* pixels */ -" ", -"........ ", -".++++++.. ", -".+.+.++.+. ", -".++++++.... ", -".+.+.+++++.. ", -".+++++++++.&. ", -".+.+.+.+.+.&&. ", -".+++++++++.&&&. ", -".+.+.+.+.+.&&&. ", -".+++++++++.&&. ", -".+.+.+.+.+.&. ", -".+++++++++.. ", -"........... ", -" ", -" "}; +/* XPM */ +static char * DocClosed_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 4 1", +/* colors */ +" s None c None", +". c #000000", +"& c #ff0000", +"+ c #ffffff", +/* pixels */ +" ", +"........ ", +".++++++.. ", +".+.+.++.+. ", +".++++++.... ", +".+.+.+++++.. ", +".+++++++++.&. ", +".+.+.+.+.+.&&. ", +".+++++++++.&&&. ", +".+.+.+.+.+.&&&. ", +".+++++++++.&&. ", +".+.+.+.+.+.&. ", +".+++++++++.. ", +"........... ", +" ", +" "}; diff --git a/demos/dbbrowse/bitmaps/d_open.xpm b/demos/dbbrowse/bitmaps/d_open.xpm index 72eb00fad7..b4af6e520a 100644 --- a/demos/dbbrowse/bitmaps/d_open.xpm +++ b/demos/dbbrowse/bitmaps/d_open.xpm @@ -1,26 +1,26 @@ -/* XPM */ -static char * DocOpen_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 4 1", -/* colors */ -" s None c None", -". c #000000", -"& c #00ff00", -"+ c #ffffff", -/* pixels */ -" ", -"........ ", -".++++++.. ", -".+.+.++.+. ", -".++++++.... ", -".+.+.+++++.. ", -".+++++++++.&. ", -".+.+.+.+.+.&&. ", -".+++++++++.&&&. ", -".+.+.+.+.+.&&&. ", -".+++++++++.&&. ", -".+.+.+.+.+.&. ", -".+++++++++.. ", -"........... ", -" ", -" "}; +/* XPM */ +static char * DocOpen_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 4 1", +/* colors */ +" s None c None", +". c #000000", +"& c #00ff00", +"+ c #ffffff", +/* pixels */ +" ", +"........ ", +".++++++.. ", +".+.+.++.+. ", +".++++++.... ", +".+.+.+++++.. ", +".+++++++++.&. ", +".+.+.+.+.+.&&. ", +".+++++++++.&&&. ", +".+.+.+.+.+.&&&. ", +".+++++++++.&&. ", +".+.+.+.+.+.&. ", +".+++++++++.. ", +"........... ", +" ", +" "}; diff --git a/demos/dbbrowse/bitmaps/dsn.xpm b/demos/dbbrowse/bitmaps/dsn.xpm index 4647696344..f8d88279e5 100644 --- a/demos/dbbrowse/bitmaps/dsn.xpm +++ b/demos/dbbrowse/bitmaps/dsn.xpm @@ -1,23 +1,23 @@ -/* XPM */ -static char* DSN_xpm[] = { -"16 16 4 1", -" c #000000", -"! c #C0C0C0", -"# c #808080", -"$ c #FFFF00", -" # ####### ", -" ###!#!!!!## ", -" #!#!!!!!!!!# ", -"$## !!###!!!!# ", -" # #!!!!!!!!# ", -" #!#!#!!!### ", -" $#!#!### ## ", -" # $!!#### # ", -" # !### ## ", -" # !!!#### # ", -" # !### ## ", -" # !!!#### # ", -" # !### ## ", -" # !!!#### # ", -" ## !### ## ", -" ######## "}; +/* XPM */ +static char* DSN_xpm[] = { +"16 16 4 1", +" c #000000", +"! c #C0C0C0", +"# c #808080", +"$ c #FFFF00", +" # ####### ", +" ###!#!!!!## ", +" #!#!!!!!!!!# ", +"$## !!###!!!!# ", +" # #!!!!!!!!# ", +" #!#!#!!!### ", +" $#!#!### ## ", +" # $!!#### # ", +" # !### ## ", +" # !!!#### # ", +" # !### ## ", +" # !!!#### # ", +" # !### ## ", +" # !!!#### # ", +" ## !### ## ", +" ######## "}; diff --git a/demos/dbbrowse/bitmaps/dsnclose.xpm b/demos/dbbrowse/bitmaps/dsnclose.xpm index abc9cc8da5..481fb3d6f5 100644 --- a/demos/dbbrowse/bitmaps/dsnclose.xpm +++ b/demos/dbbrowse/bitmaps/dsnclose.xpm @@ -1,23 +1,23 @@ -/* XPM */ -static char* DsnClosed_xpm[] = { -"16 16 4 1", -" c #000000", -"! c #C0C0C0", -"# c #808080", -"$ c #FF0000", -" $ $##$### ", -" $#$!$!!!!## ", -" #!$!!!!!!!!# ", -"$$$ !!$$$!!!!# ", -" # $!!!!!!!!# ", -" $!$!$!!!### ", -" $!!$!#!$ ## ", -" # $!!#### # ", -" # !### ## ", -" # !!!#### # ", -" # !### ## ", -" # !!!#### # ", -" # !### ## ", -" # !!!#### # ", -" ## !### ## ", -" ######## "}; +/* XPM */ +static char* DsnClosed_xpm[] = { +"16 16 4 1", +" c #000000", +"! c #C0C0C0", +"# c #808080", +"$ c #FF0000", +" $ $##$### ", +" $#$!$!!!!## ", +" #!$!!!!!!!!# ", +"$$$ !!$$$!!!!# ", +" # $!!!!!!!!# ", +" $!$!$!!!### ", +" $!!$!#!$ ## ", +" # $!!#### # ", +" # !### ## ", +" # !!!#### # ", +" # !### ## ", +" # !!!#### # ", +" # !### ## ", +" # !!!#### # ", +" ## !### ## ", +" ######## "}; diff --git a/demos/dbbrowse/bitmaps/dsnopen.xpm b/demos/dbbrowse/bitmaps/dsnopen.xpm index a492926806..53546c8771 100644 --- a/demos/dbbrowse/bitmaps/dsnopen.xpm +++ b/demos/dbbrowse/bitmaps/dsnopen.xpm @@ -1,23 +1,23 @@ -/* XPM */ -static char* DsnOpen_xpm[] = { -"16 16 4 1", -" c #000000", -"! c #C0C0C0", -"# c #808080", -"$ c #00FF00", -" $ $##$### ", -" $#$!$!!!!## ", -" #!$!!!!!!!!# ", -"$$$ !!$$$!!!!# ", -" # $!!!!!!!!# ", -" $!$!$!!!### ", -" $!!$!#!$ ## ", -" # $!!#### # ", -" # !### ## ", -" # !!!#### # ", -" # !### ## ", -" # !!!#### # ", -" # !### ## ", -" # !!!#### # ", -" ## !### ## ", -" ######## "}; +/* XPM */ +static char* DsnOpen_xpm[] = { +"16 16 4 1", +" c #000000", +"! c #C0C0C0", +"# c #808080", +"$ c #00FF00", +" $ $##$### ", +" $#$!$!!!!## ", +" #!$!!!!!!!!# ", +"$$$ !!$$$!!!!# ", +" # $!!!!!!!!# ", +" $!$!$!!!### ", +" $!!$!#!$ ## ", +" # $!!#### # ", +" # !### ## ", +" # !!!#### # ", +" # !### ## ", +" # !!!#### # ", +" # !### ## ", +" # !!!#### # ", +" ## !### ## ", +" ######## "}; diff --git a/demos/dbbrowse/bitmaps/f_closed.xpm b/demos/dbbrowse/bitmaps/f_closed.xpm index 1336999d73..8e17fcff85 100644 --- a/demos/dbbrowse/bitmaps/f_closed.xpm +++ b/demos/dbbrowse/bitmaps/f_closed.xpm @@ -1,28 +1,28 @@ -/* XPM */ -static char * FolderClosed_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", -/* pixels */ -" ", -" @@@@@ ", -" @#+#+#@ ", -" @#+#+#+#@@@@@@ ", -" @$$$$$$$$$$$$@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @@@@@@@@@@@@@@.", -" ..............", -" ", -" "}; +/* XPM */ +static char * FolderClosed_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 6 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #c0c0c0", +"@ c #808080", +"# c #ffff00", +"$ c #ffffff", +/* pixels */ +" ", +" @@@@@ ", +" @#+#+#@ ", +" @#+#+#+#@@@@@@ ", +" @$$$$$$$$$$$$@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @@@@@@@@@@@@@@.", +" ..............", +" ", +" "}; diff --git a/demos/dbbrowse/bitmaps/f_open.xpm b/demos/dbbrowse/bitmaps/f_open.xpm index 08eac38121..81976bcca8 100644 --- a/demos/dbbrowse/bitmaps/f_open.xpm +++ b/demos/dbbrowse/bitmaps/f_open.xpm @@ -1,28 +1,28 @@ -/* XPM */ -static char * FolderOpen_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", -/* pixels */ -" ", -" @@@@@ ", -" @$$$$$@ ", -" @$#+#+#$@@@@@@ ", -" @$+#+#+$$$$$$@.", -" @$#+#+#+#+#+#@.", -"@@@@@@@@@@@@@#@.", -"@$$$$$$$$$$@@+@.", -"@$#+#+#+#+##.@@.", -" @$#+#+#+#+#+.@.", -" @$+#+#+#+#+#.@.", -" @$+#+#+#+##@..", -" @@@@@@@@@@@@@.", -" .............", -" ", -" "}; +/* XPM */ +static char * FolderOpen_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 6 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #c0c0c0", +"@ c #808080", +"# c #ffff00", +"$ c #ffffff", +/* pixels */ +" ", +" @@@@@ ", +" @$$$$$@ ", +" @$#+#+#$@@@@@@ ", +" @$+#+#+$$$$$$@.", +" @$#+#+#+#+#+#@.", +"@@@@@@@@@@@@@#@.", +"@$$$$$$$$$$@@+@.", +"@$#+#+#+#+##.@@.", +" @$#+#+#+#+#+.@.", +" @$+#+#+#+#+#.@.", +" @$+#+#+#+##@..", +" @@@@@@@@@@@@@.", +" .............", +" ", +" "}; diff --git a/demos/dbbrowse/bitmaps/key.xpm b/demos/dbbrowse/bitmaps/key.xpm index 12f98d57ee..cc716cbcd8 100644 --- a/demos/dbbrowse/bitmaps/key.xpm +++ b/demos/dbbrowse/bitmaps/key.xpm @@ -1,26 +1,26 @@ -/* XPM */ -static char* XpmKEY_xpm[] = { -"16 16 7 1", -" c #000000", -"! c #008000", -"# c #808000", -"$ c #000080", -"% c #C0C0C0", -"& c #808080", -"' c #FFFF00", -" && ", -" ## #&% ", -" #'& $'#& ", -"#''& $'#% ", -"#''& %'#& ", -" #'''''%#% ", -" ##%%%'#% ", -" #%'# ", -" #'#& !!!!! ", -" %#'## !!!!! ", -" ###& !! !! ", -" #'## !!!!! ", -" ###& !!!! ", -" #'#& !! ", -" #%#& !!!! ", +/* XPM */ +static char* KEY_xpm[] = { +"16 16 7 1", +" c #000000", +"! c #008000", +"# c #808000", +"$ c #000080", +"% c #C0C0C0", +"& c #808080", +"' c #FFFF00", +" && ", +" ## #&% ", +" #'& $'#& ", +"#''& $'#% ", +"#''& %'#& ", +" #'''''%#% ", +" ##%%%'#% ", +" #%'# ", +" #'#& !!!!! ", +" %#'## !!!!! ", +" ###& !! !! ", +" #'## !!!!! ", +" ###& !!!! ", +" #'#& !! ", +" #%#& !!!! ", " &% "}; \ No newline at end of file diff --git a/demos/dbbrowse/bitmaps/keyf.xpm b/demos/dbbrowse/bitmaps/keyf.xpm index 6165e25e1d..0d1669876f 100644 --- a/demos/dbbrowse/bitmaps/keyf.xpm +++ b/demos/dbbrowse/bitmaps/keyf.xpm @@ -1,26 +1,26 @@ -/* XPM */ -static char* XpmKEYF_xpm[] = { -"16 16 7 1", -" c #000000", -"! c #808000", -"# c #000080", -"$ c #C0C0C0", -"% c #808080", -"& c #FFFF00", -"' c #0000FF", -" %% ", -" !! !%$ ", -" !&% #&!% ", -"!&&% #&!$ ", -"!&&% $&!% ", -" !&&&&&$!$ ", -" !!$$$&!$ ", -" !$&!$ ", -" !&!% '''''' ", -" $!&!! '' ' ", -" !!!% '' ", -" !&!! ''' ", -" !!!% '' ", -" !&!% '' ", -" !$!% '''' ", +/* XPM */ +static char* KEYF_xpm[] = { +"16 16 7 1", +" c #000000", +"! c #808000", +"# c #000080", +"$ c #C0C0C0", +"% c #808080", +"& c #FFFF00", +"' c #0000FF", +" %% ", +" !! !%$ ", +" !&% #&!% ", +"!&&% #&!$ ", +"!&&% $&!% ", +" !&&&&&$!$ ", +" !!$$$&!$ ", +" !$&!$ ", +" !&!% '''''' ", +" $!&!! '' ' ", +" !!!% '' ", +" !&!! ''' ", +" !!!% '' ", +" !&!% '' ", +" !$!% '''' ", " %$ "}; \ No newline at end of file diff --git a/demos/dbbrowse/bitmaps/pgmctrl.xpm b/demos/dbbrowse/bitmaps/pgmctrl.xpm index 5edc5b47d3..b66db2b56c 100644 --- a/demos/dbbrowse/bitmaps/pgmctrl.xpm +++ b/demos/dbbrowse/bitmaps/pgmctrl.xpm @@ -1,27 +1,27 @@ -/* XPM */ -static char * PgmCtrl_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #ff0000", -"@ c #0000ff", -"# c #ffffff", -/* pixels */ -" ", -" ", -" ########## ", -" #........# ", -" #........# ", -" #........# ", -" #..########### ", -" #..#+++++++++# ", -" ####++#####++# ", -" #+#@@@@@#+# ", -" #+#@@@@@#+# ", -" #+#@@@@@#+# ", -" #++#####++# ", -" #+++++++++# ", -" ########### ", -" "}; +/* XPM */ +static char * PgmCtrl_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 5 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #ff0000", +"@ c #0000ff", +"# c #ffffff", +/* pixels */ +" ", +" ", +" ########## ", +" #........# ", +" #........# ", +" #........# ", +" #..########### ", +" #..#+++++++++# ", +" ####++#####++# ", +" #+#@@@@@#+# ", +" #+#@@@@@#+# ", +" #+#@@@@@#+# ", +" #++#####++# ", +" #+++++++++# ", +" ########### ", +" "}; diff --git a/demos/dbbrowse/bitmaps/tab.xpm b/demos/dbbrowse/bitmaps/tab.xpm index 198540a86d..910e9a415e 100644 --- a/demos/dbbrowse/bitmaps/tab.xpm +++ b/demos/dbbrowse/bitmaps/tab.xpm @@ -1,26 +1,26 @@ -/* XPM */ -static char* TAB[] = { -"16 16 7 1", -" c #000000", -"! c #800080", -"# c #008080", -"$ c #C0C0C0", -"% c #808080", -"& c #0000FF", -"' c #00FFFF", -" ", -" ", -"!!!!!!!!!!!!!!!!", -"!&&&&&&&&&&&&&&!", -"!!!!!!!!!!!!!!!!", -"!'$'#$'$$$#$$$$!", -"!$'$#'$$$$#$$$$!", -"!##############!", -"!$'$#$$$$$#$$%$!", -"!'$$#$$$$$#$%$%!", -"!##############!", -"!$$$#$$%$$#%%%%!", -"!$$%#$%$%%#%%%%!", -"!!!!!!!!!!!!!!!!", -" ", -" "}; +/* XPM */ +static char* TAB_xpm[] = { +"16 16 7 1", +" c #000000", +"! c #800080", +"# c #008080", +"$ c #C0C0C0", +"% c #808080", +"& c #0000FF", +"' c #00FFFF", +" ", +" ", +"!!!!!!!!!!!!!!!!", +"!&&&&&&&&&&&&&&!", +"!!!!!!!!!!!!!!!!", +"!'$'#$'$$$#$$$$!", +"!$'$#'$$$$#$$$$!", +"!##############!", +"!$'$#$$$$$#$$%$!", +"!'$$#$$$$$#$%$%!", +"!##############!", +"!$$$#$$%$$#%%%%!", +"!$$%#$%$%%#%%%%!", +"!!!!!!!!!!!!!!!!", +" ", +" "}; diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp index 87efc3215d..29a9b3a069 100644 --- a/demos/dbbrowse/dbtree.cpp +++ b/demos/dbbrowse/dbtree.cpp @@ -68,7 +68,19 @@ DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const w p_imageListNormal = new wxImageList(16, 16, TRUE); // should correspond to TreeIc_xxx enum - #if defined(__WXMSW__) + +#if !defined(__WXMSW__) +#include "bitmaps/logo.xpm" +#include "bitmaps/dsnclose.xpm" +#include "bitmaps/dsnopen.xpm" +#include "bitmaps/tab.xpm" +#include "bitmaps/key.xpm" +#include "bitmaps/keyf.xpm" +#include "bitmaps/d_open.xpm" +#include "bitmaps/d_closed.xpm" +#include "bitmaps/col.xpm" +#endif + p_imageListNormal->Add(wxICON(Logo)); p_imageListNormal->Add(wxICON(DsnClosed)); p_imageListNormal->Add(wxICON(DsnOpen)); @@ -78,16 +90,10 @@ DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const w p_imageListNormal->Add(wxICON(KEYF)); p_imageListNormal->Add(wxICON(DocOpen)); p_imageListNormal->Add(wxICON(DocOpen)); - #else - #include "bitmaps/logo.xpm" - #include "bitmaps/dsnclose.xpm" - #include "bitmaps/dsnopen.xpm" - #include "bitmaps/tab.xpm" - #include "bitmaps/key.xpm" - #include "bitmaps/keyf.xpm" - #include "bitmaps/d_open.xpm" - #include "bitmaps/d_closed.xpm" -#endif + + + + SetImageList(p_imageListNormal); ct_BrowserDB = NULL; -- 2.45.2