X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/samples/xrc/myframe.cpp diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp index 2a3dfe2cca..3a2dfc0dac 100644 --- a/samples/xrc/myframe.cpp +++ b/samples/xrc/myframe.cpp @@ -51,7 +51,8 @@ #include "custclas.h" // And our objref dialog, for the object reference and ID range example. #include "objrefdlg.h" -// For functions to manipulate our wxTreeCtrl and wxListCtrl +// For functions to manipulate the corresponding controls. +#include "wx/animate.h" #include "wx/treectrl.h" #include "wx/listctrl.h" @@ -61,7 +62,7 @@ // the application icon (under Windows and OS/2 it is in resources and even // though we could still include the XPM here it would be unused) -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -254,7 +255,7 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) #if wxUSE_ANIMATIONCTRL // dynamically connect our event handler for the "clicked" event of the "play" button // in the animation ctrl page of our dialog - dlg.Connect(XRCID("controls_animation_button_play"), wxEVT_COMMAND_BUTTON_CLICKED, + dlg.Connect(XRCID("controls_animation_button_play"), wxEVT_BUTTON, wxCommandEventHandler(MyFrame::OnAnimationCtrlPlay)); #endif