git-svn-id: https://svn.code.sf.net/p/freetel/code@730 01035d8c-6547-0410-b346-abe4f9...
authorwittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Wed, 19 Sep 2012 17:11:30 +0000 (17:11 +0000)
committerwittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Wed, 19 Sep 2012 17:11:30 +0000 (17:11 +0000)
21 files changed:
fdmdv2/build/fdmdv2.mk
fdmdv2/build/fdmdv2.workspace
fdmdv2/src/FDMDV2.fbp
fdmdv2/src/dlg_about.cpp
fdmdv2/src/dlg_about.h
fdmdv2/src/dlg_audio.cpp
fdmdv2/src/dlg_audio.h
fdmdv2/src/dlg_comports.cpp
fdmdv2/src/dlg_comports.h
fdmdv2/src/dlg_options.cpp
fdmdv2/src/dlg_options.h
fdmdv2/src/fdmdv2_main.cpp
fdmdv2/src/fdmdv2_main.h
fdmdv2/src/fdmdv2_pa_wrapper.h
fdmdv2/src/fdmdv2_plot.cpp
fdmdv2/src/fdmdv2_plot.h
fdmdv2/src/fdmdv2_plot_spectrum.cpp
fdmdv2/src/fdmdv2_plot_spectrum.h
fdmdv2/src/fdmdv2_plot_waterfall.cpp
fdmdv2/src/topFrame.cpp
fdmdv2/src/topFrame.h

index 0f10b71730f4e90e808c927a94f203dc3c0a82ea..875d7123e2db32a37036fee399bad045360209c2 100644 (file)
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=9/17/2012\r
+Date                   :=9/19/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
index 39870050db076735beae5efcaedcefd675f3177e..2f41763995319416fc0c3642ee97ba19efab1ac5 100644 (file)
@@ -2,14 +2,17 @@
 <CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
   <Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
   <Project Name="drawing" Path="../../../../wxWidgets-2.9.4/samples/drawing/drawing.project" Active="No"/>
+  <Project Name="configtest" Path="../../../../wxWidgets-2.9.4/samples/config/configtest.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="fdmdv2" ConfigName="Debug"/>
       <Project Name="drawing" ConfigName="Debug"/>
+      <Project Name="configtest" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
+    <WorkspaceConfiguration Name="Release" Selected="no">
       <Project Name="fdmdv2" ConfigName="Release"/>
       <Project Name="drawing" ConfigName="Release"/>
+      <Project Name="configtest" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>
index 87141674b5db68653c2de13cf234a8121c1d675f..960234fa2fa4f37c7e762efb21c86447356d5e2e 100644 (file)
@@ -17,7 +17,7 @@
         <property name="internationalize">1</property>\r
         <property name="name">fdmdv2</property>\r
         <property name="namespace"></property>\r
-        <property name="path">C:\Users\wittend\Projects\Radio\fdmdv2</property>\r
+        <property name="path">C:\bin\Projects\Radio\fdmdv2\src</property>\r
         <property name="precompiled_header"></property>\r
         <property name="relative_path">1</property>\r
         <property name="skip_php_events">1</property>\r
         <property name="use_enum">0</property>\r
         <property name="use_microsoft_bom">1</property>\r
         <object class="Frame" expanded="0">\r
-            <property name="BottomDockable">1</property>\r
-            <property name="LeftDockable">1</property>\r
-            <property name="RightDockable">1</property>\r
-            <property name="TopDockable">1</property>\r
-            <property name="aui_layer"></property>\r
             <property name="aui_managed">0</property>\r
-            <property name="aui_name"></property>\r
-            <property name="aui_position"></property>\r
-            <property name="aui_row"></property>\r
-            <property name="best_size"></property>\r
             <property name="bg">wxSYS_COLOUR_3DLIGHT</property>\r
-            <property name="caption"></property>\r
-            <property name="caption_visible">1</property>\r
             <property name="center"></property>\r
-            <property name="center_pane">0</property>\r
-            <property name="close_button">1</property>\r
             <property name="context_help"></property>\r
             <property name="context_menu">1</property>\r
-            <property name="default_pane">0</property>\r
-            <property name="dock">Dock</property>\r
-            <property name="dock_fixed">0</property>\r
-            <property name="docking">Left</property>\r
             <property name="enabled">1</property>\r
             <property name="event_handler">impl_virtual</property>\r
             <property name="extra_style"></property>\r
             <property name="fg">wxSYS_COLOUR_WINDOWTEXT</property>\r
-            <property name="floatable">1</property>\r
             <property name="font"></property>\r
-            <property name="gripper">0</property>\r
             <property name="hidden">0</property>\r
             <property name="id">wxID_ANY</property>\r
-            <property name="max_size"></property>\r
-            <property name="maximize_button">0</property>\r
             <property name="maximum_size"></property>\r
-            <property name="min_size"></property>\r
-            <property name="minimize_button">0</property>\r
             <property name="minimum_size"></property>\r
-            <property name="moveable">1</property>\r
             <property name="name">TopFrame</property>\r
-            <property name="pane_border">1</property>\r
-            <property name="pane_position"></property>\r
-            <property name="pane_size"></property>\r
-            <property name="pin_button">1</property>\r
             <property name="pos"></property>\r
-            <property name="resize">Resizable</property>\r
-            <property name="show">1</property>\r
             <property name="size">761,500</property>\r
             <property name="style">wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>\r
             <property name="subclass"></property>\r
             <property name="title">FDMDV2</property>\r
-            <property name="toolbar_pane">0</property>\r
             <property name="tooltip"></property>\r
-            <property name="validator_data_type"></property>\r
-            <property name="validator_style">wxFILTER_NONE</property>\r
-            <property name="validator_type">wxDefaultValidator</property>\r
-            <property name="validator_variable"></property>\r
             <property name="window_extra_style"></property>\r
             <property name="window_name"></property>\r
             <property name="window_style">wxTAB_TRAVERSAL</property>\r
             <event name="OnSize">topFrame_OnSize</event>\r
             <event name="OnUpdateUI">topFrame_OnUpdateUI</event>\r
             <object class="wxMenuBar" expanded="0">\r
-                <property name="BottomDockable">1</property>\r
-                <property name="LeftDockable">1</property>\r
-                <property name="RightDockable">1</property>\r
-                <property name="TopDockable">1</property>\r
-                <property name="aui_layer"></property>\r
-                <property name="aui_name">main_manu</property>\r
-                <property name="aui_position"></property>\r
-                <property name="aui_row"></property>\r
-                <property name="best_size"></property>\r
                 <property name="bg"></property>\r
-                <property name="caption"></property>\r
-                <property name="caption_visible">1</property>\r
-                <property name="center_pane">0</property>\r
-                <property name="close_button">1</property>\r
                 <property name="context_help"></property>\r
                 <property name="context_menu">1</property>\r
-                <property name="default_pane">0</property>\r
-                <property name="dock">Dock</property>\r
-                <property name="dock_fixed">0</property>\r
-                <property name="docking">Left</property>\r
                 <property name="enabled">1</property>\r
                 <property name="fg"></property>\r
-                <property name="floatable">1</property>\r
                 <property name="font"></property>\r
-                <property name="gripper">0</property>\r
                 <property name="hidden">0</property>\r
                 <property name="id">wxID_ANY</property>\r
                 <property name="label">MyMenuBar</property>\r
-                <property name="max_size"></property>\r
-                <property name="maximize_button">0</property>\r
                 <property name="maximum_size"></property>\r
-                <property name="min_size"></property>\r
-                <property name="minimize_button">0</property>\r
                 <property name="minimum_size"></property>\r
-                <property name="moveable">1</property>\r
                 <property name="name">m_menubarMain</property>\r
-                <property name="pane_border">1</property>\r
-                <property name="pane_position"></property>\r
-                <property name="pane_size"></property>\r
                 <property name="permission">protected</property>\r
-                <property name="pin_button">1</property>\r
                 <property name="pos"></property>\r
-                <property name="resize">Resizable</property>\r
-                <property name="show">1</property>\r
                 <property name="size"></property>\r
                 <property name="style">wxMB_DOCKABLE</property>\r
                 <property name="subclass"></property>\r
-                <property name="toolbar_pane">0</property>\r
                 <property name="tooltip"></property>\r
-                <property name="validator_data_type"></property>\r
-                <property name="validator_style">wxFILTER_NONE</property>\r
-                <property name="validator_type">wxDefaultValidator</property>\r
-                <property name="validator_variable"></property>\r
                 <property name="window_extra_style"></property>\r
                 <property name="window_name"></property>\r
                 <property name="window_style"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
                                         <property name="uniform_bitmap_size"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
                 </object>\r
             </object>\r
             <object class="wxStatusBar" expanded="0">\r
-                <property name="BottomDockable">1</property>\r
-                <property name="LeftDockable">1</property>\r
-                <property name="RightDockable">1</property>\r
-                <property name="TopDockable">1</property>\r
-                <property name="aui_layer"></property>\r
-                <property name="aui_name"></property>\r
-                <property name="aui_position"></property>\r
-                <property name="aui_row"></property>\r
-                <property name="best_size"></property>\r
                 <property name="bg"></property>\r
-                <property name="caption"></property>\r
-                <property name="caption_visible">1</property>\r
-                <property name="center_pane">0</property>\r
-                <property name="close_button">1</property>\r
                 <property name="context_help"></property>\r
                 <property name="context_menu">1</property>\r
-                <property name="default_pane">0</property>\r
-                <property name="dock">Dock</property>\r
-                <property name="dock_fixed">0</property>\r
-                <property name="docking">Left</property>\r
                 <property name="enabled">1</property>\r
                 <property name="fg"></property>\r
                 <property name="fields">3</property>\r
-                <property name="floatable">1</property>\r
                 <property name="font"></property>\r
-                <property name="gripper">0</property>\r
                 <property name="hidden">0</property>\r
                 <property name="id">wxID_ANY</property>\r
-                <property name="max_size"></property>\r
-                <property name="maximize_button">0</property>\r
                 <property name="maximum_size"></property>\r
-                <property name="min_size"></property>\r
-                <property name="minimize_button">0</property>\r
                 <property name="minimum_size"></property>\r
-                <property name="moveable">1</property>\r
                 <property name="name">m_statusBar1</property>\r
-                <property name="pane_border">1</property>\r
-                <property name="pane_position"></property>\r
-                <property name="pane_size"></property>\r
                 <property name="permission">protected</property>\r
-                <property name="pin_button">1</property>\r
                 <property name="pos"></property>\r
-                <property name="resize">Resizable</property>\r
-                <property name="show">1</property>\r
                 <property name="size"></property>\r
                 <property name="style">wxST_SIZEGRIP</property>\r
                 <property name="subclass"></property>\r
-                <property name="toolbar_pane">0</property>\r
                 <property name="tooltip"></property>\r
-                <property name="validator_data_type"></property>\r
-                <property name="validator_style">wxFILTER_NONE</property>\r
-                <property name="validator_type">wxDefaultValidator</property>\r
-                <property name="validator_variable"></property>\r
                 <property name="window_extra_style"></property>\r
                 <property name="window_name"></property>\r
                 <property name="window_style"></property>\r
             </object>\r
         </object>\r
         <object class="Dialog" expanded="0">\r
-            <property name="BottomDockable">1</property>\r
-            <property name="LeftDockable">1</property>\r
-            <property name="RightDockable">1</property>\r
-            <property name="TopDockable">1</property>\r
-            <property name="aui_layer"></property>\r
             <property name="aui_managed">0</property>\r
-            <property name="aui_name"></property>\r
-            <property name="aui_position"></property>\r
-            <property name="aui_row"></property>\r
-            <property name="best_size"></property>\r
             <property name="bg"></property>\r
-            <property name="caption"></property>\r
-            <property name="caption_visible">1</property>\r
             <property name="center">wxBOTH</property>\r
-            <property name="center_pane">0</property>\r
-            <property name="close_button">1</property>\r
             <property name="context_help"></property>\r
             <property name="context_menu">1</property>\r
-            <property name="default_pane">0</property>\r
-            <property name="dock">Dock</property>\r
-            <property name="dock_fixed">0</property>\r
-            <property name="docking">Left</property>\r
             <property name="enabled">1</property>\r
             <property name="event_handler">impl_virtual</property>\r
             <property name="extra_style"></property>\r
             <property name="fg"></property>\r
-            <property name="floatable">1</property>\r
             <property name="font"></property>\r
-            <property name="gripper">0</property>\r
             <property name="hidden">0</property>\r
             <property name="id">wxID_ANY</property>\r
-            <property name="max_size"></property>\r
-            <property name="maximize_button">0</property>\r
             <property name="maximum_size"></property>\r
-            <property name="min_size"></property>\r
-            <property name="minimize_button">0</property>\r
             <property name="minimum_size"></property>\r
-            <property name="moveable">1</property>\r
             <property name="name">DlgAbout</property>\r
-            <property name="pane_border">1</property>\r
-            <property name="pane_position"></property>\r
-            <property name="pane_size"></property>\r
-            <property name="pin_button">1</property>\r
             <property name="pos"></property>\r
-            <property name="resize">Resizable</property>\r
-            <property name="show">1</property>\r
             <property name="size">352,343</property>\r
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>\r
             <property name="subclass"> ;  </property>\r
             <property name="title">About FDMDV2</property>\r
-            <property name="toolbar_pane">0</property>\r
             <property name="tooltip"></property>\r
-            <property name="validator_data_type"></property>\r
-            <property name="validator_style">wxFILTER_NONE</property>\r
-            <property name="validator_type">wxDefaultValidator</property>\r
-            <property name="validator_variable"></property>\r
             <property name="window_extra_style"></property>\r
             <property name="window_name"></property>\r
             <property name="window_style"></property>\r
                                                 <property name="subclass"></property>\r
                                                 <property name="toolbar_pane">0</property>\r
                                                 <property name="tooltip"></property>\r
-                                                <property name="validator_data_type"></property>\r
-                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                <property name="validator_variable"></property>\r
                                                 <property name="window_extra_style"></property>\r
                                                 <property name="window_name"></property>\r
                                                 <property name="window_style"></property>\r
                                                 <property name="subclass"></property>\r
                                                 <property name="toolbar_pane">0</property>\r
                                                 <property name="tooltip"></property>\r
-                                                <property name="validator_data_type"></property>\r
-                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                <property name="validator_variable"></property>\r
                                                 <property name="window_extra_style"></property>\r
                                                 <property name="window_name"></property>\r
                                                 <property name="window_style"></property>\r
                 </object>\r
             </object>\r
         </object>\r
-        <object class="Dialog" expanded="0">\r
-            <property name="BottomDockable">1</property>\r
-            <property name="LeftDockable">1</property>\r
-            <property name="RightDockable">1</property>\r
-            <property name="TopDockable">1</property>\r
-            <property name="aui_layer"></property>\r
+        <object class="Dialog" expanded="1">\r
             <property name="aui_managed">0</property>\r
-            <property name="aui_name"></property>\r
-            <property name="aui_position"></property>\r
-            <property name="aui_row"></property>\r
-            <property name="best_size"></property>\r
             <property name="bg"></property>\r
-            <property name="caption"></property>\r
-            <property name="caption_visible">1</property>\r
             <property name="center">wxBOTH</property>\r
-            <property name="center_pane">0</property>\r
-            <property name="close_button">1</property>\r
             <property name="context_help"></property>\r
             <property name="context_menu">1</property>\r
-            <property name="default_pane">0</property>\r
-            <property name="dock">Dock</property>\r
-            <property name="dock_fixed">0</property>\r
-            <property name="docking">Left</property>\r
             <property name="enabled">1</property>\r
             <property name="event_handler">impl_virtual</property>\r
             <property name="extra_style"></property>\r
             <property name="fg"></property>\r
-            <property name="floatable">1</property>\r
             <property name="font"></property>\r
-            <property name="gripper">0</property>\r
             <property name="hidden">0</property>\r
             <property name="id">wxID_ANY</property>\r
-            <property name="max_size"></property>\r
-            <property name="maximize_button">0</property>\r
             <property name="maximum_size"></property>\r
-            <property name="min_size"></property>\r
-            <property name="minimize_button">0</property>\r
             <property name="minimum_size"></property>\r
-            <property name="moveable">1</property>\r
             <property name="name">DlgAudio</property>\r
-            <property name="pane_border">1</property>\r
-            <property name="pane_position"></property>\r
-            <property name="pane_size"></property>\r
-            <property name="pin_button">1</property>\r
             <property name="pos"></property>\r
