added test for wxScopeGuard

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index b6e483ad163c027f8dc69ab9aac9bb2673bfc812..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"));
 
@@ -377,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);