Added list ctrl sample. Looks better than what I thought...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/listctrl/.cvsignore b/samples/listctrl/.cvsignore
new file mode 100644 (file)
index 0000000..7957c41
--- /dev/null
+++ b/samples/listctrl/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/listctrl/Makefile b/samples/listctrl/Makefile
new file mode 100644 (file)
index 0000000..1a249aa
--- /dev/null
+++ b/samples/listctrl/Makefile
@@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
new file mode 100644 (file)
index 0000000..dc00e01
--- /dev/null
+++ b/samples/listctrl/Makefile.in
@@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=listtest
+# define library sources
+BIN_SRC=\
+listtest.cpp
+
+#define library objects
+BIN_OBJ=\
+listtest.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak

diff --git a/samples/listctrl/bitmaps/small1.xpm b/samples/listctrl/bitmaps/small1.xpm
new file mode 100644 (file)
index 0000000..98b4bb2
--- /dev/null
+++ b/samples/listctrl/bitmaps/small1.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * small1_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/samples/listctrl/bitmaps/toolbrai.xpm b/samples/listctrl/bitmaps/toolbrai.xpm
new file mode 100644 (file)
index 0000000..3c1a4db
--- /dev/null
+++ b/samples/listctrl/bitmaps/toolbrai.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char * toolbrai_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 4 1",
+/* colors */
+"      s None  c None",
+".     c #000080",
+"+     c #ff0000",
+"@     c #00ffff",
+/* pixels */
+"                                ",
+"                                ",
+"                       .....    ",
+"     .....            .+++++.   ",
+"    .+++++.           .+++++.   ",
+"   .+++++++.          .+++++.   ",
+"    .+++++.            .....    ",
+"     .....            @         ",
+"        @            @          ",
+"         @          @           ",
+"          @        @            ",
+"           @  .....             ",
+"            ..+++++..           ",
+"           .+++++++++.          ",
+"           .+++++++++.          ",
+"           .+++++++++.          ",
+"           @..+++++..           ",
+"          @   .....@            ",
+"         @       @  @           ",
+"        @        @   @  ......  ",
+"       @         @    @.++++++. ",
+"      @          @     .++++++. ",
+"     @           @     .++++++. ",
+"  ......         @     .++++++. ",
+" .++++++.        @      ......  ",
+" .++++++.       ....            ",
+" .++++++.      .++++.           ",
+" .++++++.      .++++.           ",
+"  ......       .++++.           ",
+"               .++++.           ",
+"                ....            ",
+"                                "};

diff --git a/samples/listctrl/bitmaps/toolchar.xpm b/samples/listctrl/bitmaps/toolchar.xpm
new file mode 100644 (file)
index 0000000..7943907
--- /dev/null
+++ b/samples/listctrl/bitmaps/toolchar.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char * toolchar_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #ff0000",
+"@     c #ffff00",
+/* pixels */
+"            ........            ",
+"         ...@@@@@@@@...         ",
+"       ..@@@@@@@@@@@@@@..       ",
+"      ..@@@@@@@@@@@@@@@@..      ",
+"     .@@@@@@@@@@@@@@@@@@@@.     ",
+"    .@@@@@@@@@@@@@@@@@@@@@@.    ",
+"   .@@@@@@@@@@@@@@@@@@@@@@@@.   ",
+"  ..@@@@@@@@@@@@@@@@@@@@@@@@..  ",
+"  .@@@@@@@@..@@@@@@..@@@@@@@@.  ",
+" .@@@@@@@@....@@@@....@@@@@@@@. ",
+" .@@@@@@@@....@@@@....@@@@@@@@. ",
+" .@@@@@@@@....@@@@....@@@@@@@@. ",
+".@@@@@@@@@....@@@@....@@@@@@@@@.",
+".@@@@@@@@@....@@@@....@@@@@@@@@.",
+".@@@@@@@@@@..@@@@@@..@@@@@@@@@@.",
+".@@@@@@@.@@@@@@@@@@@@@@.@@@@@@@.",
+".@@@@@@@.@@@@@@@@@@@@@@.@@@@@@@.",
+".@@@@@@.@@@@@@@@@@@@@@@@.@@@@@@.",
+".@@@....@@@@@@@@@@@@@@@@....@@@.",
+".@@@@@@@.@@@@@@@@@@@@@@.@@@@@@@.",
+" .@@@@@@@.@@@@@@@@@@@@.@@@@@@@. ",
+" .@@@@@@@..@@@@@@@@@@..@@@@@@@. ",
+" .@@@@@@@@...@@@@@@...@@@@@@@@. ",
+"  .@@@@@@@@.+......+.@@@@@@@@.  ",
+"  ..@@@@@@@@.++++++.@@@@@@@@..  ",
+"   .@@@@@@@@@.++++.@@@@@@@@@.   ",
+"    .@@@@@@@@@....@@@@@@@@@.    ",
+"     .@@@@@@@@@@@@@@@@@@@@.     ",
+"      ..@@@@@@@@@@@@@@@@..      ",
+"       ..@@@@@@@@@@@@@@..       ",
+"         ...@@@@@@@@...         ",
+"            ........            "};

