From d32011d4064f1411280b5708562cce86bd6d12ec Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 20 Nov 2001 15:09:45 +0000 Subject: [PATCH] added 2nd image as XPM as well to the wizard sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/wizard/wizard.cpp | 17 +-- samples/wizard/wiztest.xpm | 2 +- samples/wizard/wiztest2.xpm | 282 ++++++++++++++++++++++++++++++++++++ 3 files changed, 286 insertions(+), 15 deletions(-) create mode 100644 samples/wizard/wiztest2.xpm diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp index 6e54020f40..f4586a11d8 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -39,6 +39,7 @@ #ifndef __WXMSW__ #include "wiztest.xpm" + #include "wiztest2.xpm" #endif // ---------------------------------------------------------------------------- @@ -53,18 +54,6 @@ enum Wizard_About = 1000 }; -// ---------------------------------------------------------------------------- -// ressources -// ---------------------------------------------------------------------------- - -#ifdef __WXMSW__ - #define BMP_WIZARD_1 wxBitmap("wiztest.bmp", wxBITMAP_TYPE_BMP) - #define BMP_WIZARD_2 wxBitmap("wiztest2.bmp", wxBITMAP_TYPE_BMP) -#else - #define BMP_WIZARD_1 wxBitmap(wizimage) - #define BMP_WIZARD_2 wxBitmap(wizimage) -#endif - // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -109,7 +98,7 @@ class wxValidationPage : public wxWizardPageSimple public: wxValidationPage(wxWizard *parent) : wxWizardPageSimple(parent) { - m_bitmap = BMP_WIZARD_2; + m_bitmap = wxBITMAP(wiztest2); m_checkbox = new wxCheckBox(this, -1, "&Check me"); } @@ -315,7 +304,7 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event)) { wxWizard *wizard = new wxWizard(this, -1, "Absolutely Useless Wizard", - BMP_WIZARD_1); + wxBITMAP(wiztest)); // a wizard page may be either an object of predefined class wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard); diff --git a/samples/wizard/wiztest.xpm b/samples/wizard/wiztest.xpm index 5bcea61606..a9406a3120 100644 --- a/samples/wizard/wiztest.xpm +++ b/samples/wizard/wiztest.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *wizimage[] = { +static char *wiztest_xpm[] = { /* columns rows colors chars-per-pixel */ "165 371 256 2", " c Gray0", diff --git a/samples/wizard/wiztest2.xpm b/samples/wizard/wiztest2.xpm new file mode 100644 index 0000000000..89e04aabdc --- /dev/null +++ b/samples/wizard/wiztest2.xpm @@ -0,0 +1,282 @@ +/* XPM */ +static char *wiztest2_xpm[] = { +/* columns rows colors chars-per-pixel */ +"116 260 16 1", +" c Gray100", +". c Blue", +"X c #000084848484", +"o c #848484848484", +"O c #c6c6c6c6c6c6", +"+ c Gray100", +"@ c Gray100", +"# c Gray100", +"$ c Gray100", +"% c Gray100", +"& c Gray100", +"* c Gray100", +"= c Gray100", +"- c Gray100", +"; c Gray100", +": c Gray100", +/* pixels */ +"O X..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O .XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O .XX..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O ..X..XX..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O .XX.XX..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O...................................................................................................................", +"O .XX.XX..X..XX..X..XX.. .XX..X..XX.XX..XX.XX..XX.XX.. ", +"O...................................................................................................................", +"O ..XX..X..XX.XX..XX .XX..XX.XX. .XX..X. X..X..XX.", +"O...................................................................................................................", +"O XX.XX..XX.XX..X..X ..X..XX..X. X..XX.X X.XX..X", +"O...................................................................................................................", +"O ..XX.XX..XX.XX..X..XX. X..X..XX.. X..XX.X .XX..X", +"O...................................................................................................................", +"O X..XX..X..XX..X..XX.XX..XX.XX..XX.XX.. .XX..X. .XX.", +"O...................................................................................................................", +"O .XX.XX..XX.XX. ..X..XX..X..XX..X..X X..XX.X .X", +"O...................................................................................................................", +"O .XX..X..XX.. X..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O .X..XX.XX..X XX..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O ..X..XoXOo. ..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O .XX.XX.XOXXX .XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O ..XX.XX.XOXX .XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O .XX..X..XOXOO XX..X..XX .X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O ..XX..X..XOXOO .XX..X..X ..X..XX.XX..XX.XX..XX.X ", +"O XX..XX.XX.XOXX X..XX.XX. ..X..XX..X..X ", +"O.................................................OXOO..............................................................", +"O .X..XX..X. OXOO ..XX..X.. X..XX.X ", +"O.................................................XOXX..............................................................", +"O o .XX.XX..XX XOXX XOXX..XX.X .XX..X. ", +"O................................OOX..............OXOO...............OXO............................................", +"O XOOXX..X..XX OXOO XOOXO.XX.. X..XX.X ", +"O................................XXOOX............XOXX.............OXXOX............................................", +"O OXXO.X..X OXOO XXOOX..XX. X..XX.X ", +"O..................................XXOOX..........OXOO..........XOXXO...............................................", +"O XX.OXXOXX XOXX OXOOXX.XX..X .XX..X. ", +"O....................................XXOXX........XOXX........XOOXO.................................................", +"O .X..XX.OXOOX OXOO OXXOXX..X..X X..XX.X ", +"O......................................XOOXX......OXOO......XOOXX...................................................", +"O XX.XX..XX XXOOX XOXX OXXO X..XX.XX. .XX..X. ", +"O ..X..XX.. OXXO OXOO XXOOX .XX..X..X X..XX.X ", +"O X..X..XX. XXOOX OXOO XOXXO X.XX..X.. X..XX.X ", +"O .XX.XX..X OXXOX oOXo OXOOX .X..XX.XX .XX..X. ", +"O ..XX.XX.. XXo oXO .X..XX.X .XX..X. ", +"O XX..X..X o oX X.XX..X. X..XX.X ", +"O .XX..X..X XX.XX..X. X..XX.X ", +"O X..XX.XX. ..X..XX. .XX..X. ", +"O...................................................................................................................", +"O XXOXXOOXXOXXOOXXOXXOOX oXOoo OOXXOOXOOXXOXXOOXXOXXO X..XX.X ", +"O......................OOXOOXXOOXOOXXOOXOOXXO.....XOXXO....XXOOXXOXXOOXOOXXOOXOOX...................................", +"O oOXOOXXOOXOOXXOOXOOXXO XOXXOOX oXOOXXOXXOOXOOXXOOXOOX .XX..X. ", +"O.................................................OXOOXXO...........................................................", +"O X..XX..X OXOOXXOOX .XX.XX. X..XX.X ", +"O.................................................XOX.OOXXOX........................................................", +"O .X..XX..X o OXO XOOXO ..XX.XX. X..XX.X ", +"O..........................................XOOXo..OXO...OOXOOX......................................................", +"O X.XX..XX OXXOX XOX XOXXOX..X..X .XX..X. ", +"O........................................XOOXX....XOX.....OXXOOX....................................................", +"O .X..XX. OXXO OXO OOXXOX.XX X..XX.X ", +"O......................................XOOXX......OXO.......OXXOOX..................................................", +"O XX.XX..X XOXXO XOX .OOXXOX .XX..X. ", +"O ..X..XX. OXOOX OXO X.XOOXO X..XX.X ", +"O X..X..XX XOOXO OXO X..OOXOOX X..XX.X ", +"O .XX.XX.. OXXOX XOX .XX.XOXXO .XX..X. ", +"O .XX.XX.. XOOXX XOX .XX..OXXOOX .XX..X. ", +"O X..X..XX OXXO OXO X..XX.OOXXOX X..XX.X ", +"O X..X..X XOOXX OXO X..XX.XOXXOXX X..XX.X ", +"O .XX.XX. oXXO XOX ..XX..X. OOXOOX .XX..X. ", +"O................................oOX..............OXO................XOXXO..........................................", +"O X..X..X OXO XX..XX.X OXXOOX X..XX.X ", +"O.................................................XOX..................OOXXO........................................", +"O .XX.XX. XOX ..XX..X OXXOOX .XX..X. ", +"O.................................................OXO....................OOXXOX.....................................", +"O X..X..XX..X..XX..X..XX..X..XOXOX..XX.XX..XX.XX..X..XOXXOXXXX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O.................................................XOX......................OOXOOX...................................", +"O X..X..XX..X..XX..X..XX..X..XOXOX..XX.XX..XX.XX..X..XX.XOXXOX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O.................................................OXO........................OXXOOX.................................", +"O .XX.XX..XX.XX..XX.XX..XX.XX.XOX.XX..X..XX..X..XX.XX..XX.OOXXOX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O.................................................XOX..........................OXXOOX...............................", +"O X..X..XX..X..XX..X..XX..X..XOXOX..XX.XX..XX.XX..X..XX..X..OOXXOX.XX..X..XX.XX..XX.XX..XX.XX..X", +"O.................................................OXO............................OXXOXX.............................", +"O .XX.XX. XOX ..XX..X. OOXOOX .XX..X. ", +"O X..X..X OXO XX..XX.X XOXXO X..XX.X ", +"O X..X..X OXO XX..XX.X OXXOOX X..XX.X ", +"O .XX.XX. XOX .XX..X. OOXXO .XX..X. ", +"O .XX.XX.. XOX .XX..X. OXXOOX .XX..X. ", +"O X..X..XX OXO X..XX.X OOXXOX X..XX.X ", +"O.................................................XOX...................................XOOXO.......................", +"O XX.XX..X XOX .XX..X. oXXOOXOOXXOOXOOXXOOXOo .XX..X. ", +"O.................................................OXO...................XOOXXOXXOOXXOXXOOXXOXX......................", +"O ..X..XX. OXO X..XX.X XOOXXOXXOOXXOXXOOXXoX X..XX.X ", +"O.................................................XOX..........XX........XXO........................................", +"O X.XX..X XOX .XOXXOX. XXOo .XX..X. ", +"O.................................................OXO........XXOOXO.......OXX.......................................", +"O X.XX..XX XOX XOOXXOX. XOOX .XX..X. ", +"O.................................................XOX......XXOOXXOXX......XOOX......................................", +"O .X..XX..X OXO XOOXXOOXOO. OXXOX X..XX.X ", +"O.................................................OXO....OXOOX..OXOOX......XXOX.....................................", +"O .XX..XX.X XOX XXOXXOX..OXXO OXO .XX..X. ", +"O.................................................XOX..OXXOX......XXO.......OXOO....................................", +"O ..XX..X. OXO XXOOXO .XX.OOXX XOXXo X..XX.X ", +"O XX..XX.X XOXXOOXXO X..X.XOO XOOX .XX..X. ", +"O X..XX.XX XOXXOOX X..X.XOOX OOX .XX..X. ", +"O .XX..X.. OXOOXXO .XX.XOXXOX XXOo X..XX.X ", +"O .XX..X..X OXOOX XX.XXXXOX XOOX X..XX.X ", +"O ..XX.XX. XOXXO ..X..XOXO OXXO .XX..X. ", +"O ..XX.XX.. XOX .X..XOXOO XXO .XX..X. ", +"O X..X..XX oXo X.XX.XOXXo OOXX X..XX.X ", +"O.....................................................................XOOX.......XOO................................", +"O .XX.XX..X .X..XX.OOX XOOX .XX..X. ", +"O......................................................................XXOo......OXXOX..............................", +"O .X..XX..X .XX..X.XOOX XXOX X..XX.X ", +"O.......................................................................OXXO.......OXO..............................", +"O .XX..XX.X ..XX.XXXXO OXOO .XX..X. ", +"O........................................................................OOXX......XOXXo............................", +"O XX..XX.XX .XX.XX.XOO XOOX .XX..X. ", +"O.........................................................................XOOX.......OOX............................", +"O .XX..X..X X..X..XOXXOX XXOo X..XX.X ", +"O..........................................................................XXOX.......XOOX..........................", +"O .XX.XX..X X.XX..XOXO OXXO .XX..X. ", +"O...........................................................................OXOOX..oXOOXXO..........................", +"O ..X..XX..X .X..XX.XOXXO XXOXXOOX X..XX.X ", +"O XX.XX..XX. .XX..XXXOOXXOOXOOXX .XX..X. ", +"O X.XX..XX.X XX..XX.OOXXOOXO .XX..X. ", +"O X..XX..X.. ..XX..X.XOOXXo X..XX.X ", +"O ..XX..X..X .XX..X..o X..XX.X ", +"O X..XX.XX.. X..XX.XX. .XX..X. ", +"O ..XX.XX..X. ..XX.XX.. .XX.XX..X..XX..X..XX..X. ", +"O X..X..XX.XX X..X..XX. .XX..X..XX.XX..XX.XX..XX.XX. ", +"O...................................................................................................................", +"O XXXXXXXXXXXXXXXXXXXXXXXXXX X.XX..X..XX XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O...................................................................................................................", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ..XX.XX..XX.X X..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O...................................................................................................................", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ..X..XX..X..X X.XX..XX.XX..XX.XX..XX. .XX..X. ..X..XX.", +"O...................................................................................................................", +"OX XXXXXXX XXXX XXXXXXX XXXXXXXXXXXXX X..XX..X..XX.. .XX.XX..XX.XX..XX.XX. .XX..X. XX.", +"O...................................................................................................................", +"O XXXXXXX XXXX XXXXXXX XXXXXXXXXXX ..XX.XX..XX.XX..X..XX..X..XX..X..XX. X..XX.X XX..X", +"O...................................................................................................................", +"OXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX .X..XX..X..XX.XX..X XX.XX..XX.X .XX..X. .X..XX.", +"O...................................................................................................................", +"OXXXXXXXX XXXX XXXXXXXXXXXXX XXXXXXXX X..XX.XX..X..XX..X X..XX..X..X X..XX.X .XX.XX..X", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX X..X..XX.XX..XX.XX. XX..XX.XX. .XX..X. XX..X..XX.", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX .X..XX.XX..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXX .XX..X..XX..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"OXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXX XXXXXXX ..X..XX..X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"OXX XXXXXXXXXXXXXXXX XXXXXX XXXXXXX .XX..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"OXX XXXX XXXXXX XXXXXXX .XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"OXX XXXX XXXXXX XXXXXXX .X..XX..X..XX..X..XX.XX..XX.XX..XX.XX..X", +"O...................................................................................................................", +"O XXXX XXXXXX XXXXX X.XX..XX.XX..X..XX..X..XX..X..XX.", +"O...................................................................................................................", +"O XXXX XXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXXX XXXXX ", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXXX XXXXXX ", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXXX XXXXXX ", +"O XXXX XXXXX XXXXXX ", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ", +"O...................................................................................................................", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXX XXXXXX ", +"O XXXX XXXX XXXXX ", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXXX ", +"O...................................................................................................................", +"O XXXX XXXXX XXXXX ", +"O XXXX XXXXXX XXXXXX ", +"O XXXX XXXXX XXXXXXX ", +"O XXXX XXXXX XXXXXX ", +"O XXXX XXXXX XXXXXX ", +"O XXXX XXXXX XXXXXX ", +"O XXXX XXXXXX XXXXXX X.XX..X..XX..X ", +"O XXXX XXXXXX XXXXXX .XX..X..XX.XX..XX.XX. ", +"O...................................................................................................................", +"OX XXXX XXXXXX XXXXXXX ..XX.XX..XX.XX..X..XX..X..XX..X..X ", +"O...................................................................................................................", +"OXX XXXX XXXXXX XXXXXXX .X..XX..X. ..X.. X.XX .XX.X XX.XX..X", +"O...................................................................................................................", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX X..XX.XX.. ..XX. .X.. .X..X .XX.", +"O...................................................................................................................", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX .XX..XX.XX..X X..XX .X.. X..X ..XX.", +"O...................................................................................................................", +"OXXXXXXXXX XXXX XXXXXXXXXXXXXX XXXXXXXXX ..X..XX X..X..XX. X.XX .XX..XX.XX. ", +"O...................................................................................................................", +"OXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXX ..XX.X X.XX..XX.XX..X..XX..X..XX..X. ", +"O...................................................................................................................", +"O XXXXXX XXXX XXXXXXX XXXXXXXXXXX X.XX. X..X. ..XX.XX..X XX.X ", +"OX XXXXXXX XXXX XXXXXXX XXXXXXXXXXX ..X..X .XX.X .X.. ..X.. ", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X..X.. .XX. .X.. .X..X ", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .XX.X XX..X X.XX X.XX. ", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ..XX. .XX.. X.XX .XX.. ", +"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .XX.. X..X .X.. ..XX ", +"O XXXXXXXXXXXXXXXXXXXXXXXXXX .XX. X..X .X.. .XX.", +"O XXXXXXXXXXXXXXXXXXXXXX XX..X .XX. X.XX X..X", +"O...................................................................................................................", +"O X..X .XX.. .X.. .XX.", +"O...................................................................................................................", +"O X.XX. .X..X X.XX ..X", +"O...................................................................................................................", +"O ..X.. X.XX. .X.. X.", +"O...................................................................................................................", +"O ..X. X.XX .X.. X.", +"O...................................................................................................................", +"O .XX.X .X. X.XX .X", +"O...................................................................................................................", +"O X..X XX.X .X.. .", +"O...................................................................................................................", +"O .XX. ..X. X.XX X", +"O X..X XX.X .X.. ", +"O XX.. .XX.X .X.. ", +"O ..XX X..X. X.XX ", +"O ..XX X..X X.XX ", +"O XX..X..XX..X..XX.XX..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O XX..X..XX..X..XX.XX..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O XX..X..XX..X..XX.XX..XX.XX..XX.XX..XX.XX..X..XX..X..XX..X..XX.", +"O...................................................................................................................", +"O ..XX X..X X.XX ", +"O...................................................................................................................", +"O XX.. .XX.X .X.. ", +"O...................................................................................................................", +"Oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" +}; -- 2.45.2