Fix broken and missing DataView interface items for Phoenix

[wxWidgets.git] / samples / animate / anitest.cpp

diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index d2f5bef31aa8ea32ca386116e5abe2211a21fb4a..e958d585a215b616abcb6cd57e110bd28523eb0e 100644 (file)
--- 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"
@@ -102,8 +102,6 @@ bool MyApp::OnInit()
                                  wxDEFAULT_FRAME_STYLE);
     frame->Show(true);
 
-    SetTopWindow(frame);
-
     return true;
 }
 
@@ -133,7 +131,7 @@ MyFrame::MyFrame(wxWindow *parent,
 
     wxMenu *play_menu = new wxMenu;
     play_menu->Append(ID_PLAY, wxT("Play\tCtrl+P"), wxT("Play the animation"));
-    play_menu->Append(wxID_STOP, wxT("Stop\tCtrl+P"), wxT("Stop 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, wxT("Set null animation"),
                       wxT("Sets the empty animation in the control"));
@@ -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;