diff --git a/samples/listctrl/bitmaps/toolchec.xpm b/samples/listctrl/bitmaps/toolchec.xpm
new file mode 100644 (file)
index 0000000..9f4a45d
--- /dev/null
+++ b/samples/listctrl/bitmaps/toolchec.xpm
@@ -0,0 +1,40 @@
+/* XPM */
+static char * toolchec_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 2 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                             .  ",
+"                            .   ",
+"                           .    ",
+"                          .     ",
+"                         .      ",
+"                        .       ",
+"                       ..       ",
+"                      ..        ",
+"                     ..         ",
+"                    ...         ",
+"                    ..          ",
+"                   ...          ",
+"                  ...           ",
+"                 ...            ",
+"                 ...            ",
+"     ...        ...             ",
+"     ....      ....             ",
+"      ....     ...              ",
+"       ....   ....              ",
+"        ....  ...               ",
+"         ........               ",
+"          ......                ",
+"           .....                ",
+"            ....                ",
+"             ..                 ",
+"              .                 ",
+"                                ",
+"                                ",
+"                                "};

diff --git a/samples/listctrl/bitmaps/tooldata.xpm b/samples/listctrl/bitmaps/tooldata.xpm
new file mode 100644 (file)
index 0000000..f24d504
--- /dev/null
+++ b/samples/listctrl/bitmaps/tooldata.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char * tooldata_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 7 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ff0000",
+"$     c #ff00ff",
+"%     c #ffffff",
+/* pixels */
+"   ..                           ",
+" .............                  ",
+" %%..%%%%%%%%%.                 ",
+" %%..%%%%%%%%%%.                ",
+" %%..%%%%%%%..%%.               ",
+" ......%%%%%. .%.               ",
+"   ..  .%%%%. .%.               ",
+"        ...%%..%.               ",
+"       .....%%........          ",
+"      .%%%%%...%%%%%%%.         ",
+"      .%%%%%%%%%%%%%%%.         ",
+"      .%+++++++++%%%%%....      ",
+"      .%%%%%%%%%%%%%%%.%%%.     ",
+"      .%+++++%%%%%%%%%..%%.     ",
+"      .%%%%%%%%%%%%%%%.%.%.     ",
+"      .%+++++++%+%%%%%.%.%.     ",
+"      .%%%%%%%%%%%%%%%.%.%.     ",
+"     ...............%%.%.%..... ",
+"    .%%%%%%%%%%%%%%%.%.%.%.#$#. ",
+"    .%%%%%%%+%%%%%%%...%.%.$#.  ",
+"    .%%@+@+@+@+%%%%%.%%%.%....  ",
+"    .%%%%%+%%%%%%%%%.%%%.%.+..  ",
+"    .%%@+@+@+%%%%%%%.%%%....#.  ",
+"    .%%%+%+%%%%%%%+%.%%%.+.#.   ",
+"    .%%@+@+@+@+%%+%%......#.    ",
+"    .%+%+%%%%%%%+%+%.$$+.#.     ",
+"    .+%+@.%%%@.+%+%%.$+.#.      ",
+"    .%%%.+%%%.+%%%%%.+.#.       ",
+" .....................#.        ",
+" .################.+.#.         ",
+"  .#$#$#$#$#$#$#$#$.#.          ",
+"  ...................           "};