-            <property name="resize">Resizable</property>\r
-            <property name="show">1</property>\r
             <property name="size">555,419</property>\r
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>\r
             <property name="subclass"></property>\r
             <property name="title">Audio Options</property>\r
-            <property name="toolbar_pane">0</property>\r
             <property name="tooltip"></property>\r
-            <property name="validator_data_type"></property>\r
-            <property name="validator_style">wxFILTER_NONE</property>\r
-            <property name="validator_type">wxDefaultValidator</property>\r
-            <property name="validator_variable"></property>\r
             <property name="window_extra_style"></property>\r
             <property name="window_name"></property>\r
             <property name="window_style"></property>\r
             <event name="OnSetFocus"></event>\r
             <event name="OnSize"></event>\r
             <event name="OnUpdateUI"></event>\r
-            <object class="wxBoxSizer" expanded="0">\r
+            <object class="wxBoxSizer" expanded="1">\r
                 <property name="minimum_size"></property>\r
                 <property name="name">bSizer32</property>\r
                 <property name="orient">wxVERTICAL</property>\r
                 <property name="permission">none</property>\r
-                <object class="sizeritem" expanded="0">\r
+                <object class="sizeritem" expanded="1">\r
                     <property name="border">1</property>\r
                     <property name="flag">wxEXPAND | wxALL</property>\r
                     <property name="proportion">1</property>\r
-                    <object class="wxNotebook" expanded="0">\r
+                    <object class="wxNotebook" expanded="1">\r
                         <property name="BottomDockable">1</property>\r
                         <property name="LeftDockable">1</property>\r
                         <property name="RightDockable">1</property>\r
                         <property name="subclass"></property>\r
                         <property name="toolbar_pane">0</property>\r
                         <property name="tooltip"></property>\r
-                        <property name="validator_data_type"></property>\r
-                        <property name="validator_style">wxFILTER_NONE</property>\r
-                        <property name="validator_type">wxDefaultValidator</property>\r
-                        <property name="validator_variable"></property>\r
                         <property name="window_extra_style"></property>\r
                         <property name="window_name"></property>\r
                         <property name="window_style"></property>\r
                                 <property name="subclass"></property>\r
                                 <property name="toolbar_pane">0</property>\r
                                 <property name="tooltip"></property>\r
-                                <property name="validator_data_type"></property>\r
-                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                <property name="validator_type">wxDefaultValidator</property>\r
-                                <property name="validator_variable"></property>\r
                                 <property name="window_extra_style"></property>\r
                                 <property name="window_name"></property>\r
                                 <property name="window_style">wxTAB_TRAVERSAL</property>\r
                                                                             <property name="subclass"></property>\r
                                                                             <property name="toolbar_pane">0</property>\r
                                                                             <property name="tooltip"></property>\r
-                                                                            <property name="validator_data_type"></property>\r
-                                                                            <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                            <property name="validator_type">wxDefaultValidator</property>\r
-                                                                            <property name="validator_variable"></property>\r
                                                                             <property name="window_extra_style"></property>\r
                                                                             <property name="window_name"></property>\r
                                                                             <property name="window_style"></property>\r
                                                                             <property name="subclass"></property>\r
                                                                             <property name="toolbar_pane">0</property>\r
                                                                             <property name="tooltip"></property>\r
-                                                                            <property name="validator_data_type"></property>\r
-                                                                            <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                            <property name="validator_type">wxDefaultValidator</property>\r
-                                                                            <property name="validator_variable"></property>\r
                                                                             <property name="window_extra_style"></property>\r
                                                                             <property name="window_name"></property>\r
                                                                             <property name="window_style"></property>\r
                                                                     <property name="subclass"></property>\r
                                                                     <property name="toolbar_pane">0</property>\r
                                                                     <property name="tooltip"></property>\r
-                                                                    <property name="validator_data_type"></property>\r
-                                                                    <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                    <property name="validator_type">wxDefaultValidator</property>\r
-                                                                    <property name="validator_variable"></property>\r
                                                                     <property name="window_extra_style"></property>\r
                                                                     <property name="window_name"></property>\r
                                                                     <property name="window_style"></property>\r
                                                                     <property name="subclass"></property>\r
                                                                     <property name="toolbar_pane">0</property>\r
                                                                     <property name="tooltip"></property>\r
-                                                                    <property name="validator_data_type"></property>\r
-                                                                    <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                    <property name="validator_type">wxDefaultValidator</property>\r
-                                                                    <property name="validator_variable"></property>\r
                                                                     <property name="window_extra_style"></property>\r
                                                                     <property name="window_name"></property>\r
                                                                     <property name="window_style"></property>\r
                                                                     <property name="subclass"></property>\r
                                                                     <property name="toolbar_pane">0</property>\r
                                                                     <property name="tooltip"></property>\r
-                                                                    <property name="validator_data_type"></property>\r
-                                                                    <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                    <property name="validator_type">wxDefaultValidator</property>\r
-                                                                    <property name="validator_variable"></property>\r
                                                                     <property name="window_extra_style"></property>\r
                                                                     <property name="window_name"></property>\r
                                                                     <property name="window_style"></property>\r
                                                                     <property name="subclass"></property>\r
                                                                     <property name="toolbar_pane">0</property>\r
                                                                     <property name="tooltip"></property>\r
-                                                                    <property name="validator_data_type"></property>\r
-                                                                    <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                    <property name="validator_type">wxDefaultValidator</property>\r
-                                                                    <property name="validator_variable"></property>\r
                                                                     <property name="window_extra_style"></property>\r
                                                                     <property name="window_name"></property>\r
                                                                     <property name="window_style"></property>\r
                                 <property name="subclass"></property>\r
                                 <property name="toolbar_pane">0</property>\r
                                 <property name="tooltip"></property>\r
-                                <property name="validator_data_type"></property>\r
-                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                <property name="validator_type">wxDefaultValidator</property>\r
-                                <property name="validator_variable"></property>\r
                                 <property name="window_extra_style"></property>\r
                                 <property name="window_name"></property>\r
                                 <property name="window_style">wxTAB_TRAVERSAL</property>\r
                                                                     <property name="minimize_button">0</property>\r
                                                                     <property name="minimum_size"></property>\r
                                                                     <property name="moveable">1</property>\r
-                                                                    <property name="name">m_textCtrl15</property>\r
+                                                                    <property name="name">m_textTxOutput</property>\r
                                                                     <property name="pane_border">1</property>\r
                                                                     <property name="pane_position"></property>\r
                                                                     <property name="pane_size"></property>\r
                                 </object>\r
                             </object>\r
                         </object>\r
-                        <object class="notebookpage" expanded="0">\r
-                            <property name="bitmap"></property>\r
-                            <property name="label">Right Channel</property>\r
-                            <property name="select">0</property>\r
-                            <object class="wxPanel" expanded="0">\r
-                                <property name="BottomDockable">1</property>\r
-                                <property name="LeftDockable">1</property>\r
-                                <property name="RightDockable">1</property>\r
-                                <property name="TopDockable">1</property>\r
-                                <property name="aui_layer"></property>\r
-                                <property name="aui_name"></property>\r
-                                <property name="aui_position"></property>\r
-                                <property name="aui_row"></property>\r
-                                <property name="best_size"></property>\r
-                                <property name="bg"></property>\r
-                                <property name="caption"></property>\r
-                                <property name="caption_visible">1</property>\r
-                                <property name="center_pane">0</property>\r
-                                <property name="close_button">1</property>\r
-                                <property name="context_help"></property>\r
-                                <property name="context_menu">1</property>\r
-                                <property name="default_pane">0</property>\r
-                                <property name="dock">Dock</property>\r
-                                <property name="dock_fixed">0</property>\r
-                                <property name="docking">Left</property>\r
-                                <property name="enabled">1</property>\r
-                                <property name="fg"></property>\r
-                                <property name="floatable">1</property>\r
-                                <property name="font"></property>\r
-                                <property name="gripper">0</property>\r
-                                <property name="hidden">0</property>\r
-                                <property name="id">wxID_ANY</property>\r
-                                <property name="max_size"></property>\r
-                                <property name="maximize_button">0</property>\r
-                                <property name="maximum_size"></property>\r
-                                <property name="min_size"></property>\r
-                                <property name="minimize_button">0</property>\r
-                                <property name="minimum_size"></property>\r
-                                <property name="moveable">1</property>\r
-                                <property name="name">m_panelRightChannel</property>\r
-                                <property name="pane_border">1</property>\r
-                                <property name="pane_position"></property>\r
-                                <property name="pane_size"></property>\r
-                                <property name="permission">protected</property>\r
-                                <property name="pin_button">1</property>\r
-                                <property name="pos"></property>\r
-                                <property name="resize">Resizable</property>\r
-                                <property name="show">1</property>\r
-                                <property name="size"></property>\r
-                                <property name="subclass"></property>\r
-                                <property name="toolbar_pane">0</property>\r
-                                <property name="tooltip"></property>\r
-                                <property name="validator_data_type"></property>\r
-                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                <property name="validator_type">wxDefaultValidator</property>\r
-                                <property name="validator_variable"></property>\r
-                                <property name="window_extra_style"></property>\r
-                                <property name="window_name"></property>\r
-                                <property name="window_style">wxTAB_TRAVERSAL</property>\r
-                                <event name="OnChar"></event>\r
-                                <event name="OnEnterWindow"></event>\r
-                                <event name="OnEraseBackground"></event>\r
-                                <event name="OnKeyDown"></event>\r
-                                <event name="OnKeyUp"></event>\r
-                                <event name="OnKillFocus"></event>\r
-                                <event name="OnLeaveWindow"></event>\r
-                                <event name="OnLeftDClick"></event>\r
-                                <event name="OnLeftDown"></event>\r
-                                <event name="OnLeftUp"></event>\r
-                                <event name="OnMiddleDClick"></event>\r
-                                <event name="OnMiddleDown"></event>\r
-                                <event name="OnMiddleUp"></event>\r
-                                <event name="OnMotion"></event>\r
-                                <event name="OnMouseEvents"></event>\r
-                                <event name="OnMouseWheel"></event>\r
-                                <event name="OnPaint"></event>\r
-                                <event name="OnRightDClick"></event>\r
-                                <event name="OnRightDown"></event>\r
-                                <event name="OnRightUp"></event>\r
-                                <event name="OnSetFocus"></event>\r
-                                <event name="OnSize"></event>\r
-                                <event name="OnUpdateUI"></event>\r
-                                <object class="wxBoxSizer" expanded="0">\r
-                                    <property name="minimum_size"></property>\r
-                                    <property name="name">bSizer36</property>\r
-                                    <property name="orient">wxVERTICAL</property>\r
-                                    <property name="permission">none</property>\r
-                                </object>\r
-                            </object>\r
-                        </object>\r
                     </object>\r
                 </object>\r
-                <object class="sizeritem" expanded="0">\r
+                <object class="sizeritem" expanded="1">\r
                     <property name="border">5</property>\r
                     <property name="flag">wxEXPAND</property>\r
                     <property name="proportion">0</property>\r
-                    <object class="wxBoxSizer" expanded="0">\r
+                    <object class="wxBoxSizer" expanded="1">\r
                         <property name="minimum_size"></property>\r
                         <property name="name">bSizer28</property>\r
                         <property name="orient">wxVERTICAL</property>\r
             </object>\r
         </object>\r
         <object class="Dialog" expanded="0">\r
-            <property name="BottomDockable">1</property>\r
-            <property name="LeftDockable">1</property>\r
-            <property name="RightDockable">1</property>\r
-            <property name="TopDockable">1</property>\r
-            <property name="aui_layer"></property>\r
             <property name="aui_managed">0</property>\r
-            <property name="aui_name"></property>\r
-            <property name="aui_position"></property>\r
-            <property name="aui_row"></property>\r
-            <property name="best_size"></property>\r
             <property name="bg"></property>\r
-            <property name="caption"></property>\r
-            <property name="caption_visible">1</property>\r
             <property name="center">wxBOTH</property>\r
-            <property name="center_pane">0</property>\r
-            <property name="close_button">1</property>\r
             <property name="context_help"></property>\r
             <property name="context_menu">1</property>\r
-            <property name="default_pane">0</property>\r
-            <property name="dock">Dock</property>\r
-            <property name="dock_fixed">0</property>\r
-            <property name="docking">Left</property>\r
             <property name="enabled">1</property>\r
             <property name="event_handler">impl_virtual</property>\r
             <property name="extra_style"></property>\r
             <property name="fg"></property>\r
-            <property name="floatable">1</property>\r
             <property name="font"></property>\r
-            <property name="gripper">0</property>\r
             <property name="hidden">0</property>\r
             <property name="id">wxID_ANY</property>\r
-            <property name="max_size"></property>\r
-            <property name="maximize_button">0</property>\r
             <property name="maximum_size"></property>\r
-            <property name="min_size"></property>\r
-            <property name="minimize_button">0</property>\r
             <property name="minimum_size"></property>\r
-            <property name="moveable">1</property>\r
             <property name="name">DlgOptions</property>\r
-            <property name="pane_border">1</property>\r
-            <property name="pane_position"></property>\r
-            <property name="pane_size"></property>\r
-            <property name="pin_button">1</property>\r
             <property name="pos"></property>\r
-            <property name="resize">Resizable</property>\r
-            <property name="show">1</property>\r
             <property name="size">332,364</property>\r
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>\r
             <property name="subclass"></property>\r
             <property name="title">Program Options</property>\r
-            <property name="toolbar_pane">0</property>\r
             <property name="tooltip"></property>\r
-            <property name="validator_data_type"></property>\r
-            <property name="validator_style">wxFILTER_NONE</property>\r
-            <property name="validator_type">wxDefaultValidator</property>\r
-            <property name="validator_variable"></property>\r
             <property name="window_extra_style"></property>\r
             <property name="window_name"></property>\r
             <property name="window_style"></property>\r
                                         <property name="subclass"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
                                         <property name="subclass"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
                                         <property name="subclass"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
                                         <property name="subclass"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
                                         <property name="subclass"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
                                         <property name="subclass"></property>\r
                                         <property name="toolbar_pane">0</property>\r
                                         <property name="tooltip"></property>\r
-                                        <property name="validator_data_type"></property>\r
-                                        <property name="validator_style">wxFILTER_NONE</property>\r
-                                        <property name="validator_type">wxDefaultValidator</property>\r
-                                        <property name="validator_variable"></property>\r
                                         <property name="window_extra_style"></property>\r
                                         <property name="window_name"></property>\r
                                         <property name="window_style"></property>\r
             </object>\r
         </object>\r
         <object class="Dialog" expanded="0">\r
-            <property name="BottomDockable">1</property>\r
-            <property name="LeftDockable">1</property>\r
-            <property name="RightDockable">1</property>\r
-            <property name="TopDockable">1</property>\r
-            <property name="aui_layer"></property>\r
             <property name="aui_managed">0</property>\r
-            <property name="aui_name"></property>\r
-            <property name="aui_position"></property>\r
-            <property name="aui_row"></property>\r
-            <property name="best_size"></property>\r
             <property name="bg"></property>\r
-            <property name="caption"></property>\r
-            <property name="caption_visible">1</property>\r
             <property name="center">wxBOTH</property>\r
-            <property name="center_pane">0</property>\r
-            <property name="close_button">1</property>\r
             <property name="context_help"></property>\r
             <property name="context_menu">1</property>\r
-            <property name="default_pane">0</property>\r
-            <property name="dock">Dock</property>\r
-            <property name="dock_fixed">0</property>\r
-            <property name="docking">Left</property>\r
             <property name="enabled">1</property>\r
             <property name="event_handler">impl_virtual</property>\r
             <property name="extra_style"></property>\r
             <property name="fg"></property>\r
-            <property name="floatable">1</property>\r
             <property name="font"></property>\r
-            <property name="gripper">0</property>\r
             <property name="hidden">0</property>\r
             <property name="id">wxID_ANY</property>\r
-            <property name="max_size"></property>\r
-            <property name="maximize_button">0</property>\r
             <property name="maximum_size"></property>\r
-            <property name="min_size"></property>\r
-            <property name="minimize_button">0</property>\r
             <property name="minimum_size"></property>\r
-            <property name="moveable">1</property>\r
             <property name="name">DlgComPorts</property>\r
