X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cb332c1553bb977cb8db16c19c733684ef72805..4e15d1caa03346c126015019c1fdf093033ef40b:/samples/artprov/arttest.cpp diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index 1c40be4ea3..29fda747de 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -6,7 +6,7 @@ // Created: 2002/03/25 // RCS-ID: $Id$ // Copyright: (c) Vaclav Slavik -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -20,7 +20,7 @@ #include "wx/wx.h" #endif -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -63,8 +63,8 @@ private: // IDs for the controls and the menu commands enum { - ID_Quit = wxID_HIGHEST, - ID_Logs, + ID_Quit = wxID_EXIT, + ID_Logs = wxID_HIGHEST+1, ID_Browser, ID_PlugProvider }; @@ -157,7 +157,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, // the "About" item should be in the help menu wxMenu *helpMenu = new wxMenu; - helpMenu->Append(wxID_ABOUT, wxT("&About...\tF1"), wxT("Show about dialog")); + helpMenu->Append(wxID_ABOUT, wxT("&About\tF1"), wxT("Show about dialog")); menuFile->AppendCheckItem(ID_PlugProvider, wxT("&Plug-in art provider"), wxT("Enable custom art provider")); menuFile->AppendSeparator();