diff --git a/samples/listctrl/bitmaps/toolgame.xpm b/samples/listctrl/bitmaps/toolgame.xpm
new file mode 100644 (file)
index 0000000..d0cc8ae
--- /dev/null
+++ b/samples/listctrl/bitmaps/toolgame.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * toolgame_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 3 1",
+/* colors */
+"      s None  c None",
+".     c #808080",
+"+     c #ff0000",
+/* pixels */
+"                                ",
+"      +++++         +++++       ",
+"    +++++++++     +++++++++     ",
+"   +++++++++++   +++++++++++    ",
+"  +++++++++++++ +++++++++++++   ",
+"  +++++++++++++.+++++++++++++.  ",
+" +++++++++++++++++++++++++++++  ",
+" +++++++++++++++++++++++++++++. ",
+" +++++++++++++++++++++++++++++. ",
+" +++++++++++++++++++++++++++++. ",
+" +++++++++++++++++++++++++++++. ",
+"  +++++++++++++++++++++++++++.. ",
+"  +++++++++++++++++++++++++++.  ",
+"   +++++++++++++++++++++++++..  ",
+"    +++++++++++++++++++++++..   ",
+"     +++++++++++++++++++++..    ",
+"      +++++++++++++++++++..     ",
+"       +++++++++++++++++..      ",
+"       +++++++++++++++++.       ",
+"        +++++++++++++++..       ",
+"         +++++++++++++..        ",
+"         +++++++++++++.         ",
+"          +++++++++++..         ",
+"           +++++++++..          ",
+"            +++++++..           ",
+"            +++++++.            ",
+"             +++++..            ",
+"              +++..             ",
+"               +..              ",
+"               +.               ",
+"                .               ",
+"                                "};

diff --git a/samples/listctrl/bitmaps/toolnote.xpm b/samples/listctrl/bitmaps/toolnote.xpm
new file mode 100644 (file)
index 0000000..16835ec
--- /dev/null
+++ b/samples/listctrl/bitmaps/toolnote.xpm
@@ -0,0 +1,46 @@
+/* XPM */
+static char * toolnote_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 8 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #800000",
+"@     c #c0c0c0",
+"#     c #808080",
+"$     c #ffff00",
+"%     c #0000ff",
+"&     c #ffffff",
+/* pixels */
+"                                ",
+"    ..                          ",
+"    .$.                         ",
+"     .$.                        ",
+"      .$.                       ",
+"       .$.                      ",
+"        .$.                     ",
+"         .$....                 ",
+"        ...$.&&.     #..        ",
+"       .&&&.$.&&.  ...&&#       ",
+"     ..&&&&&.$.@&..$&..&.       ",
+" ....&&&&&&&@.$.@&.&&.&..  #..  ",
+".%%.&&&&&&&&@..$.@.&#.##&...&&# ",
+".%+.&&&&&&&&@. .$..&&&&&&&&..&. ",
+".%%.&&&&&&&&&......##&&&&&&.&.. ",
+".%%.@&&&&&&&&&&@@@..&##&&&#.##&.",
+".%%..@@..&&&&&&....+.&&##&&&&&..",
+".%.%...  ......&&&#..&&&&##&&.&.",
+" .%.%..   .$&@&&&&&$#.&&&&&$.&.%",
+"  ....   .&&&&@@&&&&&&##&&&.&.% ",
+"        .&&&&&&$@@&&&&&$&&.&.%  ",
+"       .&&&@@&&&&&@@&&&&&.&.%   ",
+"      .&&&&$&@@&&&&$@@&&.&.%    ",
+"      ...&&&&&&@@&&&&&&.&.%     ",
+"      .&&..&&&&$&@@&&&.&.%      ",
+"      %..&&..&&&&&&&&.&.%       ",
+"        %..&&..&&&&$.&.%        ",
+"          %..&&..&&.&.%         ",
+"            %..&&..&.%          ",
+"              %..&&.%           ",
+"                %..%            ",
+"                                "};

diff --git a/samples/listctrl/bitmaps/tooltime.xpm b/samples/listctrl/bitmaps/tooltime.xpm
new file mode 100644 (file)
index 0000000..629f273
--- /dev/null
+++ b/samples/listctrl/bitmaps/tooltime.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char * tooltime_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"                                ",
+"            .......             ",
+"           .#+++++@.            ",
+"           .........            ",
+"           .#+++++@.            ",
+"           .........            ",
+"          .#++++++++.           ",
+"          ...........           ",
+"         ...+++++++...          ",
+"         .+++#####+++.          ",
+"        .++####.####++.         ",
+"       .++#####.+####++.        ",
+"       .+######.+#####+.        ",
+"      .++######.+######@.       ",
+"      .+#######.+######@..      ",
+"      .+###....@+######@.+      ",
+"      .+####++++@######@..      ",
+"      .++########@####@@.       ",
+"       .+#########@###@.        ",
+"       .++###########@@.        ",
+"        .++#########@@.         ",
+"         .++######@@@.          ",
+"         ...@@@@@@@...          ",
+"          ...........           ",
+"          .#++++++++.           ",
+"           .........            ",
+"           .+@@@@@@.            ",
+"           .........            ",
+"           .@@@@@@@.            ",
+"            .......             ",
+"                                ",
+"                                "};