-            <property name="pane_border">1</property>\r
-            <property name="pane_position"></property>\r
-            <property name="pane_size"></property>\r
-            <property name="pin_button">1</property>\r
             <property name="pos"></property>\r
-            <property name="resize">Resizable</property>\r
-            <property name="show">1</property>\r
-            <property name="size">399,226</property>\r
+            <property name="size">399,354</property>\r
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>\r
             <property name="subclass"></property>\r
             <property name="title">Select Com Port</property>\r
-            <property name="toolbar_pane">0</property>\r
             <property name="tooltip"></property>\r
-            <property name="validator_data_type"></property>\r
-            <property name="validator_style">wxFILTER_NONE</property>\r
-            <property name="validator_type">wxDefaultValidator</property>\r
-            <property name="validator_variable"></property>\r
             <property name="window_extra_style"></property>\r
             <property name="window_name"></property>\r
             <property name="window_style"></property>\r
                         <property name="minimum_size"></property>\r
                         <property name="name">gSizer3</property>\r
                         <property name="permission">none</property>\r
-                        <property name="rows">2</property>\r
+                        <property name="rows">6</property>\r
                         <property name="vgap">0</property>\r
                         <object class="sizeritem" expanded="0">\r
-                            <property name="border">5</property>\r
+                            <property name="border">2</property>\r
                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                             <property name="proportion">0</property>\r
                             <object class="wxStaticText" expanded="0">\r
                                 <property name="subclass"></property>\r
                                 <property name="toolbar_pane">0</property>\r
                                 <property name="tooltip"></property>\r
-                                <property name="validator_data_type"></property>\r
-                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                <property name="validator_type">wxDefaultValidator</property>\r
-                                <property name="validator_variable"></property>\r
                                 <property name="window_extra_style"></property>\r
                                 <property name="window_name"></property>\r
                                 <property name="window_style"></property>\r
                             </object>\r
                         </object>\r
                         <object class="sizeritem" expanded="0">\r
-                            <property name="border">5</property>\r
+                            <property name="border">2</property>\r
                             <property name="flag">wxALL|wxEXPAND</property>\r
-                            <property name="proportion">1</property>\r
+                            <property name="proportion">2</property>\r
                             <object class="wxListCtrl" expanded="0">\r
                                 <property name="BottomDockable">1</property>\r
                                 <property name="LeftDockable">1</property>\r
                             </object>\r
                         </object>\r
                         <object class="sizeritem" expanded="0">\r
-                            <property name="border">5</property>\r
+                            <property name="border">2</property>\r
                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
-                            <property name="proportion">0</property>\r
+                            <property name="proportion">1</property>\r
                             <object class="wxStaticText" expanded="0">\r
                                 <property name="BottomDockable">1</property>\r
                                 <property name="LeftDockable">1</property>\r
                                 <property name="subclass"></property>\r
                                 <property name="toolbar_pane">0</property>\r
                                 <property name="tooltip"></property>\r
-                                <property name="validator_data_type"></property>\r
-                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                <property name="validator_type">wxDefaultValidator</property>\r
-                                <property name="validator_variable"></property>\r
                                 <property name="window_extra_style"></property>\r
                                 <property name="window_name"></property>\r
                                 <property name="window_style"></property>\r
                             </object>\r
                         </object>\r
                         <object class="sizeritem" expanded="0">\r
-                            <property name="border">5</property>\r
+                            <property name="border">2</property>\r
                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
                             <property name="proportion">1</property>\r
                             <object class="wxTextCtrl" expanded="0">\r
                                 <property name="minimize_button">0</property>\r
                                 <property name="minimum_size"></property>\r
                                 <property name="moveable">1</property>\r
-                                <property name="name">m_textCtrl10</property>\r
+                                <property name="name">m_textRigCtrlPort</property>\r
                                 <property name="pane_border">1</property>\r
                                 <property name="pane_position"></property>\r
                                 <property name="pane_size"></property>\r
                                 <event name="OnUpdateUI"></event>\r
                             </object>\r
                         </object>\r
-                    </object>\r
-                </object>\r
-                <object class="sizeritem" expanded="0">\r
-                    <property name="border">5</property>\r
-                    <property name="flag">wxEXPAND</property>\r
-                    <property name="proportion">0</property>\r
-                    <object class="wxStdDialogButtonSizer" expanded="0">\r
-                        <property name="Apply">0</property>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxStaticText" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="label">Buad Rate:</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_staticText91</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style">wxALIGN_RIGHT</property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <property name="wrap">-1</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxTextCtrl" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="maxlength">0</property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_textRigCtrlBaud</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="validator_data_type"></property>\r
+                                <property name="validator_style">wxFILTER_NONE</property>\r
+                                <property name="validator_type">wxDefaultValidator</property>\r
+                                <property name="validator_variable"></property>\r
+                                <property name="value"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnText"></event>\r
+                                <event name="OnTextEnter"></event>\r
+                                <event name="OnTextMaxLen"></event>\r
+                                <event name="OnTextURL"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxStaticText" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="label">Data Bits:</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_staticText911</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style">wxALIGN_RIGHT</property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <property name="wrap">-1</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxTextCtrl" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="maxlength">0</property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_textRigCtrlDatabits</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="validator_data_type"></property>\r
+                                <property name="validator_style">wxFILTER_NONE</property>\r
+                                <property name="validator_type">wxDefaultValidator</property>\r
+                                <property name="validator_variable"></property>\r
+                                <property name="value"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnText"></event>\r
+                                <event name="OnTextEnter"></event>\r
+                                <event name="OnTextMaxLen"></event>\r
+                                <event name="OnTextURL"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxStaticText" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="label">Stop Bits:</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_staticText912</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style">wxALIGN_RIGHT</property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <property name="wrap">-1</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxTextCtrl" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="maxlength">0</property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_textRigCtrlStopbits</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="validator_data_type"></property>\r
+                                <property name="validator_style">wxFILTER_NONE</property>\r
+                                <property name="validator_type">wxDefaultValidator</property>\r
+                                <property name="validator_variable"></property>\r
+                                <property name="value"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnText"></event>\r
+                                <event name="OnTextEnter"></event>\r
+                                <event name="OnTextMaxLen"></event>\r
+                                <event name="OnTextURL"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxStaticText" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="label">Parity:</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_staticText913</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style">wxALIGN_RIGHT</property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <property name="wrap">-1</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="0">\r
+                            <property name="border">2</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
+                            <property name="proportion">1</property>\r
+                            <object class="wxTextCtrl" expanded="0">\r
+                                <property name="BottomDockable">1</property>\r
+                                <property name="LeftDockable">1</property>\r
+                                <property name="RightDockable">1</property>\r
+                                <property name="TopDockable">1</property>\r
+                                <property name="aui_layer"></property>\r
+                                <property name="aui_name"></property>\r
+                                <property name="aui_position"></property>\r
+                                <property name="aui_row"></property>\r
+                                <property name="best_size"></property>\r
+                                <property name="bg"></property>\r
+                                <property name="caption"></property>\r
+                                <property name="caption_visible">1</property>\r
+                                <property name="center_pane">0</property>\r
+                                <property name="close_button">1</property>\r
+                                <property name="context_help"></property>\r
+                                <property name="context_menu">1</property>\r
+                                <property name="default_pane">0</property>\r
+                                <property name="dock">Dock</property>\r
+                                <property name="dock_fixed">0</property>\r
+                                <property name="docking">Left</property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="floatable">1</property>\r
+                                <property name="font"></property>\r
+                                <property name="gripper">0</property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="max_size"></property>\r
+                                <property name="maximize_button">0</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="maxlength">0</property>\r
+                                <property name="min_size"></property>\r
+                                <property name="minimize_button">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="moveable">1</property>\r
+                                <property name="name">m_textRigCtrlParity</property>\r
+                                <property name="pane_border">1</property>\r
+                                <property name="pane_position"></property>\r
+                                <property name="pane_size"></property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pin_button">1</property>\r
+                                <property name="pos"></property>\r
+                                <property name="resize">Resizable</property>\r
+                                <property name="show">1</property>\r
+                                <property name="size"></property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="toolbar_pane">0</property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="validator_data_type"></property>\r
+                                <property name="validator_style">wxFILTER_NONE</property>\r
+                                <property name="validator_type">wxDefaultValidator</property>\r
+                                <property name="validator_variable"></property>\r
+                                <property name="value"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnText"></event>\r
+                                <event name="OnTextEnter"></event>\r
+                                <event name="OnTextMaxLen"></event>\r
+                                <event name="OnTextURL"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="0">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxEXPAND</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxStdDialogButtonSizer" expanded="0">\r
+                        <property name="Apply">1</property>\r
                         <property name="Cancel">1</property>\r
                         <property name="ContextHelp">0</property>\r
                         <property name="Help">0</property>\r
index b9e77a316a5ec90a0d9434a386690815851a7a92..b3b5266bbb55e0c13dcfb319226c91eb6af6781d 100644 (file)
@@ -19,3 +19,45 @@ void AboutDlg::OnInitDialog( wxInitDialogEvent& event )
 {\r
 // TODO: Implement OnInitDialog\r
 }\r
