remove wxNewEventFunctor() overload which allowed calls to "Bind(evt, &WrongClass...

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

diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp
index 3c845c82837ff03918ee1dd57c50b84c65544d0b..72e99a0fce3de00b468dfa10820475e3dccf8ba8 100644 (file)
--- a/samples/taborder/taborder.cpp
+++ b/samples/taborder/taborder.cpp
@@ -39,6 +39,11 @@
 
 #include "wx/notebook.h"
 
+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -92,11 +97,9 @@ private:
 
     void OnIdle(wxIdleEvent& event);
 
-    void DoNavigate(long flags)
+    void DoNavigate(int flags)
     {
-        wxNavigationKeyEvent event;
-        event.SetFlags(flags);
-        if ( m_panel->ProcessEvent(event) )
+        if ( m_panel->NavigateIn(flags) )
             wxLogStatus(this, _T("Navigation event processed"));
         else
             wxLogStatus(this, _T("Navigation event ignored"));
@@ -191,6 +194,8 @@ MyFrame::MyFrame()
        : wxFrame(NULL, wxID_ANY, _T("TabOrder wxWidgets Sample"),
                  wxDefaultPosition, wxSize(700, 450))
 {
+    SetIcon(wxICON(sample));
+
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(TabOrder_About);
     menuFile->AppendSeparator();