diff --git a/samples/listctrl/bitmaps/tooltodo.xpm b/samples/listctrl/bitmaps/tooltodo.xpm
new file mode 100644 (file)
index 0000000..0bc6cc4
--- /dev/null
+++ b/samples/listctrl/bitmaps/tooltodo.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * tooltodo_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 6 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffff00",
+"$     c #ffffff",
+/* pixels */
+"       @@@@                     ",
+"      @+...@                    ",
+"     @+.    @                   ",
+"     @.     @.                  ",
+"     @.     @.                  ",
+".....@......................... ",
+".#$#$@.#$#$#$#$#$#$#$#$#$#$#$#.@",
+".$#$#@.$#$#$#$@$#$#$#$#$#$#$#$.@",
+".#$#$@.#$#$#$#@.$#$#$#$#$#$#$#.@",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#$#$.@",
+".#$#$@.#$#$#$#@.$#$#$#$#$#$#$#.@",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#$#$.@",
+".#$#$@.#$#$#$#@.$#$#$#$#$#$#$#.@",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#$#$.@",
+".#$#$@.#@@@@@@@.@@@@@@@@@@@@@@.@",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#$#$.@",
+".#$#$@.#$#$#$#@.$#$#$#$#$#$#$#.@",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#$#..@",
+".#$#$@.#$#$#$#@.$#$#$#$#$#$#$.@@",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#$#.@ ",
+".#$#$@.#$#$#$#@.$#$#$#$#$#$#..@ ",
+".$#$#@.$#$#$#$@.#$#$#$#$#$#..@@ ",
+".#$#$@.#@@@@@@@.@@@@@@......@@  ",
+".$#$#@.$#$#$#$@.#$#$#..@@@@@@   ",
+".#$#$#@#$#$#$@+.$#$#$.@@        ",
+".$#$#$#@#$#$@+.$#$#$..@         ",
+".#$#$#$#@@@@+.$#$#$..@@         ",
+".$#$#$#$#....$#$#$..@@          ",
+".#$#$#$#$#$#$#$...@@@           ",
+".$#$#$#...#$#$..@@@             ",
+".......@@@....@@@               ",
+" @@@@@@@   @@@@                 "};

