added test for wxScopeGuard

[wxWidgets.git] / samples / wizard / wizard.cpp

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 785c87016bb2effdf4f023aaf10588bfc2f9969c..bba0ef2b18b380eb910fdec7ccd295f2054b4c59 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -39,10 +39,8 @@
 
 #include "wx/wizard.h"
 
-#ifndef __WXMSW__
-    #include "wiztest.xpm"
-    #include "wiztest2.xpm"
-#endif
+#include "wiztest.xpm"
+#include "wiztest2.xpm"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -101,7 +99,7 @@ class wxValidationPage : public wxWizardPageSimple
 public:
     wxValidationPage(wxWizard *parent) : wxWizardPageSimple(parent)
     {
-        m_bitmap = wxBITMAP(wiztest2);
+        m_bitmap = wxBitmap(wiztest2_xpm);
 
         m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Check me"));
 
@@ -249,12 +247,14 @@ public:
             5 // Border width
         );
 
+#if wxUSE_CHECKLISTBOX
         static const wxChar *aszChoices[] =
             { _T("Zeroth"), _T("First"), _T("Second"), _T("Third"), _T("Fourth"), _T("Fifth"), _T("Sixth"), _T("Seventh"), _T("Eighth"), _T("Nineth") };
         wxString *astrChoices = new wxString[WXSIZEOF(aszChoices)];
         unsigned int ui;
         for ( ui = 0; ui < WXSIZEOF(aszChoices); ui++ )
             astrChoices[ui] = aszChoices[ui];
+
         m_checklistbox = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxSize(100,100),
             WXSIZEOF(aszChoices), astrChoices);
 
@@ -264,7 +264,7 @@ public:
             wxALL,
             5 // Border width
         );
-
+#endif // wxUSE_CHECKLISTBOX
 
         SetSizer(mainSizer);
         mainSizer->Fit(this);
@@ -282,7 +282,9 @@ private:
                  *m_next;
 
     wxCheckBox *m_checkbox;
+#if wxUSE_CHECKLISTBOX
     wxCheckListBox *m_checklistbox;
+#endif
 };
 
 // ============================================================================
@@ -373,7 +375,7 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {
     wxWizard *wizard = new wxWizard(this, wxID_ANY,
                     _T("Absolutely Useless Wizard"),
-                    wxBITMAP(wiztest),
+                    wxBitmap(wiztest_xpm),
                     wxDefaultPosition,
                     wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);