From: wittend99 Date: Tue, 15 May 2012 13:44:02 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@464 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=82c569911a9d75a19e3bfb0b44356934a67e483e;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@464 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/fdmdv2_main.h b/fdmdv2/fdmdv2_main.h index 3918aeff..b13f6e7d 100644 --- a/fdmdv2/fdmdv2_main.h +++ b/fdmdv2/fdmdv2_main.h @@ -1,5 +1,6 @@ //========================================================================== // Name: fdmdv2_main.h +// // Purpose: Declares simple wxWidgets application with GUI. // Created: Apr. 9, 2012 // Initial author: David Witten @@ -21,6 +22,7 @@ #include "wx/stopwatch.h" #include "wx/versioninfo.h" #include +#include #include "topFrame.h" #include "dlg_about.h" @@ -29,8 +31,8 @@ #include "dlg_comports.h" #include "fdmdv2_plot.h" - #define WAV_FILE wxT("doggrowl.wav") + enum { ID_ROTATE_LEFT = wxID_HIGHEST + 1, @@ -73,17 +75,18 @@ class MainFrame : public TopFrame DrawPanel* m_panelExtra1; DrawPanel* m_panelExtra2; bool m_radioRunning; - // virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); } - // virtual void OnExitClick( wxCommandEvent& event ) { event.Skip(); } - // virtual void OnEraseBackground( wxEraseEvent& event ) { event.Skip(); } - // virtual void OnMouseDown( wxMouseEvent& event ); - // virtual void OnMouseUp( wxMouseEvent& event ); - // virtual void OnMouseMove( wxMouseEvent& event ); - // virtual void OnPaint( wxPaintEvent& event ) { event.Skip(); } - // virtual void OnSize( wxSizeEvent& event ) { event.Skip(); } - // virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - - protected: + + void DoStartThread(); + void DoPauseThread(); + + //void DoResumeThread() { ... } + + void OnThreadUpdate(wxThreadEvent&); + void OnThreadCompletion(wxThreadEvent&); + + protected: + MyThread *m_pThread; + wxCriticalSection m_pThreadCS; // protects the m_pThread pointer // protected event handlers virtual void OnCloseFrame(wxCloseEvent& event); virtual void OnExitClick(wxCommandEvent& event); @@ -130,9 +133,6 @@ class MainFrame : public TopFrame wxString LoadUserImage(wxImage& image); -// ScrollCanvas* m_scrolledSpectrum; -// ScrollCanvas* m_scrolledWaterfall; - private: bool CreateSound(wxSound& snd) const;