diff --git a/samples/listctrl/bitmaps/toolword.xpm b/samples/listctrl/bitmaps/toolword.xpm
new file mode 100644 (file)
index 0000000..7c615cd
--- /dev/null
+++ b/samples/listctrl/bitmaps/toolword.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * toolword_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 3 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #ffffff",
+/* pixels */
+"                                ",
+"                                ",
+" ........           ........    ",
+" .++++++. ...........++++++.    ",
+" .++++++. .++++++++..++++++.    ",
+" ........ .++++++++.........    ",
+"          .++++++++.            ",
+"          ..........            ",
+"                                ",
+"                                ",
+"                                ",
+"                 .....          ",
+"...... ......... .+++. .........",
+".++++. .+++++++. .+++. .+++++++.",
+".++++. .+++++++. .+++. .+++++++.",
+".++++. .+++++++. ..... .+++++++.",
+"...... .........       .........",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                   ..........   ",
+"              ..   .++++++++.   ",
+"             .++.  .++++++++.   ",
+"            .++++. .++++++++.   ",
+"           .++++.  ..........   ",
+" ...........+++.                ",
+" .++++++++. .+.                 ",
+" .++++++++.  .                  ",
+" ..........                     ",
+"                                ",
+"                                "};

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index d51ecae8275127e7f52c80c36523a8960afa20b8..410efa75716eb1013cfeeca9d86332e4fe9b9535 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -68,46 +68,53 @@ bool MyApp::OnInit(void)
   // Give it an icon
 #ifdef __WXMSW__
   frame->SetIcon(wxIcon("mondrian"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
+#else
+#include "mondrian.xpm"
+  frame->SetIcon(wxIcon(mondrian_xpm));
 #endif
 
   // Make an image list containing large icons
   m_imageListNormal = new wxImageList(32, 32, TRUE);
   m_imageListSmall = new wxImageList(16, 16, TRUE);
 
-  wxIcon *icon = new wxIcon("icon1", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon2", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon3", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon4", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon5", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon6", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon7", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon8", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon9", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-
-  icon = new wxIcon("iconsmall", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListSmall->Add(*icon);
-  delete icon;
+#ifdef __WXMSW__
+  m_imageListNormal->Add( wxIcon("icon1", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon2", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon3", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon4", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon5", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon6", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon7", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon8", wxBITMAP_TYPE_ICO_RESOURCE) );
+  m_imageListNormal->Add( wxIcon("icon9", wxBITMAP_TYPE_ICO_RESOURCE) );
+  
+  m_imageListSmall->Add( wxIcon("iconsmall", wxBITMAP_TYPE_ICO_RESOURCE) );
+  
+#else
+
+  #include "bitmaps/toolbrai.xpm"
+  m_imageListNormal->Add( wxIcon( toolbrai_xpm ) );
+  #include "bitmaps/toolchar.xpm"
+  m_imageListNormal->Add( wxIcon( toolchar_xpm ) );
+  #include "bitmaps/tooldata.xpm"
+  m_imageListNormal->Add( wxIcon( tooldata_xpm ) );
+  #include "bitmaps/toolnote.xpm"
+  m_imageListNormal->Add( wxIcon( toolnote_xpm ) );
+  #include "bitmaps/tooltodo.xpm"
+  m_imageListNormal->Add( wxIcon( tooltodo_xpm ) );
+  #include "bitmaps/toolchec.xpm"
+  m_imageListNormal->Add( wxIcon( toolchec_xpm ) );
+  #include "bitmaps/toolgame.xpm"
+  m_imageListNormal->Add( wxIcon( toolgame_xpm ) );
+  #include "bitmaps/tooltime.xpm"
+  m_imageListNormal->Add( wxIcon( tooltime_xpm ) );
+  #include "bitmaps/toolword.xpm"
+  m_imageListNormal->Add( wxIcon( toolword_xpm ) );
+  
+  #include "bitmaps/small1.xpm"
+  m_imageListSmall->Add( wxIcon( small1_xpm) );
+  
+#endif
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -178,12 +185,12 @@ MyFrame::~MyFrame(void)
        delete wxGetApp().m_imageListSmall;
 }
 
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
   Close(TRUE);
 }
 
-void MyFrame::OnAbout(wxCommandEvent& event)
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
   wxMessageDialog dialog(this, "List test sample\nJulian Smart (c) 1997",
        "About list test", wxOK|wxCANCEL);
@@ -191,7 +198,7 @@ void MyFrame::OnAbout(wxCommandEvent& event)
   dialog.ShowModal();
 }
 
-void MyFrame::OnListView(wxCommandEvent& event)
+void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 {
        m_logWindow->Clear();
        m_listCtrl->DeleteAllItems();
@@ -207,7 +214,7 @@ void MyFrame::OnListView(wxCommandEvent& event)
        }
 }
 
-void MyFrame::OnReportView(wxCommandEvent& event)
+void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
 {
        m_logWindow->Clear();
        m_listCtrl->DeleteAllItems();
@@ -229,7 +236,7 @@ void MyFrame::OnReportView(wxCommandEvent& event)
        }
 }
 
-void MyFrame::OnIconView(wxCommandEvent& event)
+void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
 {
        m_logWindow->Clear();
        m_listCtrl->DeleteAllItems();
@@ -243,7 +250,7 @@ void MyFrame::OnIconView(wxCommandEvent& event)
        }
 }
 
-void MyFrame::OnIconTextView(wxCommandEvent& event)
+void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
 {
        m_logWindow->Clear();
        m_listCtrl->DeleteAllItems();
@@ -259,7 +266,7 @@ void MyFrame::OnIconTextView(wxCommandEvent& event)
        }
 }
 
-void MyFrame::OnSmallIconView(wxCommandEvent& event)
+void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event))
 {
        m_logWindow->Clear();
        m_listCtrl->DeleteAllItems();
@@ -273,7 +280,7 @@ void MyFrame::OnSmallIconView(wxCommandEvent& event)
        }
 }
 
-void MyFrame::OnSmallIconTextView(wxCommandEvent& event)
+void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event))
 {
        m_logWindow->Clear();
        m_listCtrl->DeleteAllItems();

diff --git a/samples/listctrl/mondrian.xpm b/samples/listctrl/mondrian.xpm
new file mode 100644 (file)
index 0000000..409f27a
--- /dev/null
+++ b/samples/listctrl/mondrian.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char *mondrian_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+"  c Black",
+". c Blue",
+"X c #00bf00",
+"o c Red",
+"O c Yellow",
+"+ c Gray100",
+/* pixels */
+"                                ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+"                                ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++      ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++                    ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+"                                "
+};