+\r
+//-------------------------------------------------------------------------\r
+// ExchangeData()\r
+//-------------------------------------------------------------------------\r
+void AboutDlg::ExchangeData(int inout)\r
+{\r
+//    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    if(inout == EXCHANGE_DATA_IN)\r
+    {\r
+//        m_textRigCtrlPort->SetValue(wxGetApp().m_strRigCtrlPort);\r
+//        m_textRigCtrlBaud->SetValue(wxGetApp().m_strRigCtrlBaud);\r
+//        m_textRigCtrlDatabits->SetValue(wxGetApp().m_strRigCtrlDatabits);\r
+//        m_textRigCtrlStopbits->SetValue(wxGetApp().m_strRigCtrlStopbits);\r
+//        m_textRigCtrlParity->SetValue(wxGetApp().m_strRigCtrlParity);\r
+    }\r
+    if(inout == EXCHANGE_DATA_OUT)\r
+    {\r
+//        wxGetApp().m_strRigCtrlPort             = m_textRigCtrlPort->GetValue();\r
+//        wxGetApp().m_strRigCtrlBaud             = m_textRigCtrlBaud->GetValue();\r
+//        wxGetApp().m_strRigCtrlDatabits         = m_textRigCtrlDatabits->GetValue();\r
+//        wxGetApp().m_strRigCtrlStopbits         = m_textRigCtrlStopbits->GetValue();\r
+//        wxGetApp().m_strRigCtrlParity           = m_textRigCtrlParity->GetValue();\r
+\r
+//        pConfig->Write(wxT("/Rig/Port"),        wxGetApp().m_strRigCtrlPort);\r
+//        pConfig->Write(wxT("/Rig/Baud"),        wxGetApp().m_strRigCtrlBaud);\r
+//        pConfig->Write(wxT("/Rig/DataBits"),    wxGetApp().m_strRigCtrlDatabits);\r
+//        pConfig->Write(wxT("/Rig/StopBits"),    wxGetApp().m_strRigCtrlStopbits);\r
+//        pConfig->Write(wxT("/Rig/Parity"),      wxGetApp().m_strRigCtrlParity);\r
+\r
+//        pConfig->Flush();\r
+    }\r
+//    delete wxConfigBase::Set((wxConfigBase *) NULL);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnOK()\r
+//-------------------------------------------------------------------------\r
+void AboutDlg::OnOK( wxCommandEvent& event )\r
+{\r
+    this->EndModal(wxID_OK);\r
+}\r
+\r
index d434ea3f3551c7ec997bcd36d04dc291e15e21b2..563428a614ff3678075e1afe6b7d047d8c0da707 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef __ABOUT_DIALOG__\r
 #define __ABOUT_DIALOG__\r
 \r
-#include "topFrame.h"\r
+#include "fdmdv2_main.h"\r
 \r
 class AboutDlg : public DlgAbout\r
 {\r
@@ -23,6 +23,8 @@ class AboutDlg : public DlgAbout
     public:\r
         /** Constructor */\r
         AboutDlg( wxWindow* parent );\r
+        void ExchangeData(int inout);\r
+        void OnOK( wxCommandEvent& event );\r
 \r
 };\r
 \r
index e7870224dad0ecd16171e7e0ce42a7633d5a07ac..8b732b7075f9cc1a420d6ceba2b8b62446cebdbe 100644 (file)
@@ -16,7 +16,6 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 AudioDlg::AudioDlg( wxWindow* parent ) : DlgAudio( parent )\r
 {\r
-\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -24,7 +23,7 @@ AudioDlg::AudioDlg( wxWindow* parent ) : DlgAudio( parent )
 //-------------------------------------------------------------------------\r
 void AudioDlg::OnCancel( wxCommandEvent& event )\r
 {\r
-    this->EndModal(wxID_OK);\r
+    this->EndModal(wxID_CANCEL);\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -40,7 +39,7 @@ void AudioDlg::OnOK( wxCommandEvent& event )
 //-------------------------------------------------------------------------\r
 void AudioDlg::OnApply( wxCommandEvent& event )\r
 {\r
-    this->EndModal(wxID_OK);\r
+    ExchangeData(EXCHANGE_DATA_OUT);\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -56,10 +55,40 @@ void AudioDlg::OnClose( wxCloseEvent& event )
 //-------------------------------------------------------------------------\r
 void AudioDlg::OnInitDialog( wxInitDialogEvent& event )\r
 {\r
-    //wxMessageBox(wxT("got OnInitDialog()"), wxT("Select"), wxOK);\r
+    ExchangeData(EXCHANGE_DATA_IN);\r
     populateAudioInfo();\r
 }\r
 \r
+//-------------------------------------------------------------------------\r
+// ExchangeData()\r
+//-------------------------------------------------------------------------\r
+void AudioDlg::ExchangeData(int inout)\r
+{\r
+    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    if(inout == EXCHANGE_DATA_IN)\r
+    {\r
+        m_textRxInput->SetValue(wxGetApp().m_strRxInAudio);\r
+        m_textTxOutput->SetValue(wxGetApp().m_strRxOutAudio);\r
+        m_textVoiceInput->SetValue(wxGetApp().m_textVoiceInput);\r
+        m_textVoiceOutput->SetValue(wxGetApp().m_textVoiceOutput);\r
+    }\r
+    if(inout == EXCHANGE_DATA_OUT)\r
+    {\r
+        wxGetApp().m_strRxInAudio    = m_textRxInput->GetValue();\r
+        wxGetApp().m_strRxOutAudio   = m_textTxOutput->GetValue();\r
+        wxGetApp().m_textVoiceInput  = m_textVoiceInput->GetValue();\r
+        wxGetApp().m_textVoiceOutput = m_textVoiceOutput->GetValue();\r
+\r
+        pConfig->Write(wxT("/Audio/RxIn"),          wxGetApp().m_strRxInAudio);\r
+        pConfig->Write(wxT("/Audio/RxOut"),         wxGetApp().m_strRxOutAudio);\r
+        pConfig->Write(wxT("/Audio/TxIn"),          wxGetApp().m_textVoiceInput);\r
+        pConfig->Write(wxT("/Audio/TxOut"),         wxGetApp().m_textVoiceOutput);\r
+        pConfig->Write(wxT("/Audio/SampleRate"),    wxGetApp().m_strSampleRate);\r
+        pConfig->Flush();\r
+    }\r
+    delete wxConfigBase::Set((wxConfigBase *) NULL);\r
+}\r
+\r
 //-------------------------------------------------------------------------\r
 // OnRxInputSelect()\r
 //-------------------------------------------------------------------------\r
index d994d6bb798a0f78e4f799ba25ae2919c435c30c..d62593e0481a064b11fb830e8901b121f7cd842d 100644 (file)
@@ -12,8 +12,7 @@
 #ifndef __AUDIO_DIALOG__\r
 #define __AUDIO_DIALOG__\r
 \r
-#include <wx/wx.h>
-#include "topFrame.h"\r
+#include "fdmdv2_main.h"\r
 \r
 #include "portaudio.h"
 #include "portaudiocpp/PortAudioCpp.hxx"
@@ -42,6 +41,7 @@ class AudioDlg : public DlgAudio
         void OnTxOutputSelect( wxCommandEvent& event );\r
         void OnVoiceInputSelect( wxCommandEvent& event );\r
         void OnVoiceOutputSelect( wxCommandEvent& event );\r
+        void ExchangeData(int inout);\r
 };\r
 \r
 #endif // __AUDIO_DIALOG__\r
index df73ae687c8a11e59bbe5ca932e6d53cc6bfb5f2..e89adb577d0b46a9023a2d55263e0d1c5aaca1f0 100644 (file)
@@ -16,7 +16,86 @@ ComPortsDlg::ComPortsDlg( wxWindow* parent ) : DlgComPorts( parent )
 {\r
 }\r
 \r
+//-------------------------------------------------------------------------\r
+// OnListItemSelected()\r
+//-------------------------------------------------------------------------\r
 void ComPortsDlg::OnListItemSelected( wxListEvent& event )\r
 {\r
     // TODO: Implement OnListItemSelected\r
 }\r
+\r
+//-------------------------------------------------------------------------\r
+// ExchangeData()\r
+//-------------------------------------------------------------------------\r
+void ComPortsDlg::ExchangeData(int inout)\r
+{\r
+    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    if(inout == EXCHANGE_DATA_IN)\r
+    {\r
+        m_textRigCtrlPort->SetValue(wxGetApp().m_strRigCtrlPort);\r
+        m_textRigCtrlBaud->SetValue(wxGetApp().m_strRigCtrlBaud);\r
+        m_textRigCtrlDatabits->SetValue(wxGetApp().m_strRigCtrlDatabits);\r
+        m_textRigCtrlStopbits->SetValue(wxGetApp().m_strRigCtrlStopbits);\r
+        m_textRigCtrlParity->SetValue(wxGetApp().m_strRigCtrlParity);\r
+    }\r
+    if(inout == EXCHANGE_DATA_OUT)\r
+    {\r
+        wxGetApp().m_strRigCtrlPort             = m_textRigCtrlPort->GetValue();\r
+        wxGetApp().m_strRigCtrlBaud             = m_textRigCtrlBaud->GetValue();\r
+        wxGetApp().m_strRigCtrlDatabits         = m_textRigCtrlDatabits->GetValue();\r
+        wxGetApp().m_strRigCtrlStopbits         = m_textRigCtrlStopbits->GetValue();\r
+        wxGetApp().m_strRigCtrlParity           = m_textRigCtrlParity->GetValue();\r
+\r
+        pConfig->Write(wxT("/Rig/Port"),        wxGetApp().m_strRigCtrlPort);\r
+        pConfig->Write(wxT("/Rig/Baud"),        wxGetApp().m_strRigCtrlBaud);\r
+        pConfig->Write(wxT("/Rig/DataBits"),    wxGetApp().m_strRigCtrlDatabits);\r
+        pConfig->Write(wxT("/Rig/StopBits"),    wxGetApp().m_strRigCtrlStopbits);\r
+        pConfig->Write(wxT("/Rig/Parity"),      wxGetApp().m_strRigCtrlParity);\r
+        //m_textRigCtrlFlowControl\r
+\r
+        pConfig->Flush();\r
+    }\r
+    delete wxConfigBase::Set((wxConfigBase *) NULL);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnCancel()\r
+//-------------------------------------------------------------------------\r
+void ComPortsDlg::OnCancel( wxCommandEvent& event )\r
+{\r
+    this->EndModal(wxID_CANCEL);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnOK()\r
+//-------------------------------------------------------------------------\r
+void ComPortsDlg::OnOK( wxCommandEvent& event )\r
+{\r
+    this->EndModal(wxID_OK);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnApply()\r
+//-------------------------------------------------------------------------\r
+void ComPortsDlg::OnApply( wxCommandEvent& event )\r
+{\r
+    ExchangeData(EXCHANGE_DATA_OUT);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnClose()\r
+//-------------------------------------------------------------------------\r
+void ComPortsDlg::OnClose( wxCloseEvent& event )\r
+{\r
+    this->EndModal(wxID_OK);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnInitDialog()\r
+//-------------------------------------------------------------------------\r
+void ComPortsDlg::OnInitDialog( wxInitDialogEvent& event )\r
+{\r
+    ExchangeData(EXCHANGE_DATA_IN);\r
+//    populateAudioInfo();\r
+}\r
+\r
index c9b82a49abd1474de6ebd33952ab9f08892c2f28..3e949b041ab4b30ee22097fa08d45c1bcbdb19d5 100644 (file)
 #ifndef __COMPORTS_DIALOG__\r
 #define __COMPORTS_DIALOG__\r
 \r
-#include "topFrame.h"\r
+#include "fdmdv2_main.h"\r
 \r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 // Class ComPortsDlg\r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 class ComPortsDlg : public DlgComPorts\r
 {\r
-    protected:\r
-        // Handlers for events.\r
-        void OnListItemSelected( wxListEvent& event );\r
     public:\r
         /** Constructor */\r
         ComPortsDlg( wxWindow* parent );\r
+        void ExchangeData(int inout);\r
+\r
+    protected:\r
+        // Handlers for events.\r
+        void OnListItemSelected( wxListEvent& event );\r
+        void OnCancel( wxCommandEvent& event );\r
+        void OnOK( wxCommandEvent& event );\r
+        void OnClose( wxCloseEvent& event );\r
+        void OnInitDialog( wxInitDialogEvent& event );\r
+        void OnApply( wxCommandEvent& event );\r
+\r
 };\r
 \r
 #endif // __COMPORTS_DIALOG__\r
index 77d3ec201d40c695dd90e33c2293540717483b0a..ecfcdfc6111b53cd0368e5a25aa22026e45baae6 100644 (file)
@@ -18,12 +18,74 @@ OptionsDlg::OptionsDlg( wxWindow* parent ) : DlgOptions( parent )
 {\r
 }\r
 \r
+//-------------------------------------------------------------------------\r
+// OnClose()\r
+//-------------------------------------------------------------------------\r
 void OptionsDlg::OnClose( wxCloseEvent& event )\r
 {\r
-// TODO: Implement OnClose\r
 }\r
 \r
+//-------------------------------------------------------------------------\r
+// OnInitDialog()\r
+//-------------------------------------------------------------------------\r
 void OptionsDlg::OnInitDialog( wxInitDialogEvent& event )\r
 {\r
-// TODO: Implement OnInitDialog\r
+    ExchangeData(EXCHANGE_DATA_IN);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// ExchangeData()\r
+//-------------------------------------------------------------------------\r
+void OptionsDlg::ExchangeData(int inout)\r
+{\r
+//    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    if(inout == EXCHANGE_DATA_IN)\r
+    {\r
+//        m_textRigCtrlPort->SetValue(wxGetApp().m_strRigCtrlPort);\r
+//        m_textRigCtrlBaud->SetValue(wxGetApp().m_strRigCtrlBaud);\r
+//        m_textRigCtrlDatabits->SetValue(wxGetApp().m_strRigCtrlDatabits);\r
+//        m_textRigCtrlStopbits->SetValue(wxGetApp().m_strRigCtrlStopbits);\r
+//        m_textRigCtrlParity->SetValue(wxGetApp().m_strRigCtrlParity);\r
+    }\r
+    if(inout == EXCHANGE_DATA_OUT)\r
+    {\r
+//        wxGetApp().m_strRigCtrlPort             = m_textRigCtrlPort->GetValue();\r
+//        wxGetApp().m_strRigCtrlBaud             = m_textRigCtrlBaud->GetValue();\r
+//        wxGetApp().m_strRigCtrlDatabits         = m_textRigCtrlDatabits->GetValue();\r
+//        wxGetApp().m_strRigCtrlStopbits         = m_textRigCtrlStopbits->GetValue();\r
+//        wxGetApp().m_strRigCtrlParity           = m_textRigCtrlParity->GetValue();\r
+\r
+//        pConfig->Write(wxT("/Rig/Port"),        wxGetApp().m_strRigCtrlPort);\r
+//        pConfig->Write(wxT("/Rig/Baud"),        wxGetApp().m_strRigCtrlBaud);\r
+//        pConfig->Write(wxT("/Rig/DataBits"),    wxGetApp().m_strRigCtrlDatabits);\r
+//        pConfig->Write(wxT("/Rig/StopBits"),    wxGetApp().m_strRigCtrlStopbits);\r
+//        pConfig->Write(wxT("/Rig/Parity"),      wxGetApp().m_strRigCtrlParity);\r
+\r
+//        pConfig->Flush();\r
+    }\r
+//    delete wxConfigBase::Set((wxConfigBase *) NULL);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnCancel()\r
+//-------------------------------------------------------------------------\r
+void OptionsDlg::OnCancel( wxCommandEvent& event )\r
+{\r
+    this->EndModal(wxID_CANCEL);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnOK()\r
+//-------------------------------------------------------------------------\r
+void OptionsDlg::OnOK( wxCommandEvent& event )\r
+{\r
+    this->EndModal(wxID_OK);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnApply()\r
+//-------------------------------------------------------------------------\r
+void OptionsDlg::OnApply( wxCommandEvent& event )\r
+{\r
+    ExchangeData(EXCHANGE_DATA_OUT);\r
 }\r
index 2d93eae9d9a70f5ab136dd83135ed29be2d1092c..0d30f3bcc3e8a6d0572028837511ed04d91f3fcc 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef __OPTIONS_DIALOG__\r
 #define __OPTIONS_DIALOG__\r
 \r
-#include "topFrame.h"\r
+#include "fdmdv2_main.h"\r
 \r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 // Class OptionsDlg\r
@@ -26,6 +26,10 @@ class OptionsDlg : public DlgOptions
     public:\r
         /** Constructor */\r
         OptionsDlg( wxWindow* parent );\r
+        void ExchangeData(int inout);\r
+        void OnCancel( wxCommandEvent& event );\r
+        void OnOK( wxCommandEvent& event );\r
+        void OnApply( wxCommandEvent& event );\r
 };\r
 \r
 #endif // __OPTIONS_DIALOG__\r
index 0bbf15a910db5d02e3e56e1ca431f5138703bf55..d585f6bfcbc76a5aa8e1eb3427b0b24bee9b8c27 100644 (file)
@@ -31,7 +31,6 @@
 #define wxUSE_PCX       1\r
 #define wxUSE_LIBTIFF   1\r
 \r
-//float  av_mag[FDMDV_NSPEC];                  // shared between a few classes
 // initialize the application\r
 IMPLEMENT_APP(MainApp);\r
 \r
@@ -44,10 +43,19 @@ bool MainApp::OnInit()
     {\r
         return false;\r
     }\r
-    if(!loadConfig())\r
-    {\r
-        wxMessageBox(wxT("Unable to open configuration data.  Create New?"), wxT("Configuration"), wxYES_NO | wxCANCEL);\r
-    }\r
+    SetVendorName(wxT("CODEC2-Project"));\r
+    SetAppName(wxT("FDMDV2"));      // not needed, it's the default value\r
+\r
+    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    pConfig->SetRecordDefaults();\r
+\r
+    m_rTopWindow = wxRect(0, 0, 0, 0);\r
+    m_strRxInAudio.Empty();
+    m_strRxOutAudio.Empty();
+    m_textVoiceInput.Empty();
+    m_textVoiceOutput.Empty();\r
+    m_strSampleRate.Empty();\r
+    m_strBitrate.Empty();\r
     // Create the main application window\r
     MainFrame *frame = new MainFrame(NULL);\r
     SetTopWindow(frame);\r
@@ -60,33 +68,11 @@ bool MainApp::OnInit()
 }\r
 \r
 //-------------------------------------------------------------------------\r
-// loadConfig()\r
+// OnExit()\r
 //-------------------------------------------------------------------------\r
-bool MainApp::loadConfig()\r
+int MainApp::OnExit()\r
 {\r
-    g_config = new wxConfig("FDMDV2");\r
-    wxString str;\r
-    if(g_config->Read("LastPrompt", &str))\r
-    {\r
-        // last prompt was found in the config file/registry and its value is\r
-        // now in str\r
-        // ...\r
-    }\r
-    else\r
-    {\r
-        // no last prompt...\r
-    }\r
-    // another example: using default values and the full path instead of just\r
-    // key name: if the key is not found , the value 17 is returned\r
-    long value = g_config->ReadLong("/LastRun/CalculatedValues/MaxValue", 17);\r
-\r
-    // at the end of the program we would save everything back\r
-    g_config->Write("LastPrompt", str);\r
-    g_config->Write("/LastRun/CalculatedValues/MaxValue", value);\r
-\r
-    // the changes will be written back automatically\r
-    delete g_config;\r
-    return true;\r
+    return 0;\r
 }\r
 \r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
@@ -109,6 +95,15 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
     {\r
         wxMessageBox(wxT("Port Audio failed to initialize"), wxT("Pa_Initialize"), wxOK);\r
     }\r
+\r
+    tools->AppendSeparator();\r
+    wxMenuItem* m_menuItemToolsConfigDelete;\r
+       m_menuItemToolsConfigDelete = new wxMenuItem( tools, wxID_ANY, wxString( _("&Delete stored config") ) , wxT("Delete config file/keys"), wxITEM_NORMAL );\r
+    this->Connect( m_menuItemToolsConfigDelete->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnDeleteConfig));\r
+\r
+       tools->Append( m_menuItemToolsConfigDelete );\r
+\r
+\r
     // Add Waterfall Plot window\r
     m_panelWaterfall = new PlotWaterfall((wxFrame*) m_auiNbookCtrl );\r
     m_auiNbookCtrl->AddPage(m_panelWaterfall, _("Waterfall"), true, wxNullBitmap );\r
@@ -126,17 +121,38 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
     // Add generic plot window\r
     m_panelDefaultA = new PlotPanel((wxFrame*) m_auiNbookCtrl );\r
     m_auiNbookCtrl->AddPage(m_panelDefaultA, _("Test A"), true, wxNullBitmap );\r
+\r
+    wxConfigBase *pConfig = wxConfigBase::Get();\r
+\r
+    // restore frame position and size\r
+    int x = pConfig->Read(wxT("/MainFrame/top"),       50);\r
+    int y = pConfig->Read(wxT("/MainFrame/left"),      50);\r
+    int w = pConfig->Read(wxT("/MainFrame/width"),     650);\r
+    int h = pConfig->Read(wxT("/MainFrame/height"),    400);\r
+    Move(x, y);\r
+    SetClientSize(w, h);\r
+\r
+    wxGetApp().m_strRxInAudio       = pConfig->Read(wxT("/Audio/RxIn"),         wxT("<m_strRxInAudio>"));\r
+    wxGetApp().m_strRxOutAudio      = pConfig->Read(wxT("/Audio/RxOut"),        wxT("<m_strRxOutAudio>"));\r
+    wxGetApp().m_textVoiceInput     = pConfig->Read(wxT("/Audio/TxIn"),         wxT("<m_textVoiceInput>"));\r
+    wxGetApp().m_textVoiceOutput    = pConfig->Read(wxT("/Audio/TxOut"),        wxT("<m_textVoiceOutput>"));\r
+    wxGetApp().m_strSampleRate      = pConfig->Read(wxT("/Audio/SampleRate"),   wxT("48000"));\r
+    wxGetApp().m_strSampleRate      = pConfig->Read(wxT("/Audio/SampleRate"),   wxT("48000"));\r
+    wxGetApp().m_strSampleRate      = pConfig->Read(wxT("/Audio/SampleRate"),   wxT("48000"));\r
+\r
+    wxGetApp().m_strRigCtrlPort     = pConfig->Read("/Rig/Port",                wxT("\\\\.\\com1"));\r
+    wxGetApp().m_strRigCtrlBaud     = pConfig->Read("/Rig/Baud",                wxT("9600"));\r
+    wxGetApp().m_strRigCtrlDatabits = pConfig->Read("/Rig/DataBits",            wxT("8"));\r
+    wxGetApp().m_strRigCtrlStopbits = pConfig->Read("/Rig/StopBits",            wxT("1"));\r
+    wxGetApp().m_strRigCtrlParity   = pConfig->Read("/Rig/Parity",              wxT("n"));\r
+\r
+    pConfig->SetPath(wxT("/"));\r
+\r
 #ifdef USE_TIMER\r
     m_rxPa = new PortAudioWrap();\r
-    double f = 0.0;\r
     for(int i = 0; i < FDMDV_NSPEC; i++)\r
     {\r
-//        m_rxPa->m_av_mag[i] = sin(i) * 100.0;\r
-        f = ((double)i / M_PI);\r
-        f = sin(f);\r
-        f = 100 * f;\r
-//        f = f - 50;\r
-        m_rxPa->m_av_mag[i] = f;\r
+        m_rxPa->m_av_mag[i] = sin(((double)i / M_PI)) * 100.0;\r
     }\r
     Bind(wxEVT_TIMER, &MainFrame::OnTimer, this);       // ID_MY_WINDOW);\r
     m_plotTimer.SetOwner(this, ID_TIMER_WATERFALL);
@@ -149,6 +165,34 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
 //-------------------------------------------------------------------------\r
 MainFrame::~MainFrame()\r
 {\r
+    int x;\r
+    int y;\r
+    int w;\r
+    int h;\r
+\r
+    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    if(pConfig)\r
+    {\r
+        GetClientSize(&w, &h);\r
+        GetPosition(&x, &y);\r
+        pConfig->Write(wxT("/MainFrame/top"),       (long) x);\r
+        pConfig->Write(wxT("/MainFrame/left"),      (long) y);\r
+        pConfig->Write(wxT("/MainFrame/width"),     (long) w);\r
+        pConfig->Write(wxT("/MainFrame/height"),    (long) h);\r
+\r
+        pConfig->Write(wxT("/Audio/RxIn"),          wxGetApp().m_strRxInAudio);\r
+        pConfig->Write(wxT("/Audio/RxOut"),         wxGetApp().m_strRxOutAudio);\r
+        pConfig->Write(wxT("/Audio/TxIn"),          wxGetApp().m_textVoiceInput);\r
+        pConfig->Write(wxT("/Audio/TxOut"),         wxGetApp().m_textVoiceOutput);\r
+        pConfig->Write(wxT("/Audio/SampleRate"),    wxGetApp().m_strSampleRate);\r
+\r
+        pConfig->Write(wxT("/Rig/Port"),            wxGetApp().m_strRigCtrlPort);\r
+        pConfig->Write(wxT("/Rig/Baud"),            wxGetApp().m_strRigCtrlBaud);\r
+        pConfig->Write(wxT("/Rig/DataBits"),        wxGetApp().m_strRigCtrlDatabits);\r
+        pConfig->Write(wxT("/Rig/StopBits"),        wxGetApp().m_strRigCtrlStopbits);\r
+        pConfig->Write(wxT("/Rig/Parity"),          wxGetApp().m_strRigCtrlParity);\r
+\r
+    }\r
 #ifdef USE_TIMER\r
     if (m_plotTimer.IsRunning())\r
     {\r
@@ -156,23 +200,22 @@ MainFrame::~MainFrame()
         Unbind(wxEVT_TIMER, &MainFrame::OnTimer, this);   // ID_MY_WINDOW);\r
     }
 #endif\r
+    delete wxConfigBase::Set((wxConfigBase *) NULL);\r
 }
 \r
 #ifdef USE_TIMER\r
-//static int cnt = 3;\r
 \r
 //----------------------------------------------------------------\r
 // OnTimer()\r
 //----------------------------------------------------------------\r
 void MainFrame::OnTimer(wxTimerEvent &evt)\r
 {\r
-//    cnt--;\r
     m_panelWaterfall->m_newdata = true;\r
     m_panelWaterfall->Refresh();\r
     m_panelSpectrum->m_newdata = true;\r
     m_panelSpectrum->Refresh();\r
 //    m_panelDefaultA->m_newdata = true;\r
-//     m_panelDefaultA->Refresh();\r
+//    m_panelDefaultA->Refresh();\r
 }\r
 #endif\r
 \r
@@ -195,7 +238,26 @@ void MainFrame::OnExitClick(wxCommandEvent& event)
 }\r
 \r
 //-------------------------------------------------------------------------\r
-// Onpa->Paint()\r
+// OnDeleteConfig()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnDeleteConfig(wxCommandEvent&)\r
+{\r
+    wxConfigBase *pConfig = wxConfigBase::Get();\r
+    if(pConfig->DeleteAll() )\r
+    {\r
+        wxLogMessage(wxT("Config file/registry key successfully deleted."));\r
+\r
+        delete wxConfigBase::Set(NULL);\r
+        wxConfigBase::DontCreateOnDemand();\r
+    }\r
+    else\r
+    {\r
+        wxLogError(wxT("Deleting config file/registry key failed."));\r
+    }\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// Paint()\r
 //-------------------------------------------------------------------------\r
 void MainFrame::OnPaint(wxPaintEvent& WXUNUSED(event))\r
 {\r
@@ -237,7 +299,7 @@ void MainFrame::OnSliderScrollTop(wxScrollEvent& event)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnSliderScrollBottom(wxScrollEvent& event)\r
 {\r
-    wxMessageBox(wxT("Got Click!"), wxT("OnSliderScrollBottom"), wxOK);\r
+//    wxMessageBox(wxT("Got Click!"), wxT("OnSliderScrollBottom"), wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -273,7 +335,7 @@ void MainFrame::OnTogBtnTXClick(wxCommandEvent& event)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnTogBtnRxID(wxCommandEvent& event)\r
 {\r
-    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnRxID"), wxOK);\r
+//    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnRxID"), wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -282,7 +344,7 @@ void MainFrame::OnTogBtnRxID(wxCommandEvent& event)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnTogBtnTxID(wxCommandEvent& event)\r
 {\r
-    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnTxID"), wxOK);\r
+//    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnTxID"), wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -291,7 +353,7 @@ void MainFrame::OnTogBtnTxID(wxCommandEvent& event)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnTogBtnSplitClick(wxCommandEvent& event)\r
 {\r
-    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnSplitClick"), wxOK);\r
+//    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnSplitClick"), wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -300,7 +362,7 @@ void MainFrame::OnTogBtnSplitClick(wxCommandEvent& event)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnTogBtnAnalogClick (wxCommandEvent& event)\r
 {\r
-    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnAnalogClick"), wxOK);\r
+//    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnAnalogClick"), wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -309,7 +371,7 @@ void MainFrame::OnTogBtnAnalogClick (wxCommandEvent& event)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnTogBtnALCClick(wxCommandEvent& event)\r
 {\r
-    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnALCClick"), wxOK);\r
+//    wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnALCClick"), wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -554,7 +616,7 @@ void MainFrame::OnExit( wxCommandEvent& event )
 //-------------------------------------------------------------------------\r
 void MainFrame::OnCopy( wxCommandEvent& event )\r
 {\r
-    wxMessageBox("Got Click!", "OnCopy", wxOK);\r
+//    wxMessageBox("Got Click!", "OnCopy", wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -570,7 +632,7 @@ void MainFrame::OnCopyUpdateUI( wxUpdateUIEvent& event )
 //-------------------------------------------------------------------------\r
 void MainFrame::OnCut( wxCommandEvent& event )\r
 {\r
-    wxMessageBox("Got Click!", "OnCut", wxOK);\r
+//    wxMessageBox("Got Click!", "OnCut", wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -586,7 +648,7 @@ void MainFrame::OnCutUpdateUI( wxUpdateUIEvent& event )
 //-------------------------------------------------------------------------\r
 void MainFrame::OnPaste( wxCommandEvent& event )\r
 {\r
-    wxMessageBox("Got Click!", "Onpa->te", wxOK);\r
+//    wxMessageBox("Got Click!", "OnPaste", wxOK);\r
     event.Skip();\r
 }\r
 \r
@@ -597,22 +659,6 @@ void MainFrame::OnPasteUpdateUI( wxUpdateUIEvent& event )
 {\r
 }\r
 \r
-//-------------------------------------------------------------------------\r
-// OnToolsOptions()\r
-//-------------------------------------------------------------------------\r
-void MainFrame::OnToolsOptions( wxCommandEvent& event )\r
-{\r
-    OptionsDlg *dlg = new OptionsDlg(NULL);\r
-    dlg->ShowModal();\r
-}\r
-\r
-//-------------------------------------------------------------------------\r
-// OnToolsOptionsUI()\r
-//-------------------------------------------------------------------------\r
-void MainFrame::OnToolsOptionsUI( wxUpdateUIEvent& event )\r
-{\r
-}\r
-\r
 //-------------------------------------------------------------------------\r
 // OnCaptureRxStream()\r
 //-------------------------------------------------------------------------\r
@@ -662,8 +708,14 @@ void MainFrame::OnPlayAudioFile( wxCommandEvent& event )
 //-------------------------------------------------------------------------\r
 void MainFrame::OnToolsAudio( wxCommandEvent& event )\r
 {\r
+    int rv = 0;\r
     AudioDlg *dlg = new AudioDlg(NULL);\r
-    dlg->ShowModal();\r
+    rv = dlg->ShowModal();\r
+    if(rv == wxID_OK)\r
+    {\r
+        dlg->ExchangeData(EXCHANGE_DATA_OUT);\r
+    }\r
+    delete dlg;\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -678,8 +730,14 @@ void MainFrame::OnToolsAudioUI( wxUpdateUIEvent& event )
 //-------------------------------------------------------------------------\r
 void MainFrame::OnToolsComCfg( wxCommandEvent& event )\r
 {\r
+    int rv = 0;\r
     ComPortsDlg *dlg = new ComPortsDlg(NULL);\r
-    dlg->ShowModal();\r
+    rv = dlg->ShowModal();\r
+    if(rv == wxID_OK)\r
+    {\r
+        dlg->ExchangeData(EXCHANGE_DATA_OUT);\r
+    }\r
+    delete dlg;\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -690,6 +748,28 @@ void MainFrame::OnToolsComCfgUI( wxUpdateUIEvent& event )
     event.Enable((!m_TxRunning) && (!m_RxRunning));\r
 }\r
 \r
+//-------------------------------------------------------------------------\r
+// OnToolsOptions()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnToolsOptions( wxCommandEvent& event )\r
+{\r
+    int rv = 0;\r
+    OptionsDlg *dlg = new OptionsDlg(NULL);\r
+    rv = dlg->ShowModal();\r
+    if(rv == wxID_OK)\r
+    {\r
+        dlg->ExchangeData(EXCHANGE_DATA_OUT);\r
+    }\r
+    delete dlg;\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnToolsOptionsUI()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnToolsOptionsUI( wxUpdateUIEvent& event )\r
+{\r
+}\r
+\r
 //-------------------------------------------------------------------------\r
 // OnHelpCheckUpdates()\r
 //-------------------------------------------------------------------------\r
@@ -711,8 +791,14 @@ void MainFrame::OnHelpCheckUpdatesUI( wxUpdateUIEvent& event )
 //-------------------------------------------------------------------------\r
 void MainFrame::OnHelpAbout( wxCommandEvent& event )\r
 {\r
-    AboutDlg *dlg = new AboutDlg(NULL);\r
-    dlg->ShowModal();\r
+    int rv = 0;\r
+//    AboutDlg *dlg = new AboutDlg(NULL);\r
+//    rv = dlg->ShowModal();\r
+//    if(rv == wxID_OK)\r
+//    {\r
+//        dlg->ExchangeData(EXCHANGE_DATA_OUT);\r
+//    }\r
+//    delete dlg;\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -739,6 +825,7 @@ wxString MainFrame::LoadUserImage(wxImage& image)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnSave(wxCommandEvent& WXUNUSED(event))\r
 {\r
+/*\r
     wxString savefilename = wxFileSelector(wxT("Save Sound File"),\r
                                            wxEmptyString,\r
                                            wxEmptyString,\r
@@ -762,7 +849,8 @@ void MainFrame::OnSave(wxCommandEvent& WXUNUSED(event))
         // (it may fail if the extension is not recognized):\r
         //image.SaveFile(savefilename);\r
     }\r
-}\r
+*/\r
+ }\r
 
 //-------------------------------------------------------------------------\r
 // rxCallback()\r
index 7c3543c0ed3f3460fd07bdd644e91f319e7542f6..f687e8c1bf48a60860f642fcbf382b5aa13b0c70 100644 (file)
 
 #include <wx/wx.h>\r
 
+#include <wx/app.h>\r
 #include "wx/rawbmp.h"\r
 #include "wx/file.h"
-#include "wx/config.h"\r
 #include "wx/filename.h"
+#include "wx/config.h"\r
+#include <wx/fileconf.h>\r
 #include "wx/graphics.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"
@@ -52,6 +54,9 @@ enum {
         ID_TIMER_SCALAR\r
     };\r
 \r
+#define EXCHANGE_DATA_IN    0\r
+#define EXCHANGE_DATA_OUT   1\r
+\r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 // Class MainApp\r
 //\r
@@ -65,14 +70,37 @@ enum {
 class MainApp : public wxApp
 {
     public:
-        virtual bool OnInit();
-        virtual int OnExit()
-        {
-            return 0;
-        }
-        bool loadConfig();\r
+        virtual bool        OnInit();
+        virtual int         OnExit();
+\r
+        wxString            m_strVendName;\r
+        wxString            m_StrAppName;\r
+\r
+        wxRadioButton       m_radioBtnPortAudio;\r
+        wxRadioButton       m_radioBtnFileOnly;\r
+\r
+        wxString            m_textNumChOut;\r
+        wxString            m_textNumChIn;\r
+\r
+        wxString            m_strRxInAudio;
+        wxString            m_strRxOutAudio;
+        wxString            m_textVoiceInput;
+        wxString            m_textVoiceOutput;\r
+        wxString            m_strSampleRate;\r
+        wxString            m_strBitrate;\r
+\r
+        wxString            m_strRigCtrlPort;\r
+        wxString            m_strRigCtrlBaud;\r
+        wxString            m_strRigCtrlDatabits;\r
+        wxString            m_strRigCtrlStopbits;\r
+        wxString            m_strRigCtrlParity;\r
+\r
+        wxRect              m_rTopWindow;\r
+
+        bool                loadConfig();\r
+        bool                saveConfig();\r
+\r
     protected:\r
-        wxConfig *g_config;\r
 };
 
 // declare global static function wxGetApp()
@@ -148,6 +176,7 @@ class MainFrame : public TopFrame
         // protected event handlers
         virtual void OnCloseFrame(wxCloseEvent& event);
         virtual void OnExitClick(wxCommandEvent& event);
+        //void OnQuit(wxCommandEvent& event);\r
 
         void averageData(float mag_dB[]);\r
         void startTxStream();\r
@@ -203,6 +232,8 @@ class MainFrame : public TopFrame
         void OnSize( wxSizeEvent& event );
         void OnUpdateUI( wxUpdateUIEvent& event );
         void OnTimer(wxTimerEvent &evt);\r
+\r
+        void OnDeleteConfig(wxCommandEvent&);\r
 
         wxString LoadUserImage(wxImage& image);
 
@@ -210,7 +241,7 @@ class MainFrame : public TopFrame
         bool CreateSound(wxSound& snd) const;
         wxString    m_soundFile;
 #ifdef __WXMSW__
-        wxString    m_soundRes;
+//        wxString    m_soundRes;
 #endif // __WXMSW__
         bool        m_useMemory;
         wxTextCtrl* m_tc;
index 574e5939b9a94893200b341d6d3a6922422d57f8..2f00db633bb8afb43824192a1aaba1ba7dc60dc9 100644 (file)
 #include "codec2.h"
 #include "portaudio.h"
 
-// Note that many of the older ISA sound cards on PCs do NOT support
-// full duplex audio (simultaneous record and playback).
-// And some only support full duplex at lower sample rates.
-//#define SAMPLE_RATE         (44100)
-//
 #define PA_SAMPLE_TYPE      paFloat32       //paInt16
 #define FRAMES_PER_BUFFER   (64)
 
index d66c76a0abd8159e66c41b45f5b68bc2c52acf85..4bcce60cd469cb8b1e17dea4225fceca387dc4fd 100644 (file)
@@ -119,17 +119,7 @@ void PlotPanel::OnSize(wxSizeEvent& event)
             m_oImage.Rescale(m_rCtrl.GetWidth(), m_rCtrl.GetHeight());\r
         }\r
         m_pBmp = new wxBitmap(m_oImage, wxBITMAP_SCREEN_DEPTH);
-/*\r
-        if(m_oImage.IsOk())\r
-        {\r
-            m_oImage.Destroy();\r
-        }\r
-        m_oImage.Create(m_rCtrl.GetWidth(), m_rCtrl.GetHeight(), true);\r
-        m_pBmp = new wxBitmap(m_oImage, wxBITMAP_SCREEN_DEPTH);
-        m_oImage.Rescale(m_rCtrl.GetWidth(), m_rCtrl.GetHeight());\r
-*/\r
         m_firstPass = true;\r
-//        this->Refresh();\r
     }\r
 }\r
 \r
index 55a287821fab0e77a54df30d48dfb61e287ea753..2cb9f15551835e01b67b232a9e05ff7addf839a4 100644 (file)
 \r
 #define BLACK_COLOR         wxColor(0x00, 0x00, 0x00)\r
 #define GREY_COLOR          wxColor(0x80, 0x80, 0x80)\r
-#define DARK_GREY_COLOR     wxColor(0x60, 0x60, 0x60)\r
+#define DARK_GREY_COLOR     wxColor(0x40, 0x40, 0x40)\r
 #define MEDIUM_GREY_COLOR   wxColor(0xC0, 0xC0, 0xC0)\r
 #define LIGHT_GREY_COLOR    wxColor(0xE0, 0xE0, 0xE0)\r
 #define VERY_LTGREY_COLOR   wxColor(0xF8, 0xF8, 0xF8)\r
 #define WHITE_COLOR         wxColor(0xFF, 0xFF, 0xFF)\r
 \r
-#define DARK_BLUE_COLOR     wxColor(0x00, 0x00, 0x80)\r
+#define DARK_BLUE_COLOR     wxColor(0x00, 0x00, 0x60)\r
 #define BLUE_COLOR          wxColor(0x00, 0x00, 0xFF)\r
 #define LIGHT_BLUE_COLOR    wxColor(0x80, 0x80, 0xFF)\r
 \r
index d8717ccef44290a7162fc6dc7f15758977402243..8032f49483f4ac65d95f1ca6f72a3e89b10cb126 100644 (file)
@@ -34,9 +34,7 @@ BEGIN_EVENT_TABLE(PlotSpectrum, PlotPanel)
     EVT_LEFT_UP         (PlotSpectrum::OnMouseUp)\r
     EVT_MOUSEWHEEL      (PlotSpectrum::OnMouseWheelMoved)\r
     EVT_PAINT           (PlotSpectrum::OnPaint)\r
-    EVT_SIZE            (PlotSpectrum::OnSize)\r
     EVT_SHOW            (PlotSpectrum::OnShow)\r
-//    EVT_ERASE_BACKGROUND(PlotSpectrum::OnErase)\r
 END_EVENT_TABLE()\r
 \r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
@@ -124,37 +122,6 @@ void PlotSpectrum::draw(wxAutoBufferedPaintDC& pDC)
     m_mDC.SelectObject(wxNullBitmap);\r
 }
 \r
-//-------------------------------------------------------------------------\r
-// drawData()\r
-//-------------------------------------------------------------------------\r
-void PlotSpectrum::drawData()   //wxMemoryDC&  pDC)\r
-{\r
-    wxNativePixelData dPix = wxNativePixelData(*m_pBmp, m_rCtrl);\r
-    m_pPix = &dPix;\r
-    if(m_pPix == NULL)\r
-    {\r
-        return;\r
-    }\r
-    wxNativePixelData::Iterator p(*m_pPix);\r
-\r
-    int w = m_rPlot.GetWidth();\r
-    int h = m_rPlot.GetHeight();\r
-    p.Offset(*m_pPix, XLEFT_OFFSET + 3, h - (DATA_LINE_HEIGHT - 2));\r
-//    for(int y = 0; y < DATA_LINE_HEIGHT; ++y)\r
-//    {\r
-        wxNativePixelData::Iterator rowStart = p;\r
-        for(int x = 0; x < (w - 1); ++x, ++p)\r
-        {\r
-            p.OffsetX(*m_pPix, m_pTopFrame->m_rxPa->m_av_mag[x]);\r
-            p.Red()     = 0x00;     // m_pTopFrame->m_rxPa->m_av_mag[x];\r
-            p.Green()   = 0xFF;\r
-            p.Blue()    = 0x00;     // m_pTopFrame->m_rxPa->m_av_mag[x];\r
-        }\r
-        p = rowStart;\r
-//        p.OffsetY(*m_pPix, 1);\r
-//    }\r
-}\r
-\r
 //-------------------------------------------------------------------------\r
 // drawGraticule()\r
 //-------------------------------------------------------------------------\r
@@ -212,21 +179,6 @@ void PlotSpectrum::OnPaint(wxPaintEvent& event)
     draw(dc);\r
 }\r
 \r
-//----------------------------------------------------------------\r
-// OnSize()\r
-//----------------------------------------------------------------\r
-void PlotSpectrum::OnSize(wxSizeEvent& event)\r
-{\r
-    m_rCtrlPrev = m_rCtrl;\r
-    m_rCtrl     = GetClientRect();\r
-    if(m_use_bitmap)\r
-    {\r
-        m_firstPass = true;\r
-        m_pBmp = new wxBitmap(m_rCtrl.GetWidth(), m_rCtrl.GetHeight(), wxBITMAP_SCREEN_DEPTH);
-        this->Refresh();\r
-    }\r
-}\r
-\r
 //----------------------------------------------------------------\r
 // OnShow()\r
 //----------------------------------------------------------------\r
index 8e40a793c6097f4b5e9b85fb18a49ff32395bc31..dc524e65cbf23098afe3a8737c346660d1df40e2 100644 (file)
 class PlotSpectrum : public PlotPanel\r
 {
     public:
-//        PlotSpectrum(wxFrame* parent, int x, int y, int w, int h);
         PlotSpectrum(wxFrame* parent);
         ~PlotSpectrum();
-//        bool                m_newdata;\r
 \r
     protected:
         void        OnPaint(wxPaintEvent& event);\r
@@ -45,7 +43,6 @@ class PlotSpectrum : public PlotPanel
         void        OnShow(wxShowEvent& event);\r
         void        drawGraticule(wxAutoBufferedPaintDC&  dc);\r
         void        draw(wxAutoBufferedPaintDC&  dc);\r
-        void        drawData();     //wxMemoryDC&  pDC);\r
 
         DECLARE_EVENT_TABLE()\r
 };
index d6b4487bee090eec488c19823fa698966e3b422b..d4915304790e6d20b23138ccec821e02496067e2 100644 (file)
@@ -163,7 +163,7 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC& pDC)
         m_mDC.FloodFill(0, 0, VERY_LTGREY_COLOR);\r
 \r
         // Draw a filled rectangle with aborder\r
-        wxBrush ltGraphBkgBrush = wxBrush(LIGHT_BLUE_COLOR);\r
+        wxBrush ltGraphBkgBrush = wxBrush(DARK_BLUE_COLOR);\r
         m_mDC.SetBrush(ltGraphBkgBrush);\r
         m_mDC.SetPen(wxPen(BLACK_COLOR, 0));\r
         m_mDC.DrawRectangle(m_rPlot);\r
@@ -176,14 +176,12 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC& pDC)
         int t = m_rPlot.GetTop();\r
         int l = m_rPlot.GetLeft();\r
         int h = m_rPlot.GetHeight();\r
-//        int b = m_rPlot.GetBottom();\r
         int w = m_rPlot.GetWidth();\r
         int t2 = t + 1;\r
         int w2 = w - 1;\r
         int ht = (h - DATA_LINE_HEIGHT);\r
 \r
         drawData();     //  m_mDC, PLOT_BOTTOM);\r
-//        m_mDC.StretchBlit(l, t2, w2, ht, &m_mDC, l, t2 + DATA_LINE_HEIGHT, w2, ht - 2);\r
         m_mDC.StretchBlit(l, t2, w2, ht, &m_mDC, l, t2 + DATA_LINE_HEIGHT, w2, ht - 2);\r
 //        pDC.Blit(l, t, w, h, &m_mDC, l, t);                                                   // Scroll Up from Bottom\r
         pDC.StretchBlit(l, (h - t) + 4, w, (-h) + 4, &m_mDC, l, t, w, h);                       // Scroll Down from top\r
index d1f05cab6120952c66adb5a8294b4e0edc5bebfb..70122f583146f0ae332c7e6ac4579a3c2e2ae7b9 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////\r
-// C++ code generated with wxFormBuilder (version Mar 17 2012)\r
+// C++ code generated with wxFormBuilder (version Apr 10 2012)\r
 // http://www.wxformbuilder.org/\r
 //\r
 // PLEASE DO "NOT" EDIT THIS FILE!\r
@@ -14,62 +14,65 @@ TopFrame::TopFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
        this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
        this->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );\r
        this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );\r
-       \r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );\r
+\r
        m_menubarMain = new wxMenuBar( wxMB_DOCKABLE );\r
        file = new wxMenu();\r
        wxMenuItem* m_menuItemOpen;\r
        m_menuItemOpen = new wxMenuItem( file, ID_OPEN, wxString( _("&Open") ) , _("Open File"), wxITEM_NORMAL );\r
        file->Append( m_menuItemOpen );\r
-       \r
+\r
        wxMenuItem* m_menuItemSave;\r
        m_menuItemSave = new wxMenuItem( file, ID_SAVE, wxString( _("&Save") ) , _("Save current file"), wxITEM_NORMAL );\r
        file->Append( m_menuItemSave );\r
-       \r
+\r
        wxMenuItem* m_menuItemClose;\r
        m_menuItemClose = new wxMenuItem( file, ID_CLOSE, wxString( _("&Close") ) , _("Close current file"), wxITEM_NORMAL );\r
        file->Append( m_menuItemClose );\r
-       \r
+\r
        file->AppendSeparator();\r
-       \r
+\r
        wxMenuItem* m_menuItemExit;\r
        m_menuItemExit = new wxMenuItem( file, ID_EXIT, wxString( _("E&xit") ) , _("Exit Program"), wxITEM_NORMAL );\r
        file->Append( m_menuItemExit );\r
-       \r
-       m_menubarMain->Append( file, _("&File") ); \r
-       \r
+\r
+       m_menubarMain->Append( file, _("&File") );\r
+\r
        edit = new wxMenu();\r
        wxMenuItem* m_menuItemCopy;\r
        m_menuItemCopy = new wxMenuItem( edit, ID_COPY, wxString( _("&Copy") ) , _("Copy selection"), wxITEM_NORMAL );\r
        edit->Append( m_menuItemCopy );\r
        m_menuItemCopy->Enable( false );\r
-       \r
+\r
        wxMenuItem* m_menuItemCut;\r
        m_menuItemCut = new wxMenuItem( edit, ID_CUT, wxString( _("Cut") ) , _("Cut Selection"), wxITEM_NORMAL );\r
        edit->Append( m_menuItemCut );\r
        m_menuItemCut->Enable( false );\r
-       \r
+\r
        wxMenuItem* m_menuItemPaste;\r
        m_menuItemPaste = new wxMenuItem( edit, ID_PASTE, wxString( _("&Paste") ) , _("Paste selection"), wxITEM_NORMAL );\r
        edit->Append( m_menuItemPaste );\r
        m_menuItemPaste->Enable( false );\r
-       \r
-       m_menubarMain->Append( edit, _("&Edit") ); \r
-       \r
+\r
+       m_menubarMain->Append( edit, _("&Edit") );\r
+\r
        tools = new wxMenu();\r
        wxMenuItem* m_menuItemAudio;\r
        m_menuItemAudio = new wxMenuItem( tools, wxID_ANY, wxString( _("&Audio Config") ) , wxEmptyString, wxITEM_NORMAL );\r
        tools->Append( m_menuItemAudio );\r
-       \r
+\r
        wxMenuItem* m_menuItemRigCtrlCfg;\r
        m_menuItemRigCtrlCfg = new wxMenuItem( tools, wxID_ANY, wxString( _("Rig Control Config") ) , wxEmptyString, wxITEM_NORMAL );\r
        tools->Append( m_menuItemRigCtrlCfg );\r
-       \r
+\r
        wxMenuItem* m_menuItemOptions;\r
        m_menuItemOptions = new wxMenuItem( tools, ID_OPTIONS, wxString( _("Other Program &Options") ) , _("Set preferences"), wxITEM_NORMAL );\r
        tools->Append( m_menuItemOptions );\r
-       \r
+\r
        tools->AppendSeparator();\r
-       \r
+\r
        wxMenuItem* m_menuItemCaptRxStream;\r
        m_menuItemCaptRxStream = new wxMenuItem( tools, wxID_ANY, wxString( _("Capture Rx Stream") ) + wxT('\t') + wxT("Capture receive stream to file."), wxEmptyString, wxITEM_NORMAL );\r
        #ifdef __WXMSW__\r
@@ -78,7 +81,7 @@ TopFrame::TopFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
        m_menuItemCaptRxStream->SetBitmap( wxNullBitmap );\r
        #endif\r
        tools->Append( m_menuItemCaptRxStream );\r
-       \r
+\r
        wxMenuItem* m_menuItemCaptTxStream;\r
        m_menuItemCaptTxStream = new wxMenuItem( tools, wxID_ANY, wxString( _("Capture Tx Stream") ) + wxT('\t') + wxT("Capture transmit stream to file."), wxEmptyString, wxITEM_NORMAL );\r
        #ifdef __WXMSW__\r
@@ -87,211 +90,211 @@ TopFrame::TopFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
        m_menuItemCaptTxStream->SetBitmap( wxNullBitmap );\r
        #endif\r
        tools->Append( m_menuItemCaptTxStream );\r
-       \r
+\r
        tools->AppendSeparator();\r
-       \r
+\r
        wxMenuItem* m_menuItemPlayAudioFile;\r
        m_menuItemPlayAudioFile = new wxMenuItem( tools, wxID_ANY, wxString( _("Play File") ) , wxEmptyString, wxITEM_NORMAL );\r
        tools->Append( m_menuItemPlayAudioFile );\r
-       \r
-       m_menubarMain->Append( tools, _("&Tools") ); \r
-       \r
+\r
+       m_menubarMain->Append( tools, _("&Tools") );\r
+\r
        help = new wxMenu();\r
        wxMenuItem* m_menuItemHelpUpdates;\r
        m_menuItemHelpUpdates = new wxMenuItem( help, wxID_ANY, wxString( _("Check for Updates") ) , wxEmptyString, wxITEM_NORMAL );\r
        help->Append( m_menuItemHelpUpdates );\r
        m_menuItemHelpUpdates->Enable( false );\r
-       \r
+\r
        wxMenuItem* m_menuItemAbout;\r
        m_menuItemAbout = new wxMenuItem( help, ID_ABOUT, wxString( _("&About") ) , _("About this program"), wxITEM_NORMAL );\r
        help->Append( m_menuItemAbout );\r
-       \r
-       m_menubarMain->Append( help, _("&Help") ); \r
-       \r
+\r
+       m_menubarMain->Append( help, _("&Help") );\r
+\r
        this->SetMenuBar( m_menubarMain );\r
-       \r
+\r
        wxBoxSizer* bSizer1;\r
        bSizer1 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        wxBoxSizer* leftSizer;\r
        leftSizer = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxStaticBoxSizer* snrSizer;\r
        snrSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("SNR") ), wxVERTICAL );\r
-       \r
+\r
        m_gaugeSNR = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( 15,135 ), wxGA_SMOOTH|wxGA_VERTICAL );\r
        m_gaugeSNR->SetToolTip( _("Display signal to noise ratio.") );\r
-       \r
+\r
        snrSizer->Add( m_gaugeSNR, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 10 );\r
-       \r
+\r
        wxBoxSizer* bSizer29;\r
        bSizer29 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_textSNR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxPoint( -1,-1 ), wxSize( 35,25 ), wxTE_READONLY );\r
        m_textSNR->SetToolTip( _("Show S/N ratio numerically.") );\r
        m_textSNR->SetMinSize( wxSize( 35,25 ) );\r
-       \r
+\r
        bSizer29->Add( m_textSNR, 0, wxALIGN_CENTER|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        snrSizer->Add( bSizer29, 0, wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        leftSizer->Add( snrSizer, 2, wxALIGN_CENTER|wxALL|wxEXPAND, 1 );\r
-       \r
+\r
        wxStaticBoxSizer* levelSizer;\r
        levelSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Level") ), wxVERTICAL );\r
-       \r
+\r
        m_gaugeLevel = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( 15,135 ), wxGA_SMOOTH|wxGA_VERTICAL );\r
        m_gaugeLevel->SetToolTip( _("Display signal level.") );\r
-       \r
+\r
        levelSizer->Add( m_gaugeLevel, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 10 );\r
-       \r
-       \r
+\r
+\r
        leftSizer->Add( levelSizer, 2, wxALIGN_CENTER|wxALL|wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        bSizer1->Add( leftSizer, 0, wxALL|wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* centerSizer;\r
        centerSizer = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* upperSizer;\r
        upperSizer = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_auiNbookCtrl = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_BOTTOM|wxAUI_NB_DEFAULT_STYLE );\r
        m_auiNbookCtrl->SetFont( wxFont( 6, 70, 90, 90, false, wxEmptyString ) );\r
-       \r
-       \r
+\r
+\r
        upperSizer->Add( m_auiNbookCtrl, 1, wxALIGN_TOP|wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        centerSizer->Add( upperSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALIGN_TOP|wxEXPAND, 0 );\r
-       \r
+\r
        wxBoxSizer* lowerSizer;\r
        lowerSizer = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        wxBoxSizer* bSizer15;\r
        bSizer15 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_txtCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer15->Add( m_txtCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        lowerSizer->Add( bSizer15, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer141;\r
        bSizer141 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        m_togRxID = new wxToggleButton( this, wxID_ANY, _("RxID"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer141->Add( m_togRxID, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL|wxFIXED_MINSIZE, 5 );\r
-       \r
+\r
        m_togTxID = new wxToggleButton( this, wxID_ANY, _("TxID"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer141->Add( m_togTxID, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        lowerSizer->Add( bSizer141, 0, wxALIGN_RIGHT, 5 );\r
-       \r
-       \r
+\r
+\r
        centerSizer->Add( lowerSizer, 0, wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        bSizer1->Add( centerSizer, 4, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 1 );\r
-       \r
+\r
        wxBoxSizer* rightSizer;\r
        rightSizer = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer3;\r
        sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("SQ") ), wxVERTICAL );\r
-       \r
+\r
        m_sliderSQ = new wxSlider( this, wxID_ANY, 50, 0, 100, wxDefaultPosition, wxSize( -1,100 ), wxSL_AUTOTICKS|wxSL_INVERSE|wxSL_VERTICAL );\r
        m_sliderSQ->SetToolTip( _("Set Squelch level.") );\r
-       \r
+\r
        sbSizer3->Add( m_sliderSQ, 2, wxALIGN_CENTER|wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer131;\r
        bSizer131 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_ckboxSQ = new wxCheckBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );\r
        m_ckboxSQ->SetToolTip( _("Activate/Deactivate Squelch") );\r
-       \r
+\r
        bSizer131->Add( m_ckboxSQ, 0, wxALIGN_CENTER|wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        sbSizer3->Add( bSizer131, 0, wxALIGN_CENTER, 5 );\r
-       \r
-       \r
+\r
+\r
        rightSizer->Add( sbSizer3, 2, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer5;\r
        sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Control") ), wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer1511;\r
        bSizer1511 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_togBtnOnOff = new wxToggleButton( this, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_togBtnOnOff->SetToolTip( _("Begin receiving data.") );\r
-       \r
+\r
        bSizer1511->Add( m_togBtnOnOff, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer5->Add( bSizer1511, 0, wxEXPAND, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer151;\r
        bSizer151 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_togBtnSplit = new wxToggleButton( this, wxID_ANY, _("Split"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_togBtnSplit->SetToolTip( _("Toggle split frequency mode.") );\r
-       \r
+\r
        bSizer151->Add( m_togBtnSplit, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer5->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer13;\r
        bSizer13 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_togBtnAnalog = new wxToggleButton( this, wxID_ANY, _("Analog"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_togBtnAnalog->SetToolTip( _("Toggle analog/digital operation.") );\r
-       \r
+\r
        bSizer13->Add( m_togBtnAnalog, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer5->Add( bSizer13, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer14;\r
        bSizer14 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_togBtnALC = new wxToggleButton( this, wxID_ANY, _("ALC"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_togBtnALC->SetToolTip( _("Toggle automatic level control mode.") );\r
-       \r
+\r
        bSizer14->Add( m_togBtnALC, 0, wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer5->Add( bSizer14, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer11;\r
        bSizer11 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_btnTogTX = new wxToggleButton( this, wxID_ANY, _("TX"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_btnTogTX->SetToolTip( _("Switch between Receive and Transmit") );\r
-       \r
+\r
        bSizer11->Add( m_btnTogTX, 1, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer5->Add( bSizer11, 2, wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        rightSizer->Add( sbSizer5, 2, wxALIGN_CENTER|wxALL|wxEXPAND, 3 );\r
-       \r
-       \r
+\r
+\r
        bSizer1->Add( rightSizer, 0, wxALL|wxEXPAND, 3 );\r
-       \r
-       \r
+\r
+\r
        this->SetSizer( bSizer1 );\r
        this->Layout();\r
        m_statusBar1 = this->CreateStatusBar( 3, wxST_SIZEGRIP, wxID_ANY );\r
-       \r
+\r
        // Connect Events\r
        this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( TopFrame::topFrame_OnClose ) );\r
        this->Connect( wxEVT_PAINT, wxPaintEventHandler( TopFrame::topFrame_OnPaint ) );\r
@@ -396,71 +399,73 @@ TopFrame::~TopFrame()
        m_togBtnAnalog->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( TopFrame::OnTogBtnAnalogClick ), NULL, this );\r
        m_togBtnALC->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( TopFrame::OnTogBtnALCClick ), NULL, this );\r
        m_btnTogTX->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( TopFrame::OnTogBtnTXClick ), NULL, this );\r
-       \r
+\r
 }\r
 \r
 DlgAbout::DlgAbout( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
        this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
-       \r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+\r
        wxBoxSizer* bSizer20;\r
        bSizer20 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer21;\r
        bSizer21 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer23;\r
        bSizer23 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer25;\r
        bSizer25 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_bitmapAbout = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer25->Add( m_bitmapAbout, 1, wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer23->Add( bSizer25, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer26;\r
        bSizer26 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_staticText1 = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText1->Wrap( -1 );\r
        bSizer26->Add( m_staticText1, 1, wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer23->Add( bSizer26, 0, 0, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer21->Add( bSizer23, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer24;\r
        bSizer24 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_textCtrl2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer24->Add( m_textCtrl2, 1, wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer21->Add( bSizer24, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer20->Add( bSizer21, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer22;\r
        bSizer22 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_button9 = new wxButton( this, wxID_ANY, _("MyButton"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer22->Add( m_button9, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer20->Add( bSizer22, 0, wxALIGN_RIGHT, 5 );\r
-       \r
-       \r
+\r
+\r
        this->SetSizer( bSizer20 );\r
        this->Layout();\r
-       \r
+\r
        this->Centre( wxBOTH );\r
-       \r
+       this->Centre( wxBOTH );\r
+\r
        // Connect Events\r
        this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DlgAbout::OnClose ) );\r
        this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgAbout::OnInitDialog ) );\r
@@ -471,143 +476,144 @@ DlgAbout::~DlgAbout()
        // Disconnect Events\r
        this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DlgAbout::OnClose ) );\r
        this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgAbout::OnInitDialog ) );\r
-       \r
+\r
 }\r
 \r
 DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
        this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
-       \r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+\r
        wxBoxSizer* bSizer32;\r
        bSizer32 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_nbAudioOptions = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );\r
        m_panelDevices = new wxPanel( m_nbAudioOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer34;\r
        bSizer34 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer10;\r
        sbSizer10 = new wxStaticBoxSizer( new wxStaticBox( m_panelDevices, wxID_ANY, _("PortAudio") ), wxHORIZONTAL );\r
-       \r
+\r
        wxBoxSizer* bSizer41;\r
        bSizer41 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        wxGridSizer* gSizer6;\r
        gSizer6 = new wxGridSizer( 3, 1, 0, 0 );\r
-       \r
-       gSizer6->SetMinSize( wxSize( 115,-1 ) ); \r
+\r
+       gSizer6->SetMinSize( wxSize( 115,-1 ) );\r
        m_radioBtnPortAudio = new wxRadioButton( m_panelDevices, wxID_ANY, _("PortAudio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );\r
-       m_radioBtnPortAudio->SetValue( true ); \r
+       m_radioBtnPortAudio->SetValue( true );\r
        gSizer6->Add( m_radioBtnPortAudio, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
-       \r
+\r
        wxGridSizer* gSizer51;\r
        gSizer51 = new wxGridSizer( 2, 2, 0, 0 );\r
-       \r
-       gSizer51->SetMinSize( wxSize( 110,-1 ) ); \r
+\r
+       gSizer51->SetMinSize( wxSize( 110,-1 ) );\r
        m_staticText151 = new wxStaticText( m_panelDevices, wxID_ANY, _("# Ch Out:"), wxDefaultPosition, wxSize( 80,-1 ), wxALIGN_RIGHT );\r
        m_staticText151->Wrap( -1 );\r
        m_staticText151->SetFont( wxFont( 7, 70, 90, 90, false, wxEmptyString ) );\r
        m_staticText151->SetMinSize( wxSize( 80,-1 ) );\r
        m_staticText151->SetMaxSize( wxSize( 80,-1 ) );\r
-       \r
+\r
        gSizer51->Add( m_staticText151, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND, 5 );\r
-       \r
+\r
        m_textNumChOut = new wxTextCtrl( m_panelDevices, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 30,-1 ), wxTE_READONLY );\r
        m_textNumChOut->SetFont( wxFont( 7, 70, 90, 90, false, wxEmptyString ) );\r
        m_textNumChOut->SetMinSize( wxSize( 30,-1 ) );\r
        m_textNumChOut->SetMaxSize( wxSize( 30,-1 ) );\r
-       \r
+\r
        gSizer51->Add( m_textNumChOut, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 5 );\r
-       \r
+\r
        m_staticText141 = new wxStaticText( m_panelDevices, wxID_ANY, _("# Ch In:"), wxDefaultPosition, wxSize( 80,-1 ), wxALIGN_RIGHT );\r
        m_staticText141->Wrap( -1 );\r
        m_staticText141->SetFont( wxFont( 7, 70, 90, 90, false, wxEmptyString ) );\r
        m_staticText141->SetMinSize( wxSize( 80,-1 ) );\r
        m_staticText141->SetMaxSize( wxSize( 90,-1 ) );\r
-       \r
+\r
        gSizer51->Add( m_staticText141, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND, 5 );\r
-       \r
+\r
        m_textNumChIn = new wxTextCtrl( m_panelDevices, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 30,-1 ), wxTE_READONLY );\r
        m_textNumChIn->SetFont( wxFont( 7, 70, 90, 90, false, wxEmptyString ) );\r
        m_textNumChIn->SetMinSize( wxSize( 30,-1 ) );\r
        m_textNumChIn->SetMaxSize( wxSize( 30,-1 ) );\r
-       \r
+\r
        gSizer51->Add( m_textNumChIn, 0, wxALL, 4 );\r
-       \r
-       \r
+\r
+\r
        gSizer6->Add( gSizer51, 0, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer41->Add( gSizer6, 0, wxALL, 5 );\r
-       \r
+\r
        wxGridSizer* gSizer7;\r
        gSizer7 = new wxGridSizer( 4, 2, 0, 0 );\r
-       \r
+\r
        m_staticText14 = new wxStaticText( m_panelDevices, wxID_ANY, _("Audio in (mic) -> codec:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );\r
        m_staticText14->Wrap( -1 );\r
        gSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_comboAudioCodec = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
+\r
+       m_comboAudioCodec = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
        gSizer7->Add( m_comboAudioCodec, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText15 = new wxStaticText( m_panelDevices, wxID_ANY, _("codec -> Radio Tx:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );\r
        m_staticText15->Wrap( -1 );\r
        gSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_comboCodecTx = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
+\r
+       m_comboCodecTx = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
        gSizer7->Add( m_comboCodecTx, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText16 = new wxStaticText( m_panelDevices, wxID_ANY, _("Radio Rx -> codec:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );\r
        m_staticText16->Wrap( -1 );\r
        gSizer7->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_comboRadioRx = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
+\r
+       m_comboRadioRx = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
        gSizer7->Add( m_comboRadioRx, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText17 = new wxStaticText( m_panelDevices, wxID_ANY, _("codec -> Audio out (spkr):"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );\r
        m_staticText17->Wrap( -1 );\r
        gSizer7->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_comboCodecSpkr = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
+\r
+       m_comboCodecSpkr = new wxComboBox( m_panelDevices, wxID_ANY, _("<default>"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
        gSizer7->Add( m_comboCodecSpkr, 0, wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer41->Add( gSizer7, 0, wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        sbSizer10->Add( bSizer41, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer34->Add( sbSizer10, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer11;\r
        sbSizer11 = new wxStaticBoxSizer( new wxStaticBox( m_panelDevices, wxID_ANY, _("File I/O") ), wxHORIZONTAL );\r
-       \r
+\r
        wxBoxSizer* bSizer38;\r
        bSizer38 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_radioBtnFileOnly = new wxRadioButton( m_panelDevices, wxID_ANY, _("File Only"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer38->Add( m_radioBtnFileOnly, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        sbSizer11->Add( bSizer38, 0, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer45;\r
        bSizer45 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       \r
+\r
+\r
        sbSizer11->Add( bSizer45, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer46;\r
        bSizer46 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       \r
+\r
+\r
        sbSizer11->Add( bSizer46, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer34->Add( sbSizer11, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        m_panelDevices->SetSizer( bSizer34 );\r
        m_panelDevices->Layout();\r
        bSizer34->Fit( m_panelDevices );\r
@@ -615,111 +621,102 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons
        m_panelSettings = new wxPanel( m_nbAudioOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer27;\r
        bSizer27 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer271;\r
        bSizer271 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer6;\r
        sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Rx Input") ), wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer31;\r
        bSizer31 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_lbRxInput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); \r
+\r
+       m_lbRxInput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE );\r
        bSizer31->Add( m_lbRxInput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 );\r
-       \r
+\r
        m_textRxInput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer31->Add( m_textRxInput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        sbSizer6->Add( bSizer31, 1, wxEXPAND, 6 );\r
-       \r
-       \r
+\r
+\r
        bSizer271->Add( sbSizer6, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer7;\r
        sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Tx Output") ), wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer281;\r
        bSizer281 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_lbTxOutput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); \r
+\r
+       m_lbTxOutput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE );\r
        bSizer281->Add( m_lbTxOutput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 );\r
-       \r
-       m_textCtrl15 = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer281->Add( m_textCtrl15, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+       m_textTxOutput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer281->Add( m_textTxOutput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 );\r
+\r
+\r
        sbSizer7->Add( bSizer281, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer271->Add( sbSizer7, 1, wxEXPAND, 6 );\r
-       \r
-       \r
+\r
+\r
        bSizer27->Add( bSizer271, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxBoxSizer* bSizer26;\r
        bSizer26 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer8;\r
        sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Voice Input") ), wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer29;\r
        bSizer29 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_lbVoiceInput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); \r
+\r
+       m_lbVoiceInput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE );\r
        bSizer29->Add( m_lbVoiceInput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 );\r
-       \r
+\r
        m_textVoiceInput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer29->Add( m_textVoiceInput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        sbSizer8->Add( bSizer29, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer26->Add( sbSizer8, 1, wxEXPAND, 6 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer9;\r
        sbSizer9 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Voice Output") ), wxVERTICAL );\r
-       \r
+\r
        wxBoxSizer* bSizer30;\r
        bSizer30 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_lbVoiceOutput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); \r
+\r
+       m_lbVoiceOutput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE );\r
        bSizer30->Add( m_lbVoiceOutput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 );\r
-       \r
+\r
        m_textVoiceOutput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer30->Add( m_textVoiceOutput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        sbSizer9->Add( bSizer30, 1, wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        bSizer26->Add( sbSizer9, 1, wxEXPAND, 6 );\r
-       \r
-       \r
+\r
+\r
        bSizer27->Add( bSizer26, 1, wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        m_panelSettings->SetSizer( bSizer27 );\r
        m_panelSettings->Layout();\r
        bSizer27->Fit( m_panelSettings );\r
        m_nbAudioOptions->AddPage( m_panelSettings, _("Settings"), false );\r
-       m_panelRightChannel = new wxPanel( m_nbAudioOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
-       wxBoxSizer* bSizer36;\r
-       bSizer36 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       \r
-       m_panelRightChannel->SetSizer( bSizer36 );\r
-       m_panelRightChannel->Layout();\r
-       bSizer36->Fit( m_panelRightChannel );\r
-       m_nbAudioOptions->AddPage( m_panelRightChannel, _("Right Channel"), false );\r
-       \r
+\r
        bSizer32->Add( m_nbAudioOptions, 1, wxEXPAND | wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer28;\r
        bSizer28 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_sdbSizer3 = new wxStdDialogButtonSizer();\r
        m_sdbSizer3OK = new wxButton( this, wxID_OK );\r
        m_sdbSizer3->AddButton( m_sdbSizer3OK );\r
@@ -728,21 +725,22 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons
        m_sdbSizer3Cancel = new wxButton( this, wxID_CANCEL );\r
        m_sdbSizer3->AddButton( m_sdbSizer3Cancel );\r
        m_sdbSizer3->Realize();\r
-       \r
+\r
        bSizer28->Add( m_sdbSizer3, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer32->Add( bSizer28, 0, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer32->Add( 0, 15, 0, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        this->SetSizer( bSizer32 );\r
        this->Layout();\r
-       \r
+\r
+       this->Centre( wxBOTH );\r
        this->Centre( wxBOTH );\r
-       \r
+\r
        // Connect Events\r
        this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DlgAudio::OnClose ) );\r
        this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgAudio::OnInitDialog ) );\r
@@ -767,85 +765,87 @@ DlgAudio::~DlgAudio()
        m_sdbSizer3Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgAudio::OnApply ), NULL, this );\r
        m_sdbSizer3Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgAudio::OnCancel ), NULL, this );\r
        m_sdbSizer3OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgAudio::OnOK ), NULL, this );\r
-       \r
+\r
 }\r
 \r
 DlgOptions::DlgOptions( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
        this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
-       \r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+\r
        wxBoxSizer* bSizer30;\r
        bSizer30 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer5;\r
        sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Config Options") ), wxHORIZONTAL );\r
-       \r
+\r
        wxGridSizer* gSizer2;\r
        gSizer2 = new wxGridSizer( 6, 2, 0, 0 );\r
-       \r
+\r
        m_staticText2 = new wxStaticText( this, wxID_ANY, _("Option #1:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText2->Wrap( -1 );\r
        gSizer2->Add( m_staticText2, 1, wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrl3 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer2->Add( m_textCtrl3, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText3 = new wxStaticText( this, wxID_ANY, _("Option #2:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText3->Wrap( -1 );\r
        gSizer2->Add( m_staticText3, 1, wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrl4 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer2->Add( m_textCtrl4, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText4 = new wxStaticText( this, wxID_ANY, _("Option #3:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText4->Wrap( -1 );\r
        gSizer2->Add( m_staticText4, 1, wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrl5 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer2->Add( m_textCtrl5, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText5 = new wxStaticText( this, wxID_ANY, _("Option #4:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText5->Wrap( -1 );\r
        gSizer2->Add( m_staticText5, 1, wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrl6 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer2->Add( m_textCtrl6, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText6 = new wxStaticText( this, wxID_ANY, _("Option #5:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText6->Wrap( -1 );\r
        gSizer2->Add( m_staticText6, 1, wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrl7 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer2->Add( m_textCtrl7, 1, wxALL, 5 );\r
-       \r
+\r
        m_staticText7 = new wxStaticText( this, wxID_ANY, _("Option #6:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText7->Wrap( -1 );\r
        gSizer2->Add( m_staticText7, 1, wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer2->Add( m_textCtrl8, 1, wxALL, 5 );\r
-       \r
-       \r
+\r
+\r
        sbSizer5->Add( gSizer2, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer30->Add( sbSizer5, 1, wxEXPAND, 5 );\r
-       \r
+\r
        m_sdbSizer4 = new wxStdDialogButtonSizer();\r
        m_sdbSizer4OK = new wxButton( this, wxID_OK );\r
        m_sdbSizer4->AddButton( m_sdbSizer4OK );\r
        m_sdbSizer4Cancel = new wxButton( this, wxID_CANCEL );\r
        m_sdbSizer4->AddButton( m_sdbSizer4Cancel );\r
        m_sdbSizer4->Realize();\r
-       \r
+\r
        bSizer30->Add( m_sdbSizer4, 0, wxALIGN_RIGHT, 5 );\r
-       \r
-       \r
+\r
+\r
        this->SetSizer( bSizer30 );\r
        this->Layout();\r
-       \r
+\r
+       this->Centre( wxBOTH );\r
        this->Centre( wxBOTH );\r
-       \r
+\r
        // Connect Events\r
        this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DlgOptions::OnClose ) );\r
        this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgOptions::OnInitDialog ) );\r
@@ -856,58 +856,97 @@ DlgOptions::~DlgOptions()
        // Disconnect Events\r
        this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DlgOptions::OnClose ) );\r
        this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgOptions::OnInitDialog ) );\r
-       \r
+\r
 }\r
 \r
-DlgComPorts::DlgComPorts( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
+DlgComPorts::DlgComPorts( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {\r
        this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
-       \r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+\r
        wxBoxSizer* bSizer30;\r
        bSizer30 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxGridSizer* gSizer3;\r
-       gSizer3 = new wxGridSizer( 2, 2, 0, 0 );\r
-       \r
+       gSizer3 = new wxGridSizer( 6, 2, 0, 0 );\r
+\r
        m_staticText8 = new wxStaticText( this, wxID_ANY, _("Available Ports:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
        m_staticText8->Wrap( -1 );\r
-       gSizer3->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+       gSizer3->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 );\r
+\r
        m_listCtrlPortSelect = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_ICON|wxLC_SINGLE_SEL );\r
-       gSizer3->Add( m_listCtrlPortSelect, 1, wxALL|wxEXPAND, 5 );\r
-       \r
+       gSizer3->Add( m_listCtrlPortSelect, 2, wxALL|wxEXPAND, 2 );\r
+\r
        m_staticText9 = new wxStaticText( this, wxID_ANY, _("Use Port:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
        m_staticText9->Wrap( -1 );\r
-       gSizer3->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_textCtrl10 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
-       gSizer3->Add( m_textCtrl10, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
-       \r
-       \r
+       gSizer3->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 );\r
+\r
+       m_textRigCtrlPort = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       gSizer3->Add( m_textRigCtrlPort, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );\r
+\r
+       m_staticText91 = new wxStaticText( this, wxID_ANY, _("Buad Rate:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText91->Wrap( -1 );\r
+       gSizer3->Add( m_staticText91, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 );\r
+\r
+       m_textRigCtrlBaud = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       gSizer3->Add( m_textRigCtrlBaud, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );\r
+\r
+       m_staticText911 = new wxStaticText( this, wxID_ANY, _("Data Bits:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText911->Wrap( -1 );\r
+       gSizer3->Add( m_staticText911, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 );\r
+\r
+       m_textRigCtrlDatabits = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       gSizer3->Add( m_textRigCtrlDatabits, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );\r
+\r
+       m_staticText912 = new wxStaticText( this, wxID_ANY, _("Stop Bits:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText912->Wrap( -1 );\r
+       gSizer3->Add( m_staticText912, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 );\r
+\r
+       m_textRigCtrlStopbits = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       gSizer3->Add( m_textRigCtrlStopbits, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );\r
+\r
+       m_staticText913 = new wxStaticText( this, wxID_ANY, _("Parity:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText913->Wrap( -1 );\r
+       gSizer3->Add( m_staticText913, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 );\r
+\r
+       m_textRigCtrlParity = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       gSizer3->Add( m_textRigCtrlParity, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );\r
+\r
+\r
        bSizer30->Add( gSizer3, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );\r
-       \r
-       m_sdbSizer3 = new wxStdDialogButtonSizer();\r
-       m_sdbSizer3OK = new wxButton( this, wxID_OK );\r
-       m_sdbSizer3->AddButton( m_sdbSizer3OK );\r
-       m_sdbSizer3Cancel = new wxButton( this, wxID_CANCEL );\r
-       m_sdbSizer3->AddButton( m_sdbSizer3Cancel );\r
-       m_sdbSizer3->Realize();\r
-       \r
-       bSizer30->Add( m_sdbSizer3, 0, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+       m_sdbSizer5 = new wxStdDialogButtonSizer();\r
+       m_sdbSizer5OK = new wxButton( this, wxID_OK );\r
+       m_sdbSizer5->AddButton( m_sdbSizer5OK );\r
+       m_sdbSizer5Apply = new wxButton( this, wxID_APPLY );\r
+       m_sdbSizer5->AddButton( m_sdbSizer5Apply );\r
+       m_sdbSizer5Cancel = new wxButton( this, wxID_CANCEL );\r
+       m_sdbSizer5->AddButton( m_sdbSizer5Cancel );\r
+       m_sdbSizer5->Realize();\r
+\r
+       bSizer30->Add( m_sdbSizer5, 0, wxEXPAND, 5 );\r
+\r
+\r
        this->SetSizer( bSizer30 );\r
        this->Layout();\r
-       \r
+\r
        this->Centre( wxBOTH );\r
-       \r
+       this->Centre( wxBOTH );\r
+\r
        // Connect Events\r
+       this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgComPorts::OnInitDialog ) );\r
+       m_sdbSizer5Apply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgComPorts::OnApply ), NULL, this );\r
+       m_sdbSizer5Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgComPorts::OnCancel ), NULL, this );\r
+       m_sdbSizer5OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgComPorts::OnOK ), NULL, this );\r
        m_listCtrlPortSelect->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DlgComPorts::OnListItemSelected ), NULL, this );\r
 }\r
 \r
 DlgComPorts::~DlgComPorts()\r
 {\r
        // Disconnect Events\r
+       this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DlgComPorts::OnInitDialog ) );
        m_listCtrlPortSelect->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DlgComPorts::OnListItemSelected ), NULL, this );\r
-       \r
+       m_sdbSizer5Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgComPorts::OnApply ), NULL, this );\r
+       m_sdbSizer5Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgComPorts::OnCancel ), NULL, this );\r
+       m_sdbSizer5OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DlgComPorts::OnOK ), NULL, this );\r
 }\r
index 8a1b3f23f8c876c557980dcad263deb63ff5d245..64f5327c507e7bd109e2fc3db09722d9d9fcd25f 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////\r
-// C++ code generated with wxFormBuilder (version Mar 17 2012)\r
+// C++ code generated with wxFormBuilder (version Apr 10 2012)\r
 // http://www.wxformbuilder.org/\r
 //\r
 // PLEASE DO "NOT" EDIT THIS FILE!\r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class TopFrame\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class TopFrame : public wxFrame \r
+class TopFrame : public wxFrame\r
 {\r
        private:\r
-       \r
+\r
        protected:\r
                wxMenuBar* m_menubarMain;\r
                wxMenu* file;\r
@@ -80,7 +80,7 @@ class TopFrame : public wxFrame
                wxToggleButton* m_togBtnALC;\r
                wxToggleButton* m_btnTogTX;\r
                wxStatusBar* m_statusBar1;\r
-               \r
+\r
                // Virtual event handlers, overide them in your derived class\r
                virtual void topFrame_OnClose( wxCloseEvent& event ) { event.Skip(); }\r
                virtual void topFrame_OnPaint( wxPaintEvent& event ) { event.Skip(); }\r
@@ -123,49 +123,49 @@ class TopFrame : public wxFrame
                virtual void OnTogBtnAnalogClick( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnTogBtnALCClick( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnTogBtnTXClick( wxCommandEvent& event ) { event.Skip(); }\r
-               \r
-       \r
+\r
+\r
        public:\r
                wxAuiNotebook* m_auiNbookCtrl;\r
-               \r
+\r
                TopFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FDMDV2"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 761,500 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
-               \r
+\r
                ~TopFrame();\r
-       \r
+\r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class DlgAbout\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class DlgAbout : public wxDialog \r
+class DlgAbout : public wxDialog\r
 {\r
        private:\r
-       \r
+\r
        protected:\r
                wxStaticBitmap* m_bitmapAbout;\r
                wxStaticText* m_staticText1;\r
                wxTextCtrl* m_textCtrl2;\r
                wxButton* m_button9;\r
-               \r
+\r
                // Virtual event handlers, overide them in your derived class\r
                virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }\r
                virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }\r
-               \r
-       \r
+\r
+\r
        public:\r
-               \r
-               DlgAbout( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About FDMDV2"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 352,343 ), long style = wxDEFAULT_DIALOG_STYLE ); \r
+\r
+               DlgAbout( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About FDMDV2"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 352,343 ), long style = wxDEFAULT_DIALOG_STYLE );\r
                ~DlgAbout();\r
-       \r
+\r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class DlgAudio\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class DlgAudio : public wxDialog \r
+class DlgAudio : public wxDialog\r
 {\r
        private:\r
-       \r
+\r
        protected:\r
                wxNotebook* m_nbAudioOptions;\r
                wxPanel* m_panelDevices;\r
@@ -187,17 +187,16 @@ class DlgAudio : public wxDialog
                wxListBox* m_lbRxInput;\r
                wxTextCtrl* m_textRxInput;\r
                wxListBox* m_lbTxOutput;\r
-               wxTextCtrl* m_textCtrl15;\r
+               wxTextCtrl* m_textTxOutput;\r
                wxListBox* m_lbVoiceInput;\r
                wxTextCtrl* m_textVoiceInput;\r
                wxListBox* m_lbVoiceOutput;\r
                wxTextCtrl* m_textVoiceOutput;\r
-               wxPanel* m_panelRightChannel;\r
                wxStdDialogButtonSizer* m_sdbSizer3;\r
                wxButton* m_sdbSizer3OK;\r
                wxButton* m_sdbSizer3Apply;\r
                wxButton* m_sdbSizer3Cancel;\r
-               \r
+\r
                // Virtual event handlers, overide them in your derived class\r
                virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }\r
                virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }\r
@@ -208,22 +207,22 @@ class DlgAudio : public wxDialog
                virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }\r
-               \r
-       \r
+\r
+\r
        public:\r
-               \r
-               DlgAudio( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 555,419 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); \r
+\r
+               DlgAudio( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 555,419 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
                ~DlgAudio();\r
-       \r
+\r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class DlgOptions\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class DlgOptions : public wxDialog \r
+class DlgOptions : public wxDialog\r
 {\r
        private:\r
-       \r
+\r
        protected:\r
                wxStaticText* m_staticText2;\r
                wxTextCtrl* m_textCtrl3;\r
@@ -240,44 +239,58 @@ class DlgOptions : public wxDialog
                wxStdDialogButtonSizer* m_sdbSizer4;\r
                wxButton* m_sdbSizer4OK;\r
                wxButton* m_sdbSizer4Cancel;\r
-               \r
+\r
                // Virtual event handlers, overide them in your derived class\r
                virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }\r
                virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }\r
-               \r
-       \r
+\r
+\r
        public:\r
-               \r
-               DlgOptions( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Program Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 332,364 ), long style = wxDEFAULT_DIALOG_STYLE ); \r
+\r
+               DlgOptions( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Program Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 332,364 ), long style = wxDEFAULT_DIALOG_STYLE );\r
                ~DlgOptions();\r
-       \r
+\r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class DlgComPorts\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class DlgComPorts : public wxDialog \r
+class DlgComPorts : public wxDialog\r
 {\r
        private:\r
-       \r
+\r
        protected:\r
                wxStaticText* m_staticText8;\r
                wxListCtrl* m_listCtrlPortSelect;\r
                wxStaticText* m_staticText9;\r
-               wxTextCtrl* m_textCtrl10;\r
-               wxStdDialogButtonSizer* m_sdbSizer3;\r
-               wxButton* m_sdbSizer3OK;\r
-               wxButton* m_sdbSizer3Cancel;\r
-               \r
+               wxTextCtrl* m_textRigCtrlPort;\r
+               wxStaticText* m_staticText91;\r
+               wxTextCtrl* m_textRigCtrlBaud;\r
+               wxStaticText* m_staticText911;\r
+               wxTextCtrl* m_textRigCtrlDatabits;\r
+               wxStaticText* m_staticText912;\r
+               wxTextCtrl* m_textRigCtrlStopbits;\r
+               wxStaticText* m_staticText913;\r
+               wxTextCtrl* m_textRigCtrlParity;\r
+               wxStdDialogButtonSizer* m_sdbSizer5;\r
+               wxButton* m_sdbSizer5OK;\r
+               wxButton* m_sdbSizer5Apply;\r
+               wxButton* m_sdbSizer5Cancel;\r
+\r
                // Virtual event handlers, overide them in your derived class\r
                virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }\r
-               \r
-       \r
+        virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }\r
+        virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }\r
+        virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }\r
+\r
+\r
        public:\r
-               \r
-               DlgComPorts( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Com Port"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 399,226 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); \r
+\r
+               DlgComPorts( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Com Port"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 399,354 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
                ~DlgComPorts();\r
-       \r
+\r
 };\r
 \r
 #endif //__TOPFRAME_H__\r