git-svn-id: https://svn.code.sf.net/p/freetel/code@464 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/fdmdv2_main.h b/fdmdv2/fdmdv2_main.h
index 3918aeff8f6a0a18b7071b29bc8b34da08f8f1c0..b13f6e7d229723754626b822efeb2fb3bffb06c8 100644 (file)
--- a/fdmdv2/fdmdv2_main.h
+++ b/fdmdv2/fdmdv2_main.h
@@ -1,5 +1,6 @@
 //==========================================================================\r
 // Name:            fdmdv2_main.h
+//\r
 // Purpose:         Declares simple wxWidgets application with GUI.
 // Created:         Apr. 9, 2012
 // Initial author:  David Witten\r
@@ -21,6 +22,7 @@
 #include "wx/stopwatch.h"
 #include "wx/versioninfo.h"
 #include <wx/sound.h>
+#include <wx/thread.h>
 \r
 #include "topFrame.h"
 #include "dlg_about.h"\r
@@ -29,8 +31,8 @@
 #include "dlg_comports.h"\r
 #include "fdmdv2_plot.h"
 
-
 #define WAV_FILE wxT("doggrowl.wav")
+\r
 enum
 {
     ID_ROTATE_LEFT = wxID_HIGHEST + 1,
@@ -73,17 +75,18 @@ class MainFrame : public TopFrame
         DrawPanel*  m_panelExtra1;\r
         DrawPanel*  m_panelExtra2;\r
         bool        m_radioRunning;\r
-        // virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); }\r
-        // virtual void OnExitClick( wxCommandEvent& event ) { event.Skip(); }\r
-        // virtual void OnEraseBackground( wxEraseEvent& event ) { event.Skip(); }\r
-        // virtual void OnMouseDown( wxMouseEvent& event );\r
-        // virtual void OnMouseUp( wxMouseEvent& event );\r
-        // virtual void OnMouseMove( wxMouseEvent& event );\r
-        // virtual void OnPaint( wxPaintEvent& event ) { event.Skip(); }\r
-        // virtual void OnSize( wxSizeEvent& event ) { event.Skip(); }\r
-        // virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }\r
-
-    protected:
+\r
+        void DoStartThread();\r
+        void DoPauseThread();\r
+\r
+        //void DoResumeThread() { ... }\r
+\r
+        void OnThreadUpdate(wxThreadEvent&);\r
+        void OnThreadCompletion(wxThreadEvent&);\r
+\r
+    protected:\r
+        MyThread *m_pThread;\r
+        wxCriticalSection m_pThreadCS;    // protects the m_pThread pointer\r
         // 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;