X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43b2d5e7c3b3e3d6b245e279dde73d96e0075911..0b3e395a5c7a61c6bcf08e2c340a7f2de8ba3c37:/samples/animate/anitest.cpp?ds=sidebyside diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp index 52748aa693..e958d585a2 100644 --- a/samples/animate/anitest.cpp +++ b/samples/animate/anitest.cpp @@ -28,8 +28,8 @@ #include "wx/wx.h" #endif -#ifndef __WXMSW__ - #include "sample.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif #include "wx/aboutdlg.h" @@ -97,13 +97,11 @@ bool MyApp::OnInit() // Create the main frame window - MyFrame* frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("Animation Demo"), + MyFrame* frame = new MyFrame((wxFrame *)NULL, wxID_ANY, wxT("Animation Demo"), wxDefaultPosition, wxSize(500, 400), wxDEFAULT_FRAME_STYLE); frame->Show(true); - SetTopWindow(frame); - return true; } @@ -127,31 +125,31 @@ MyFrame::MyFrame(wxWindow *parent, wxMenu *file_menu = new wxMenu; #if wxUSE_FILEDLG - file_menu->Append(wxID_OPEN, _T("&Open Animation...\tCtrl+O"), _T("Loads an animation")); + file_menu->Append(wxID_OPEN, wxT("&Open Animation...\tCtrl+O"), wxT("Loads an animation")); #endif // wxUSE_FILEDLG file_menu->Append(wxID_EXIT); wxMenu *play_menu = new wxMenu; - play_menu->Append(ID_PLAY, _T("Play\tCtrl+P"), _T("Play the animation")); - play_menu->Append(wxID_STOP, _T("Stop\tCtrl+P"), _T("Stop the animation")); + play_menu->Append(ID_PLAY, wxT("Play\tCtrl+P"), wxT("Play the animation")); + play_menu->Append(wxID_STOP, wxT("Stop\tCtrl+S"), wxT("Stop the animation")); play_menu->AppendSeparator(); - play_menu->Append(ID_SET_NULL_ANIMATION, _T("Set null animation"), - _T("Sets the empty animation in the control")); - play_menu->AppendCheckItem(ID_SET_INACTIVE_BITMAP, _T("Set inactive bitmap"), - _T("Sets an inactive bitmap for the control")); - play_menu->AppendCheckItem(ID_SET_NO_AUTO_RESIZE, _T("Set no autoresize"), - _T("Tells the control not to resize automatically")); - play_menu->Append(ID_SET_BGCOLOR, _T("Set background colour..."), - _T("Sets the background colour of the control")); + play_menu->Append(ID_SET_NULL_ANIMATION, wxT("Set null animation"), + wxT("Sets the empty animation in the control")); + play_menu->AppendCheckItem(ID_SET_INACTIVE_BITMAP, wxT("Set inactive bitmap"), + wxT("Sets an inactive bitmap for the control")); + play_menu->AppendCheckItem(ID_SET_NO_AUTO_RESIZE, wxT("Set no autoresize"), + wxT("Tells the control not to resize automatically")); + play_menu->Append(ID_SET_BGCOLOR, wxT("Set background colour..."), + wxT("Sets the background colour of the control")); wxMenu *help_menu = new wxMenu; help_menu->Append(wxID_ABOUT); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, _T("&File")); - menu_bar->Append(play_menu, _T("&Animation")); - menu_bar->Append(help_menu, _T("&Help")); + menu_bar->Append(file_menu, wxT("&File")); + menu_bar->Append(play_menu, wxT("&Animation")); + menu_bar->Append(help_menu, wxT("&Help")); // Associate the menu bar with this frame SetMenuBar(menu_bar); @@ -258,11 +256,11 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) wxAboutDialogInfo info; info.SetName(_("wxAnimationCtrl and wxAnimation sample")); info.SetDescription(_("This sample program demonstrates the usage of wxAnimationCtrl")); - info.SetCopyright(_T("(C) 2006 Julian Smart")); + info.SetCopyright(wxT("(C) 2006 Julian Smart")); - info.AddDeveloper(_T("Julian Smart")); - info.AddDeveloper(_T("Guillermo Rodriguez Garcia")); - info.AddDeveloper(_T("Francesco Montorsi")); + info.AddDeveloper(wxT("Julian Smart")); + info.AddDeveloper(wxT("Guillermo Rodriguez Garcia")); + info.AddDeveloper(wxT("Francesco Montorsi")); wxAboutBox(info); } @@ -270,7 +268,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) #if wxUSE_FILEDLG void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) { - wxFileDialog dialog(this, _T("Please choose an animation"), + wxFileDialog dialog(this, wxT("Please choose an animation"), wxEmptyString, wxEmptyString, wxT("*.gif;*.ani"), wxFD_OPEN); if (dialog.ShowModal() == wxID_OK) { @@ -281,7 +279,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) if (m_animationCtrl->LoadFile(filename)) m_animationCtrl->Play(); else - wxMessageBox(_T("Sorry, this animation is not a valid format for wxAnimation.")); + wxMessageBox(wxT("Sorry, this animation is not a valid format for wxAnimation.")); #else #if 0 wxAnimation temp; @@ -295,7 +293,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) m_animationCtrl->Play(); #else wxFileInputStream stream(filename); - if (!stream.Ok()) + if (!stream.IsOk()) { wxLogError(wxT("Sorry, this animation is not a valid format for wxAnimation.")); return;