diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-01-05 19:37:42 -0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-05 19:37:42 -0200 |
commit | 9df133274802731220546d1f9383c213193c8413 (patch) | |
tree | 9c6e2fa2a45d6c6c4c14d8711b2b89066bfb37d7 /Project/WorkspaceBase.h | |
parent | c5343c718cf80620c2fc7452a4315f7ddb9e5826 (diff) | |
parent | b6f96ca48bc156898df79deba63d270b393fb150 (diff) | |
download | PSP.git-9df133274802731220546d1f9383c213193c8413.tar.gz PSP.git-9df133274802731220546d1f9383c213193c8413.tar.xz PSP.git-9df133274802731220546d1f9383c213193c8413.zip |
Merge pull request #5 from Thales1330/opt/element-parent-search
Opt element parent search
Diffstat (limited to 'Project/WorkspaceBase.h')
-rw-r--r-- | Project/WorkspaceBase.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Project/WorkspaceBase.h b/Project/WorkspaceBase.h index fb7d0b9..4696652 100644 --- a/Project/WorkspaceBase.h +++ b/Project/WorkspaceBase.h @@ -4,8 +4,8 @@ // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// -#ifndef PSP_PROJECT_WORKSPACE_BASE_CLASSES_H -#define PSP_PROJECT_WORKSPACE_BASE_CLASSES_H +#ifndef _PSP_PROJECT_WORKSPACE_BASE_CLASSES_H +#define _PSP_PROJECT_WORKSPACE_BASE_CLASSES_H #include <wx/settings.h> #include <wx/xrc/xmlres.h> @@ -14,6 +14,7 @@ #include <wx/artprov.h> #include <wx/sizer.h> #include <wx/glcanvas.h> +#include <wx/timer.h> #if wxVERSION_NUMBER >= 2900 #include <wx/persist.h> #include <wx/persist/toplevel.h> @@ -35,6 +36,7 @@ class WorkspaceBase : public wxPanel { protected: wxGLCanvas* m_glCanvas; + wxTimer* m_timer; protected: virtual void OnPaint(wxPaintEvent& event) { event.Skip(); } @@ -47,9 +49,12 @@ protected: virtual void OnScroll(wxMouseEvent& event) { event.Skip(); } virtual void OnRightClickDown(wxMouseEvent& event) { event.Skip(); } virtual void OnLeftDoubleClick(wxMouseEvent& event) { event.Skip(); } + virtual void OnIdle(wxIdleEvent& event) { event.Skip(); } + virtual void OnTimer(wxTimerEvent& event) { event.Skip(); } public: wxGLCanvas* GetGlCanvas() { return m_glCanvas; } + wxTimer* GetTimer() { return m_timer; } WorkspaceBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(500,300), long style = wxTAB_TRAVERSAL); virtual ~WorkspaceBase(); }; |