Create a wrapper file for X11/XKBlib.h header.

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 1d9427753d9c76fcae640c9285ae02e44ff84b1c..fcbcdb6b8ff8af36de9624b4f3f88f99cae5e271 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -389,7 +389,7 @@ MyWizard::MyWizard(wxFrame *frame, bool useSizer)
     Create(frame,wxID_ANY,wxT("Absolutely Useless Wizard"),
                    wxBitmap(wiztest_xpm),wxDefaultPosition,
                    wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
     Create(frame,wxID_ANY,wxT("Absolutely Useless Wizard"),
                    wxBitmap(wiztest_xpm),wxDefaultPosition,
                    wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

 
     // Allow the bitmap to be expanded to fit the page height
     if (frame->GetMenuBar()->IsChecked(Wizard_ExpandBitmap))
 
     // Allow the bitmap to be expanded to fit the page height
     if (frame->GetMenuBar()->IsChecked(Wizard_ExpandBitmap))


@@ -450,7 +450,7 @@ MyFrame::MyFrame(const wxString& title)
     menuOptions->AppendCheckItem(Wizard_ExpandBitmap, wxT("Si&ze Bitmap To Page"));
 
     wxMenu *helpMenu = new wxMenu;
     menuOptions->AppendCheckItem(Wizard_ExpandBitmap, wxT("Si&ze Bitmap To Page"));
 
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(Wizard_About, wxT("&About...\tF1"), wxT("Show about dialog"));
+    helpMenu->Append(Wizard_About, wxT("&About\tF1"), wxT("Show about dialog"));

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();