Added __WXX11__ tests where appropriate

[wxWidgets.git] / contrib / samples / canvas / simple / simple.h

diff --git a/contrib/samples/canvas/simple/simple.h b/contrib/samples/canvas/simple/simple.h
index ab9e6ffb5c903623e93e6bef0fb8cf16446e7de0..eadf3f741b2ad622fa4357dd343e3e396ffc741b 100644 (file)
--- a/contrib/samples/canvas/simple/simple.h
+++ b/contrib/samples/canvas/simple/simple.h
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/canvas/canvas.h"
 #endif
 
 #include "wx/canvas/canvas.h"

+#include "wx/timer.h"

 
 //----------------------------------------------------------------------------
 //   constants
 
 //----------------------------------------------------------------------------
 //   constants


@@ -40,6 +41,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE );
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE );

+    ~MyFrame();

     
 private:
     // WDR: method declarations for MyFrame
     
 private:
     // WDR: method declarations for MyFrame


@@ -50,11 +52,13 @@ private:
     wxCanvasImage    *m_smile1;
     wxCanvasImage    *m_smile2;
     wxCanvasAdmin    *m_admin;
     wxCanvasImage    *m_smile1;
     wxCanvasImage    *m_smile2;
     wxCanvasAdmin    *m_admin;

+    wxTimer          *m_timer;

     
 private:
     // WDR: handler declarations for MyFrame
     void OnQuit( wxCommandEvent &event );
     void OnCloseWindow( wxCloseEvent &event );
     
 private:
     // WDR: handler declarations for MyFrame
     void OnQuit( wxCommandEvent &event );
     void OnCloseWindow( wxCloseEvent &event );

+    void OnTimer( wxTimerEvent &event );

     
 private:
     DECLARE_EVENT_TABLE()
     
 private:
     DECLARE_EVENT_TABLE()