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

diff --git a/fdmdv2/extern/lib/libctb-0.16.so b/fdmdv2/extern/lib/libctb-0.16.so
new file mode 100644 (file)
index 0000000..08cbe00
Binary files /dev/null and b/fdmdv2/extern/lib/libctb-0.16.so differ

diff --git a/fdmdv2/fdmdv2.mk b/fdmdv2/fdmdv2.mk
index 8dc37dadb291c4bb36ae7bd9a19e61c773c0cf8b..5f0360f8243fda3419f72cfc149e5d5cd27be993 100644 (file)
--- a/fdmdv2/fdmdv2.mk
+++ b/fdmdv2/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=5/17/2012\r
+Date                   :=5/18/2012\r
 CodeLitePath           :="C:\Program Files\CodeLite"\r
 LinkerName             :=g++\r
 ArchiveTool            :=ar rcus\r
@@ -56,7 +56,7 @@ WXWIN:=C:\bin\wxWidgets-2.9.2
 PATH:=$(WXWIN)\lib\gcc_dll;$(PATH)\r
 WXCFG:=gcc_dll\mswu\r
 UNIT_TEST_PP_SRC_DIR:=C:\bin\UnitTest++-1.3\r
-Objects=$(IntermediateDirectory)/topFrame$(ObjectSuffix) $(IntermediateDirectory)/dlg_about$(ObjectSuffix) $(IntermediateDirectory)/dlg_audio$(ObjectSuffix) $(IntermediateDirectory)/dlg_options$(ObjectSuffix) $(IntermediateDirectory)/dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/thread_audio$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) \r
+Objects=$(IntermediateDirectory)/topFrame$(ObjectSuffix) $(IntermediateDirectory)/dlg_about$(ObjectSuffix) $(IntermediateDirectory)/dlg_audio$(ObjectSuffix) $(IntermediateDirectory)/dlg_options$(ObjectSuffix) $(IntermediateDirectory)/dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) \r
 \r
 ##\r
 ## Main Build Targets \r
@@ -135,22 +135,6 @@ $(IntermediateDirectory)/fdmdv2_main$(DependSuffix): fdmdv2_main.cpp
 $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix): fdmdv2_main.cpp\r
        @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_main.cpp"\r
 \r
-$(IntermediateDirectory)/thread_audio$(ObjectSuffix): thread_audio.cpp $(IntermediateDirectory)/thread_audio$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/thread_audio.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/thread_audio$(ObjectSuffix) $(IncludePath)\r
-$(IntermediateDirectory)/thread_audio$(DependSuffix): thread_audio.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/thread_audio$(ObjectSuffix) -MF$(IntermediateDirectory)/thread_audio$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/thread_audio.cpp"\r
-\r
-$(IntermediateDirectory)/thread_audio$(PreprocessSuffix): thread_audio.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/thread_audio$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/thread_audio.cpp"\r
-\r
-$(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix): fdmdv2_thread_audio.cpp $(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_thread_audio.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) $(IncludePath)\r
-$(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix): fdmdv2_thread_audio.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) -MF$(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_thread_audio.cpp"\r
-\r
-$(IntermediateDirectory)/fdmdv2_thread_audio$(PreprocessSuffix): fdmdv2_thread_audio.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_thread_audio$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_thread_audio.cpp"\r
-\r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
 ##\r
@@ -178,12 +162,6 @@ clean:
        $(RM) $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix)\r
        $(RM) $(IntermediateDirectory)/fdmdv2_main$(DependSuffix)\r
        $(RM) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix)\r
-       $(RM) $(IntermediateDirectory)/thread_audio$(ObjectSuffix)\r
-       $(RM) $(IntermediateDirectory)/thread_audio$(DependSuffix)\r
-       $(RM) $(IntermediateDirectory)/thread_audio$(PreprocessSuffix)\r
-       $(RM) $(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix)\r
-       $(RM) $(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix)\r
-       $(RM) $(IntermediateDirectory)/fdmdv2_thread_audio$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
        $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\fdmdv2"\r

diff --git a/fdmdv2/fdmdv2.project b/fdmdv2/fdmdv2.project
index 883aea66bd3614a25112493689c87e9161c5eb53..1a55b90b8808bd26ad07af4b3e572be18354399c 100644 (file)
--- a/fdmdv2/fdmdv2.project
+++ b/fdmdv2/fdmdv2.project
@@ -15,8 +15,6 @@
     <File Name="dlg_comports.cpp"/>
     <File Name="fdmdv2_plot.cpp"/>
     <File Name="fdmdv2_main.cpp"/>
-    <File Name="thread_audio.cpp"/>
-    <File Name="fdmdv2_thread_audio.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
     <File Name="topFrame.h"/>
@@ -26,8 +24,6 @@
     <File Name="dlg_comports.h"/>
     <File Name="fdmdv2_plot.h"/>
     <File Name="fdmdv2_main.h"/>
-    <File Name="thread_audio.h"/>
-    <File Name="fdmdv2_thread_audio.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="FDMDV2.fbp"/>

diff --git a/fdmdv2/fdmdv2.workspace b/fdmdv2/fdmdv2.workspace
index 9254a85e1dd01f46cf5a16d1643c0a8d2df358c4..1ac9a3cfcccbe516668a7014ba6edb790cded5a8 100644 (file)
--- a/fdmdv2/fdmdv2.workspace
+++ b/fdmdv2/fdmdv2.workspace
@@ -2,9 +2,9 @@
 <CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
   <Project Name="test_portaudio" Path="libsndfile/Projects/w32-mingw/test_sndfile.project" Active="No"/>
   <Project Name="test_hamlib" Path="hamlib-3.0/test_hamlib/test_hamlib.project" Active="No"/>
-  <Project Name="fdmdv2" Path="fdmdv2.project" Active="No"/>
+  <Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
   <Project Name="pa_test" Path="pa_test/pa_test.project" Active="No"/>
-  <Project Name="pa_cppbinding_test" Path="pa_cppbinding_test/pa_cppbinding_test.project" Active="Yes"/>
+  <Project Name="pa_cppbinding_test" Path="pa_cppbinding_test/pa_cppbinding_test.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="no">
       <Project Name="test_sndfile" ConfigName="Debug"/>

diff --git a/fdmdv2/fdmdv2_main.h b/fdmdv2/fdmdv2_main.h
index 08f03fdaf1eb0aff2980cd205d4b3b10ba3a1b81..28b8f7e0e20e553be8d8402a4a04782f0c85ffd4 100644 (file)
--- a/fdmdv2/fdmdv2_main.h
+++ b/fdmdv2/fdmdv2_main.h
@@ -30,7 +30,7 @@
 #include "dlg_options.h"\r
 #include "dlg_comports.h"\r
 #include "fdmdv2_plot.h"
-#include "fdmdv2_thread_audio.h"
+//#include "fdmdv2_thread_audio.h"
 
 #define WAV_FILE wxT("doggrowl.wav")
 \r
@@ -86,7 +86,7 @@ class MainFrame : public TopFrame
         void OnThreadCompletion(wxThreadEvent&);\r
 \r
     protected:\r
-        Fdmdv2ThreadAudio *m_pThread;\r
+//        Fdmdv2ThreadAudio *m_pThread;\r
         wxCriticalSection m_pThreadCS;    // protects the m_pThread pointer\r
         // protected event handlers
         virtual void OnCloseFrame(wxCloseEvent& event);

diff --git a/fdmdv2/fdmdv2_wsp.mk b/fdmdv2/fdmdv2_wsp.mk
index 13bc5fdcbc912874d4e5ccdbebfbdfe926d81bad..359a9f63279ae4b50622056b8e386244b86f8f85 100644 (file)
--- a/fdmdv2/fdmdv2_wsp.mk
+++ b/fdmdv2/fdmdv2_wsp.mk
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-       @echo ----------Building project:[ pa_cppbinding_test - Release ]----------
-       @cd "pa_cppbinding_test" && "mingw32-make.exe"  -j 2 -f "pa_cppbinding_test.mk"
+       @echo ----------Building project:[ fdmdv2 - Release ]----------
+       @"mingw32-make.exe"  -j 2 -f "fdmdv2.mk"
 clean:
-       @echo ----------Cleaning project:[ pa_cppbinding_test - Release ]----------
-       @cd "pa_cppbinding_test" && "mingw32-make.exe"  -j 2 -f "pa_cppbinding_test.mk" clean
+       @echo ----------Cleaning project:[ fdmdv2 - Release ]----------
+       @"mingw32-make.exe"  -j 2 -f "fdmdv2.mk" clean

diff --git a/fdmdv2/pa_cppbinding_test/gui.cpp b/fdmdv2/pa_cppbinding_test/gui.cpp
index 1a2d09e2fa45faee288065d6a79ea997f3624597..812cbfca47f903fa932a6c1530e0eda12012a9a7 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.cpp
+++ b/fdmdv2/pa_cppbinding_test/gui.cpp
@@ -29,92 +29,123 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        m_audioInfo = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        m_audioInfo->SetMinSize( wxSize( 65,65 ) );\r
        \r
-       wxFlexGridSizer* fgSizer1;\r
-       fgSizer1 = new wxFlexGridSizer( 4, 4, 1, 1 );\r
-       fgSizer1->AddGrowableCol( 3 );\r
-       fgSizer1->AddGrowableRow( 3 );\r
-       fgSizer1->SetFlexibleDirection( wxBOTH );\r
-       fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );\r
+       wxBoxSizer* bSizer17;\r
+       bSizer17 = new wxBoxSizer( wxVERTICAL );\r
        \r
+       wxBoxSizer* bSizer15;\r
+       bSizer15 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       wxBoxSizer* bSizer9;\r
+       bSizer9 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       m_staticText1 = new wxStaticText( m_audioInfo, wxID_ANY, _("Input, Output:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
-       m_staticText1->Wrap( -1 );\r
-       fgSizer1->Add( m_staticText1, 1, wxALL|wxEXPAND, 5 );\r
+       wxBoxSizer* bSizer7;\r
+       bSizer7 = new wxBoxSizer( wxHORIZONTAL );\r
        \r
        wxBoxSizer* bSizer2;\r
-       bSizer2 = new wxBoxSizer( wxVERTICAL );\r
+       bSizer2 = new wxBoxSizer( wxHORIZONTAL );\r
        \r
        bSizer2->SetMinSize( wxSize( 65,65 ) ); \r
-       m_comboBoxLeft = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_SIMPLE ); \r
+       m_comboBoxLeft = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
        m_comboBoxLeft->SetToolTip( _("Input Audio Interface") );\r
        m_comboBoxLeft->SetMinSize( wxSize( 65,65 ) );\r
        \r
        bSizer2->Add( m_comboBoxLeft, 1, wxALL|wxEXPAND, 5 );\r
        \r
        \r
-       fgSizer1->Add( bSizer2, 1, wxEXPAND|wxFIXED_MINSIZE, 5 );\r
+       bSizer7->Add( bSizer2, 1, wxEXPAND, 5 );\r
        \r
        wxBoxSizer* bSizer3;\r
-       bSizer3 = new wxBoxSizer( wxVERTICAL );\r
+       bSizer3 = new wxBoxSizer( wxHORIZONTAL );\r
        \r
        bSizer3->SetMinSize( wxSize( 65,65 ) ); \r
-       m_comboBoxRight = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_SIMPLE ); \r
+       m_comboBoxRight = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
        m_comboBoxRight->SetToolTip( _("Output Audio Interface") );\r
-       m_comboBoxRight->SetMinSize( wxSize( 65,65 ) );\r
+       m_comboBoxRight->SetMinSize( wxSize( 65,35 ) );\r
        \r
        bSizer3->Add( m_comboBoxRight, 1, wxALL|wxEXPAND, 5 );\r
        \r
        \r
-       fgSizer1->Add( bSizer3, 1, wxEXPAND, 5 );\r
+       bSizer7->Add( bSizer3, 1, wxEXPAND, 5 );\r
        \r
        \r
-       fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       bSizer9->Add( bSizer7, 1, wxEXPAND, 5 );\r
        \r
-       m_staticText2 = new wxStaticText( m_audioInfo, wxID_ANY, _("Behavor:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
-       m_staticText2->Wrap( -1 );\r
-       fgSizer1->Add( m_staticText2, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND, 5 );\r
+       \r
+       bSizer15->Add( bSizer9, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer10;\r
+       bSizer10 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       wxBoxSizer* bSizer5;\r
+       bSizer5 = new wxBoxSizer( wxHORIZONTAL );\r
        \r
        m_gauge1 = new wxGauge( m_audioInfo, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );\r
-       fgSizer1->Add( m_gauge1, 1, wxALL|wxEXPAND, 5 );\r
+       bSizer5->Add( m_gauge1, 1, wxALL, 5 );\r
+       \r
+       \r
+       bSizer10->Add( bSizer5, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer6;\r
+       bSizer6 = new wxBoxSizer( wxHORIZONTAL );\r
        \r
        m_slider1 = new wxSlider( m_audioInfo, wxID_ANY, 50, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP );\r
-       fgSizer1->Add( m_slider1, 1, wxALL|wxEXPAND, 5 );\r
+       bSizer6->Add( m_slider1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
+       \r
+       \r
+       bSizer10->Add( bSizer6, 1, wxEXPAND, 5 );\r
+       \r
+       \r
+       bSizer15->Add( bSizer10, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer14;\r
+       bSizer14 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       wxBoxSizer* bSizer13;\r
+       bSizer13 = new wxBoxSizer( wxHORIZONTAL );\r
        \r
+       wxBoxSizer* bSizer12;\r
+       bSizer12 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       m_toggleBtn3 = new wxToggleButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer12->Add( m_toggleBtn3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
+       \r
+       \r
+       bSizer13->Add( bSizer12, 1, 0, 5 );\r
        \r
-       m_staticText5 = new wxStaticText( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
-       m_staticText5->Wrap( -1 );\r
-       fgSizer1->Add( m_staticText5, 1, wxALL|wxEXPAND, 5 );\r
+       wxBoxSizer* bSizer11;\r
+       bSizer11 = new wxBoxSizer( wxVERTICAL );\r
        \r
        m_toggleBtn2 = new wxToggleButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_toggleBtn2->SetValue( true ); \r
-       fgSizer1->Add( m_toggleBtn2, 1, wxALL|wxEXPAND, 5 );\r
+       bSizer11->Add( m_toggleBtn2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 5 );\r
+       \r
+       \r
+       bSizer13->Add( bSizer11, 1, 0, 5 );\r
        \r
-       m_toggleBtn3 = new wxToggleButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       m_toggleBtn3->SetValue( true ); \r
-       fgSizer1->Add( m_toggleBtn3, 0, wxALL|wxEXPAND, 5 );\r
        \r
+       bSizer14->Add( bSizer13, 1, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 );\r
        \r
-       fgSizer1->Add( 0, 0, 1, 0, 5 );\r
        \r
+       bSizer15->Add( bSizer14, 0, wxEXPAND, 5 );\r
        \r
-       fgSizer1->Add( 0, 0, 1, 0, 5 );\r
        \r
+       bSizer17->Add( bSizer15, 1, wxEXPAND, 5 );\r
        \r
-       fgSizer1->Add( 0, 0, 1, 0, 5 );\r
+       wxBoxSizer* bSizer16;\r
+       bSizer16 = new wxBoxSizer( wxVERTICAL );\r
        \r
        m_button1 = new wxButton( m_audioInfo, wxID_ANY, _("Exit"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_button1->SetDefault(); \r
-       fgSizer1->Add( m_button1, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 );\r
+       bSizer16->Add( m_button1, 0, 0, 5 );\r
        \r
        \r
-       m_audioInfo->SetSizer( fgSizer1 );\r
+       bSizer17->Add( bSizer16, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 );\r
+       \r
+       \r
+       m_audioInfo->SetSizer( bSizer17 );\r
        m_audioInfo->Layout();\r
-       fgSizer1->Fit( m_audioInfo );\r
-       mainSizer->Add( m_audioInfo, 1, wxALL|wxEXPAND|wxFIXED_MINSIZE, 0 );\r
+       bSizer17->Fit( m_audioInfo );\r
+       mainSizer->Add( m_audioInfo, 1, wxEXPAND, 0 );\r
        \r
        \r
        this->SetSizer( mainSizer );\r
@@ -137,8 +168,8 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        m_slider1->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this );\r
        m_slider1->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this );\r
        m_slider1->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this );\r
-       m_toggleBtn2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this );\r
        m_toggleBtn3->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogRight ), NULL, this );\r
+       m_toggleBtn2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this );\r
        m_button1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this );\r
 }\r
 \r
@@ -158,8 +189,8 @@ MainFrameBase::~MainFrameBase()
        m_slider1->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this );\r
        m_slider1->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this );\r
        m_slider1->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this );\r
-       m_toggleBtn2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this );\r
        m_toggleBtn3->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogRight ), NULL, this );\r
+       m_toggleBtn2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this );\r
        m_button1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this );\r
        \r
 }\r

diff --git a/fdmdv2/pa_cppbinding_test/gui.fbp b/fdmdv2/pa_cppbinding_test/gui.fbp
index 3b3b63e85b4960dbc890814a5173312723b180e6..03271f86a0f95ed03fda8888631dae301172356c 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.fbp
+++ b/fdmdv2/pa_cppbinding_test/gui.fbp
@@ -71,8 +71,8 @@
             <property name="pos"></property>\r
             <property name="resize">Resizable</property>\r
             <property name="show">1</property>\r
-            <property name="size">500,300</property>\r
-            <property name="style">wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>\r
+            <property name="size">577,365</property>\r
+            <property name="style">wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>\r
             <property name="subclass"></property>\r
             <property name="title">Test PortAudio CPP Binding </property>\r
             <property name="toolbar_pane">0</property>\r
@@ -228,7 +228,7 @@
                 <property name="permission">none</property>\r
                 <object class="sizeritem" expanded="1">\r
                     <property name="border">0</property>\r
-                    <property name="flag">wxALL|wxEXPAND|wxFIXED_MINSIZE</property>\r
+                    <property name="flag">wxEXPAND</property>\r
                     <property name="proportion">1</property>\r
                     <object class="wxPanel" expanded="1">\r
                         <property name="BottomDockable">1</property>\r
@@ -308,231 +308,708 @@
                         <event name="OnSetFocus"></event>\r
                         <event name="OnSize"></event>\r
                         <event name="OnUpdateUI"></event>\r
-                        <object class="wxFlexGridSizer" expanded="1">\r
-                            <property name="cols">4</property>\r
-                            <property name="flexible_direction">wxBOTH</property>\r
-                            <property name="growablecols">3</property>\r
-                            <property name="growablerows">3</property>\r
-                            <property name="hgap">1</property>\r
+                        <object class="wxBoxSizer" expanded="1">\r
                             <property name="minimum_size"></property>\r
-                            <property name="name">fgSizer1</property>\r
-                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>\r
+                            <property name="name">bSizer17</property>\r
+                            <property name="orient">wxVERTICAL</property>\r
                             <property name="permission">none</property>\r
-                            <property name="rows">4</property>\r
-                            <property name="vgap">1</property>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="spacer" expanded="0">\r
-                                    <property name="height">0</property>\r
-                                    <property name="permission">protected</property>\r
-                                    <property name="width">0</property>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxALL|wxEXPAND</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">Input, Output:</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_staticText1</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="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="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="1">\r
                                 <property name="border">5</property>\r
-                                <property name="flag">wxEXPAND|wxFIXED_MINSIZE</property>\r
+                                <property name="flag">wxEXPAND</property>\r
                                 <property name="proportion">1</property>\r
                                 <object class="wxBoxSizer" expanded="1">\r
-                                    <property name="minimum_size">65,65</property>\r
-                                    <property name="name">bSizer2</property>\r
+                                    <property name="minimum_size"></property>\r
+                                    <property name="name">bSizer15</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">5</property>\r
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>\r
+                                        <property name="proportion">0</property>\r
+                                        <object class="wxBoxSizer" expanded="1">\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">bSizer9</property>\r
+                                            <property name="orient">wxVERTICAL</property>\r
+                                            <property name="permission">none</property>\r
+                                            <object class="sizeritem" expanded="1">\r
+                                                <property name="border">5</property>\r
+                                                <property name="flag">wxEXPAND</property>\r
+                                                <property name="proportion">1</property>\r
+                                                <object class="wxBoxSizer" expanded="1">\r
+                                                    <property name="minimum_size"></property>\r
+                                                    <property name="name">bSizer7</property>\r
+                                                    <property name="orient">wxHORIZONTAL</property>\r
+                                                    <property name="permission">none</property>\r
+                                                    <object class="sizeritem" expanded="1">\r
+                                                        <property name="border">5</property>\r
+                                                        <property name="flag">wxEXPAND</property>\r
+                                                        <property name="proportion">1</property>\r
+                                                        <object class="wxBoxSizer" expanded="1">\r
+                                                            <property name="minimum_size">65,65</property>\r
+                                                            <property name="name">bSizer2</property>\r
+                                                            <property name="orient">wxHORIZONTAL</property>\r
+                                                            <property name="permission">none</property>\r
+                                                            <object class="sizeritem" expanded="0">\r
+                                                                <property name="border">5</property>\r
+                                                                <property name="flag">wxALL|wxEXPAND</property>\r
+                                                                <property name="proportion">1</property>\r
+                                                                <object class="wxComboBox" 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="choices"></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">65,65</property>\r
+                                                                    <property name="moveable">1</property>\r
+                                                                    <property name="name">m_comboBoxLeft</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="selection">-1</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">Input Audio Interface</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="OnCombobox">OnComboLeft</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="OnUpdateUI"></event>\r
+                                                                </object>\r
+                                                            </object>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                    <object class="sizeritem" expanded="1">\r
+                                                        <property name="border">5</property>\r
+                                                        <property name="flag">wxEXPAND</property>\r
+                                                        <property name="proportion">1</property>\r
+                                                        <object class="wxBoxSizer" expanded="1">\r
+                                                            <property name="minimum_size">65,65</property>\r
+                                                            <property name="name">bSizer3</property>\r
+                                                            <property name="orient">wxHORIZONTAL</property>\r
+                                                            <property name="permission">none</property>\r
+                                                            <object class="sizeritem" expanded="0">\r
+                                                                <property name="border">5</property>\r
+                                                                <property name="flag">wxALL|wxEXPAND</property>\r
+                                                                <property name="proportion">1</property>\r
+                                                                <object class="wxComboBox" 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="choices"></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">-1,-1</property>\r
+                                                                    <property name="min_size"></property>\r
+                                                                    <property name="minimize_button">0</property>\r
+                                                                    <property name="minimum_size">65,35</property>\r
+                                                                    <property name="moveable">1</property>\r
+                                                                    <property name="name">m_comboBoxRight</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="selection">-1</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">Output Audio Interface</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="OnCombobox">OnComboRight</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="OnUpdateUI"></event>\r
+                                                                </object>\r
+                                                            </object>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                    <object class="sizeritem" expanded="1">\r
                                         <property name="border">5</property>\r
-                                        <property name="flag">wxALL|wxEXPAND</property>\r
+                                        <property name="flag">wxEXPAND</property>\r
                                         <property name="proportion">1</property>\r
-                                        <object class="wxComboBox" 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="choices"></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">65,65</property>\r
-                                            <property name="moveable">1</property>\r
-                                            <property name="name">m_comboBoxLeft</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="selection">-1</property>\r
-                                            <property name="show">1</property>\r
-                                            <property name="size"></property>\r
-                                            <property name="style">wxCB_SIMPLE</property>\r
-                                            <property name="subclass"></property>\r
-                                            <property name="toolbar_pane">0</property>\r
-                                            <property name="tooltip">Input Audio Interface</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="OnCombobox">OnComboLeft</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="OnUpdateUI"></event>\r
+                                        <object class="wxBoxSizer" expanded="1">\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">bSizer10</property>\r
+                                            <property name="orient">wxHORIZONTAL</property>\r
+                                            <property name="permission">none</property>\r
+                                            <object class="sizeritem" expanded="1">\r
+                                                <property name="border">5</property>\r
+                                                <property name="flag">wxEXPAND</property>\r
+                                                <property name="proportion">1</property>\r
+                                                <object class="wxBoxSizer" expanded="1">\r
+                                                    <property name="minimum_size"></property>\r
+                                                    <property name="name">bSizer5</property>\r
+                                                    <property name="orient">wxHORIZONTAL</property>\r
+                                                    <property name="permission">none</property>\r
+                                                    <object class="sizeritem" expanded="0">\r
+                                                        <property name="border">5</property>\r
+                                                        <property name="flag">wxALL</property>\r
+                                                        <property name="proportion">1</property>\r
+                                                        <object class="wxGauge" 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_gauge1</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="range">100</property>\r
+                                                            <property name="resize">Resizable</property>\r
+                                                            <property name="show">1</property>\r
+                                                            <property name="size"></property>\r
+                                                            <property name="style">wxGA_HORIZONTAL|wxGA_SMOOTH</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="OnUpdateUI"></event>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
+                                            <object class="sizeritem" expanded="1">\r
+                                                <property name="border">5</property>\r
+                                                <property name="flag">wxEXPAND</property>\r
+                                                <property name="proportion">1</property>\r
+                                                <object class="wxBoxSizer" expanded="1">\r
+                                                    <property name="minimum_size"></property>\r
+                                                    <property name="name">bSizer6</property>\r
+                                                    <property name="orient">wxHORIZONTAL</property>\r
+                                                    <property name="permission">none</property>\r
+                                                    <object class="sizeritem" expanded="0">\r
+                                                        <property name="border">5</property>\r
+                                                        <property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property>\r
+                                                        <property name="proportion">1</property>\r
+                                                        <object class="wxSlider" 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="maxValue">100</property>\r
+                                                            <property name="max_size"></property>\r
+                                                            <property name="maximize_button">0</property>\r
+                                                            <property name="maximum_size"></property>\r
+                                                            <property name="minValue">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_slider1</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">wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP</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">50</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="OnCommandScroll"></event>\r
+                                                            <event name="OnCommandScrollBottom"></event>\r
+                                                            <event name="OnCommandScrollChanged"></event>\r
+                                                            <event name="OnCommandScrollLineDown"></event>\r
+                                                            <event name="OnCommandScrollLineUp"></event>\r
+                                                            <event name="OnCommandScrollPageDown"></event>\r
+                                                            <event name="OnCommandScrollPageUp"></event>\r
+                                                            <event name="OnCommandScrollThumbRelease"></event>\r
+                                                            <event name="OnCommandScrollThumbTrack"></event>\r
+                                                            <event name="OnCommandScrollTop"></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="OnScroll">OnScroll</event>\r
+                                                            <event name="OnScrollBottom"></event>\r
+                                                            <event name="OnScrollChanged"></event>\r
+                                                            <event name="OnScrollLineDown"></event>\r
+                                                            <event name="OnScrollLineUp"></event>\r
+                                                            <event name="OnScrollPageDown"></event>\r
+                                                            <event name="OnScrollPageUp"></event>\r
+                                                            <event name="OnScrollThumbRelease"></event>\r
+                                                            <event name="OnScrollThumbTrack"></event>\r
+                                                            <event name="OnScrollTop"></event>\r
+                                                            <event name="OnSetFocus"></event>\r
+                                                            <event name="OnSize"></event>\r
+                                                            <event name="OnUpdateUI"></event>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\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="1">\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">bSizer14</property>\r
+                                            <property name="orient">wxHORIZONTAL</property>\r
+                                            <property name="permission">none</property>\r
+                                            <object class="sizeritem" expanded="1">\r
+                                                <property name="border">5</property>\r
+                                                <property name="flag">wxALIGN_BOTTOM|wxALIGN_RIGHT</property>\r
+                                                <property name="proportion">1</property>\r
+                                                <object class="wxBoxSizer" expanded="1">\r
+                                                    <property name="minimum_size"></property>\r
+                                                    <property name="name">bSizer13</property>\r
+                                                    <property name="orient">wxHORIZONTAL</property>\r
+                                                    <property name="permission">none</property>\r
+                                                    <object class="sizeritem" expanded="1">\r
+                                                        <property name="border">5</property>\r
+                                                        <property name="flag"></property>\r
+                                                        <property name="proportion">1</property>\r
+                                                        <object class="wxBoxSizer" expanded="1">\r
+                                                            <property name="minimum_size"></property>\r
+                                                            <property name="name">bSizer12</property>\r
+                                                            <property name="orient">wxVERTICAL</property>\r
+                                                            <property name="permission">none</property>\r
+                                                            <object class="sizeritem" expanded="0">\r
+                                                                <property name="border">5</property>\r
+                                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
+                                                                <property name="proportion">0</property>\r
+                                                                <object class="wxToggleButton" 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">On / Off</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_toggleBtn3</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="value">0</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="OnToggleButton">OnTogRight</event>\r
+                                                                    <event name="OnUpdateUI"></event>\r
+                                                                </object>\r
+                                                            </object>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                    <object class="sizeritem" expanded="1">\r
+                                                        <property name="border">5</property>\r
+                                                        <property name="flag"></property>\r
+                                                        <property name="proportion">1</property>\r
+                                                        <object class="wxBoxSizer" expanded="1">\r
+                                                            <property name="minimum_size"></property>\r
+                                                            <property name="name">bSizer11</property>\r
+                                                            <property name="orient">wxVERTICAL</property>\r
+                                                            <property name="permission">none</property>\r
+                                                            <object class="sizeritem" expanded="0">\r
+                                                                <property name="border">5</property>\r
+                                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</property>\r
+                                                                <property name="proportion">0</property>\r
+                                                                <object class="wxToggleButton" 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">On / Off</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_toggleBtn2</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="value">1</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="OnToggleButton">OnTogLeft</event>\r
+                                                                    <event name="OnUpdateUI"></event>\r
+                                                                </object>\r
+                                                            </object>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
                                         </object>\r
                                     </object>\r
                                 </object>\r
                             </object>\r
                             <object class="sizeritem" expanded="1">\r
                                 <property name="border">5</property>\r
-                                <property name="flag">wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
+                                <property name="flag">wxALIGN_BOTTOM|wxALIGN_RIGHT</property>\r
+                                <property name="proportion">0</property>\r
                                 <object class="wxBoxSizer" expanded="1">\r
-                                    <property name="minimum_size">65,65</property>\r
-                                    <property name="name">bSizer3</property>\r
+                                    <property name="minimum_size"></property>\r
+                                    <property name="name">bSizer16</property>\r
                                     <property name="orient">wxVERTICAL</property>\r
                                     <property name="permission">none</property>\r
                                     <object class="sizeritem" expanded="0">\r
                                         <property name="border">5</property>\r
-                                        <property name="flag">wxALL|wxEXPAND</property>\r
-                                        <property name="proportion">1</property>\r
-                                        <object class="wxComboBox" expanded="0">\r
+                                        <property name="flag"></property>\r
+                                        <property name="proportion">0</property>\r
+                                        <object class="wxButton" expanded="0">\r
                                             <property name="BottomDockable">1</property>\r
                                             <property name="LeftDockable">1</property>\r
                                             <property name="RightDockable">1</property>\r
@@ -546,10 +1023,10 @@
                                             <property name="caption"></property>\r
                                             <property name="caption_visible">1</property>\r
                                             <property name="center_pane">0</property>\r
-                                            <property name="choices"></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">1</property>\r
                                             <property name="default_pane">0</property>\r
                                             <property name="dock">Dock</property>\r
                                             <property name="dock_fixed">0</property>\r
@@ -561,14 +1038,15 @@
                                             <property name="gripper">0</property>\r
                                             <property name="hidden">0</property>\r
                                             <property name="id">wxID_ANY</property>\r
+                                            <property name="label">Exit</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">65,65</property>\r
+                                            <property name="minimum_size"></property>\r
                                             <property name="moveable">1</property>\r
-                                            <property name="name">m_comboBoxRight</property>\r
+                                            <property name="name">m_button1</property>\r
                                             <property name="pane_border">1</property>\r
                                             <property name="pane_position"></property>\r
                                             <property name="pane_size"></property>\r
@@ -576,23 +1054,21 @@
                                             <property name="pin_button">1</property>\r
                                             <property name="pos"></property>\r
                                             <property name="resize">Resizable</property>\r
-                                            <property name="selection">-1</property>\r
                                             <property name="show">1</property>\r
                                             <property name="size"></property>\r
-                                            <property name="style">wxCB_SIMPLE</property>\r
+                                            <property name="style"></property>\r
                                             <property name="subclass"></property>\r
                                             <property name="toolbar_pane">0</property>\r
-                                            <property name="tooltip">Output Audio Interface</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="OnButtonClick">OnExitClick</event>\r
                                             <event name="OnChar"></event>\r
-                                            <event name="OnCombobox">OnComboRight</event>\r
                                             <event name="OnEnterWindow"></event>\r
                                             <event name="OnEraseBackground"></event>\r
                                             <event name="OnKeyDown"></event>\r
@@ -614,694 +1090,11 @@
                                             <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="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">1</property>\r
-                                <object class="spacer" expanded="0">\r
-                                    <property name="height">0</property>\r
-                                    <property name="permission">protected</property>\r
-                                    <property name="width">0</property>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND</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">Behavor:</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_staticText2</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="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="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">5</property>\r
-                                <property name="flag">wxALL|wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="wxGauge" 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_gauge1</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="range">100</property>\r
-                                    <property name="resize">Resizable</property>\r
-                                    <property name="show">1</property>\r
-                                    <property name="size"></property>\r
-                                    <property name="style">wxGA_HORIZONTAL|wxGA_SMOOTH</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="OnUpdateUI"></event>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxALL|wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="wxSlider" 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="maxValue">100</property>\r
-                                    <property name="max_size"></property>\r
-                                    <property name="maximize_button">0</property>\r
-                                    <property name="maximum_size"></property>\r
-                                    <property name="minValue">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_slider1</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">wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP</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">50</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="OnCommandScroll"></event>\r
-                                    <event name="OnCommandScrollBottom"></event>\r
-                                    <event name="OnCommandScrollChanged"></event>\r
-                                    <event name="OnCommandScrollLineDown"></event>\r
-                                    <event name="OnCommandScrollLineUp"></event>\r
-                                    <event name="OnCommandScrollPageDown"></event>\r
-                                    <event name="OnCommandScrollPageUp"></event>\r
-                                    <event name="OnCommandScrollThumbRelease"></event>\r
-                                    <event name="OnCommandScrollThumbTrack"></event>\r
-                                    <event name="OnCommandScrollTop"></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="OnScroll">OnScroll</event>\r
-                                    <event name="OnScrollBottom"></event>\r
-                                    <event name="OnScrollChanged"></event>\r
-                                    <event name="OnScrollLineDown"></event>\r
-                                    <event name="OnScrollLineUp"></event>\r
-                                    <event name="OnScrollPageDown"></event>\r
-                                    <event name="OnScrollPageUp"></event>\r
-                                    <event name="OnScrollThumbRelease"></event>\r
-                                    <event name="OnScrollThumbTrack"></event>\r
-                                    <event name="OnScrollTop"></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">5</property>\r
-                                <property name="flag">wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="spacer" expanded="0">\r
-                                    <property name="height">0</property>\r
-                                    <property name="permission">protected</property>\r
-                                    <property name="width">0</property>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxALL|wxEXPAND</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"></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_staticText5</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="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">5</property>\r
-                                <property name="flag">wxALL|wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="wxToggleButton" 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">On / Off</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_toggleBtn2</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="value">1</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="OnToggleButton">OnTogLeft</event>\r
-                                    <event name="OnUpdateUI"></event>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxALL|wxEXPAND</property>\r
-                                <property name="proportion">0</property>\r
-                                <object class="wxToggleButton" 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">On / Off</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_toggleBtn3</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="value">1</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="OnToggleButton">OnTogRight</event>\r
-                                    <event name="OnUpdateUI"></event>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag"></property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="spacer" expanded="0">\r
-                                    <property name="height">0</property>\r
-                                    <property name="permission">protected</property>\r
-                                    <property name="width">0</property>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag"></property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="spacer" expanded="0">\r
-                                    <property name="height">0</property>\r
-                                    <property name="permission">protected</property>\r
-                                    <property name="width">0</property>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag"></property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="spacer" expanded="0">\r
-                                    <property name="height">0</property>\r
-                                    <property name="permission">protected</property>\r
-                                    <property name="width">0</property>\r
-                                </object>\r
-                            </object>\r
-                            <object class="sizeritem" expanded="0">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL</property>\r
-                                <property name="proportion">0</property>\r
-                                <object class="wxButton" 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">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">Exit</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_button1</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="window_extra_style"></property>\r
-                                    <property name="window_name"></property>\r
-                                    <property name="window_style"></property>\r
-                                    <event name="OnButtonClick">OnExitClick</event>\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>\r
                     </object>\r
                 </object>\r

diff --git a/fdmdv2/pa_cppbinding_test/gui.h b/fdmdv2/pa_cppbinding_test/gui.h
index b0fd86e142186890f913b8a5555657b6ec15410d..e27f921a3561fa285ee16e98a2ff1d844abac198 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.h
+++ b/fdmdv2/pa_cppbinding_test/gui.h
@@ -20,7 +20,6 @@
 #include <wx/font.h>\r
 #include <wx/colour.h>\r
 #include <wx/settings.h>\r
-#include <wx/stattext.h>\r
 #include <wx/combobox.h>\r
 #include <wx/sizer.h>\r
 #include <wx/gauge.h>\r
@@ -45,15 +44,12 @@ class MainFrameBase : public wxFrame
                wxMenuBar* m_menuBar;\r
                wxMenu* m_menuFile;\r
                wxPanel* m_audioInfo;\r
-               wxStaticText* m_staticText1;\r
                wxComboBox* m_comboBoxLeft;\r
                wxComboBox* m_comboBoxRight;\r
-               wxStaticText* m_staticText2;\r
                wxGauge* m_gauge1;\r
                wxSlider* m_slider1;\r
-               wxStaticText* m_staticText5;\r
-               wxToggleButton* m_toggleBtn2;\r
                wxToggleButton* m_toggleBtn3;\r
+               wxToggleButton* m_toggleBtn2;\r
                wxButton* m_button1;\r
                wxStatusBar* m_statusBar;\r
                \r
@@ -63,13 +59,13 @@ class MainFrameBase : public wxFrame
                virtual void OnComboLeft( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnComboRight( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnScroll( wxScrollEvent& event ) { event.Skip(); }\r
-               virtual void OnTogLeft( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnTogRight( wxCommandEvent& event ) { event.Skip(); }\r
+               virtual void OnTogLeft( wxCommandEvent& event ) { event.Skip(); }\r
                \r
        \r
        public:\r
                \r
-               MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Test PortAudio CPP Binding "), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Test PortAudio CPP Binding "), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 577,365 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
                \r
                ~MainFrameBase();\r
        \r

diff --git a/fdmdv2/pa_cppbinding_test/gui.py b/fdmdv2/pa_cppbinding_test/gui.py
index 30ef15d1457241709931bbc72a806400f015c2ee..021031a2961fbe075052ef4df92589776b5f498f 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.py
+++ b/fdmdv2/pa_cppbinding_test/gui.py
@@ -20,7 +20,7 @@ _ = gettext.gettext
 class MainFrameBase ( wx.Frame ):\r
        \r
        def __init__( self, parent ):\r
-               wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Test PortAudio CPP Binding "), pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )\r
+               wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Test PortAudio CPP Binding "), pos = wx.DefaultPosition, size = wx.Size( 577,365 ), style = wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )\r
                \r
                self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )\r
                \r
@@ -38,91 +38,111 @@ class MainFrameBase ( wx.Frame ):
                self.m_audioInfo = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )\r
                self.m_audioInfo.SetMinSize( wx.Size( 65,65 ) )\r
                \r
-               fgSizer1 = wx.FlexGridSizer( 4, 4, 1, 1 )\r
-               fgSizer1.AddGrowableCol( 3 )\r
-               fgSizer1.AddGrowableRow( 3 )\r
-               fgSizer1.SetFlexibleDirection( wx.BOTH )\r
-               fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_ALL )\r
+               bSizer17 = wx.BoxSizer( wx.VERTICAL )\r
                \r
+               bSizer15 = wx.BoxSizer( wx.VERTICAL )\r
                \r
-               fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )\r
+               bSizer9 = wx.BoxSizer( wx.VERTICAL )\r
                \r
-               self.m_staticText1 = wx.StaticText( self.m_audioInfo, wx.ID_ANY, _(u"Input, Output:"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT )\r
-               self.m_staticText1.Wrap( -1 )\r
-               fgSizer1.Add( self.m_staticText1, 1, wx.ALL|wx.EXPAND, 5 )\r
+               bSizer7 = wx.BoxSizer( wx.HORIZONTAL )\r
                \r
-               bSizer2 = wx.BoxSizer( wx.VERTICAL )\r
+               bSizer2 = wx.BoxSizer( wx.HORIZONTAL )\r
                \r
                bSizer2.SetMinSize( wx.Size( 65,65 ) ) \r
                m_comboBoxLeftChoices = []\r
-               self.m_comboBoxLeft = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxLeftChoices, wx.CB_SIMPLE )\r
+               self.m_comboBoxLeft = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxLeftChoices, 0 )\r
                self.m_comboBoxLeft.SetToolTipString( _(u"Input Audio Interface") )\r
                self.m_comboBoxLeft.SetMinSize( wx.Size( 65,65 ) )\r
                \r
                bSizer2.Add( self.m_comboBoxLeft, 1, wx.ALL|wx.EXPAND, 5 )\r
                \r
                \r
-               fgSizer1.Add( bSizer2, 1, wx.EXPAND|wx.FIXED_MINSIZE, 5 )\r
+               bSizer7.Add( bSizer2, 1, wx.EXPAND, 5 )\r
                \r
-               bSizer3 = wx.BoxSizer( wx.VERTICAL )\r
+               bSizer3 = wx.BoxSizer( wx.HORIZONTAL )\r
                \r
                bSizer3.SetMinSize( wx.Size( 65,65 ) ) \r
                m_comboBoxRightChoices = []\r
-               self.m_comboBoxRight = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxRightChoices, wx.CB_SIMPLE )\r
+               self.m_comboBoxRight = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxRightChoices, 0 )\r
                self.m_comboBoxRight.SetToolTipString( _(u"Output Audio Interface") )\r
-               self.m_comboBoxRight.SetMinSize( wx.Size( 65,65 ) )\r
+               self.m_comboBoxRight.SetMinSize( wx.Size( 65,35 ) )\r
                \r
                bSizer3.Add( self.m_comboBoxRight, 1, wx.ALL|wx.EXPAND, 5 )\r
                \r
                \r
-               fgSizer1.Add( bSizer3, 1, wx.EXPAND, 5 )\r
+               bSizer7.Add( bSizer3, 1, wx.EXPAND, 5 )\r
                \r
                \r
-               fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )\r
+               bSizer9.Add( bSizer7, 1, wx.EXPAND, 5 )\r
                \r
-               self.m_staticText2 = wx.StaticText( self.m_audioInfo, wx.ID_ANY, _(u"Behavor:"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT )\r
-               self.m_staticText2.Wrap( -1 )\r
-               fgSizer1.Add( self.m_staticText2, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL|wx.EXPAND, 5 )\r
+               \r
+               bSizer15.Add( bSizer9, 0, wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 )\r
+               \r
+               bSizer10 = wx.BoxSizer( wx.HORIZONTAL )\r
+               \r
+               bSizer5 = wx.BoxSizer( wx.HORIZONTAL )\r
                \r
                self.m_gauge1 = wx.Gauge( self.m_audioInfo, wx.ID_ANY, 100, wx.DefaultPosition, wx.DefaultSize, wx.GA_HORIZONTAL|wx.GA_SMOOTH )\r
-               fgSizer1.Add( self.m_gauge1, 1, wx.ALL|wx.EXPAND, 5 )\r
+               bSizer5.Add( self.m_gauge1, 1, wx.ALL, 5 )\r
+               \r
+               \r
+               bSizer10.Add( bSizer5, 1, wx.EXPAND, 5 )\r
+               \r
+               bSizer6 = wx.BoxSizer( wx.HORIZONTAL )\r
                \r
                self.m_slider1 = wx.Slider( self.m_audioInfo, wx.ID_ANY, 50, 0, 100, wx.DefaultPosition, wx.DefaultSize, wx.SL_AUTOTICKS|wx.SL_HORIZONTAL|wx.SL_SELRANGE|wx.SL_TOP )\r
-               fgSizer1.Add( self.m_slider1, 1, wx.ALL|wx.EXPAND, 5 )\r
+               bSizer6.Add( self.m_slider1, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 5 )\r
+               \r
+               \r
+               bSizer10.Add( bSizer6, 1, wx.EXPAND, 5 )\r
+               \r
+               \r
+               bSizer15.Add( bSizer10, 1, wx.EXPAND, 5 )\r
+               \r
+               bSizer14 = wx.BoxSizer( wx.HORIZONTAL )\r
+               \r
+               bSizer13 = wx.BoxSizer( wx.HORIZONTAL )\r
+               \r
+               bSizer12 = wx.BoxSizer( wx.VERTICAL )\r
+               \r
+               self.m_toggleBtn3 = wx.ToggleButton( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 )\r
+               bSizer12.Add( self.m_toggleBtn3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 )\r
                \r
                \r
-               fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )\r
+               bSizer13.Add( bSizer12, 1, 0, 5 )\r
                \r
-               self.m_staticText5 = wx.StaticText( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )\r
-               self.m_staticText5.Wrap( -1 )\r
-               fgSizer1.Add( self.m_staticText5, 1, wx.ALL|wx.EXPAND, 5 )\r
+               bSizer11 = wx.BoxSizer( wx.VERTICAL )\r
                \r
                self.m_toggleBtn2 = wx.ToggleButton( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 )\r
                self.m_toggleBtn2.SetValue( True ) \r
-               fgSizer1.Add( self.m_toggleBtn2, 1, wx.ALL|wx.EXPAND, 5 )\r
+               bSizer11.Add( self.m_toggleBtn2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )\r
                \r
-               self.m_toggleBtn3 = wx.ToggleButton( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 )\r
-               self.m_toggleBtn3.SetValue( True ) \r
-               fgSizer1.Add( self.m_toggleBtn3, 0, wx.ALL|wx.EXPAND, 5 )\r
+               \r
+               bSizer13.Add( bSizer11, 1, 0, 5 )\r
                \r
                \r
-               fgSizer1.AddSpacer( ( 0, 0), 1, 0, 5 )\r
+               bSizer14.Add( bSizer13, 1, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT, 5 )\r
                \r
                \r
-               fgSizer1.AddSpacer( ( 0, 0), 1, 0, 5 )\r
+               bSizer15.Add( bSizer14, 0, wx.EXPAND, 5 )\r
                \r
                \r
-               fgSizer1.AddSpacer( ( 0, 0), 1, 0, 5 )\r
+               bSizer17.Add( bSizer15, 1, wx.EXPAND, 5 )\r
+               \r
+               bSizer16 = wx.BoxSizer( wx.VERTICAL )\r
                \r
                self.m_button1 = wx.Button( self.m_audioInfo, wx.ID_ANY, _(u"Exit"), wx.DefaultPosition, wx.DefaultSize, 0 )\r
                self.m_button1.SetDefault() \r
-               fgSizer1.Add( self.m_button1, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT|wx.ALL, 5 )\r
+               bSizer16.Add( self.m_button1, 0, 0, 5 )\r
+               \r
+               \r
+               bSizer17.Add( bSizer16, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT, 5 )\r
                \r
                \r
-               self.m_audioInfo.SetSizer( fgSizer1 )\r
+               self.m_audioInfo.SetSizer( bSizer17 )\r
                self.m_audioInfo.Layout()\r
-               fgSizer1.Fit( self.m_audioInfo )\r
-               mainSizer.Add( self.m_audioInfo, 1, wx.ALL|wx.EXPAND|wx.FIXED_MINSIZE, 0 )\r
+               bSizer17.Fit( self.m_audioInfo )\r
+               mainSizer.Add( self.m_audioInfo, 1, wx.EXPAND, 0 )\r
                \r
                \r
                self.SetSizer( mainSizer )\r
@@ -137,8 +157,8 @@ class MainFrameBase ( wx.Frame ):
                self.m_comboBoxLeft.Bind( wx.EVT_COMBOBOX, self.OnComboLeft )\r
                self.m_comboBoxRight.Bind( wx.EVT_COMBOBOX, self.OnComboRight )\r
                self.m_slider1.Bind( wx.EVT_SCROLL, self.OnScroll )\r
-               self.m_toggleBtn2.Bind( wx.EVT_TOGGLEBUTTON, self.OnTogLeft )\r
                self.m_toggleBtn3.Bind( wx.EVT_TOGGLEBUTTON, self.OnTogRight )\r
+               self.m_toggleBtn2.Bind( wx.EVT_TOGGLEBUTTON, self.OnTogLeft )\r
                self.m_button1.Bind( wx.EVT_BUTTON, self.OnExitClick )\r
        \r
        def __del__( self ):\r
@@ -161,10 +181,10 @@ class MainFrameBase ( wx.Frame ):
        def OnScroll( self, event ):\r
                event.Skip()\r
        \r
-       def OnTogLeft( self, event ):\r
+       def OnTogRight( self, event ):\r
                event.Skip()\r
        \r
-       def OnTogRight( self, event ):\r
+       def OnTogLeft( self, event ):\r
                event.Skip()\r
        \r
        \r

diff --git a/fdmdv2/pa_cppbinding_test/gui.xrc b/fdmdv2/pa_cppbinding_test/gui.xrc
index a7a3148b8be28eca5d299679b1480f3188f907bc..b64fad7ceb7048610a9c0f5f39660bb027abe3d2 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.xrc
+++ b/fdmdv2/pa_cppbinding_test/gui.xrc
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\r
 <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">\r
        <object class="wxFrame" name="MainFrameBase">\r
-               <style>wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL</style>\r
-               <size>500,300</size>\r
+               <style>wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL</style>\r
+               <size>577,365</size>\r
                <title>Test PortAudio CPP Binding </title>\r
                <centered>1</centered>\r
                <aui_managed>0</aui_managed>\r
@@ -18,166 +18,182 @@
                </object>\r
                <object class="wxPanel" name="m_audioInfo">\r
                        <style>wxTAB_TRAVERSAL</style>\r
-                       <object class="wxFlexGridSizer">\r
-                               <rows>4</rows>\r
-                               <cols>4</cols>\r
-                               <vgap>1</vgap>\r
-                               <hgap>1</hgap>\r
-                               <growablecols>3</growablecols>\r
-                               <growablerows>3</growablerows>\r
-                               <object class="spacer">\r
-                                       <option>1</option>\r
-                                       <flag>wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <size>0,0</size>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxStaticText" name="m_staticText1">\r
-                                               <style>wxALIGN_RIGHT</style>\r
-                                               <label>Input, Output:</label>\r
-                                               <wrap>-1</wrap>\r
-                                       </object>\r
-                               </object>\r
+                       <object class="wxBoxSizer">\r
+                               <orient>wxVERTICAL</orient>\r
                                <object class="sizeritem">\r
                                        <option>1</option>\r
-                                       <flag>wxEXPAND|wxFIXED_MINSIZE</flag>\r
+                                       <flag>wxEXPAND</flag>\r
                                        <border>5</border>\r
                                        <object class="wxBoxSizer">\r
-                                               <minsize>65,65</minsize>\r
                                                <orient>wxVERTICAL</orient>\r
+                                               <object class="sizeritem">\r
+                                                       <option>0</option>\r
+                                                       <flag>wxALIGN_CENTER_VERTICAL|wxEXPAND</flag>\r
+                                                       <border>5</border>\r
+                                                       <object class="wxBoxSizer">\r
+                                                               <orient>wxVERTICAL</orient>\r
+                                                               <object class="sizeritem">\r
+                                                                       <option>1</option>\r
+                                                                       <flag>wxEXPAND</flag>\r
+                                                                       <border>5</border>\r
+                                                                       <object class="wxBoxSizer">\r
+                                                                               <orient>wxHORIZONTAL</orient>\r
+                                                                               <object class="sizeritem">\r
+                                                                                       <option>1</option>\r
+                                                                                       <flag>wxEXPAND</flag>\r
+                                                                                       <border>5</border>\r
+                                                                                       <object class="wxBoxSizer">\r
+                                                                                               <minsize>65,65</minsize>\r
+                                                                                               <orient>wxHORIZONTAL</orient>\r
+                                                                                               <object class="sizeritem">\r
+                                                                                                       <option>1</option>\r
+                                                                                                       <flag>wxALL|wxEXPAND</flag>\r
+                                                                                                       <border>5</border>\r
+                                                                                                       <object class="wxComboBox" name="m_comboBoxLeft">\r
+                                                                                                               <tooltip>Input Audio Interface</tooltip>\r
+                                                                                                               <value></value>\r
+                                                                                                               <content />\r
+                                                                                                       </object>\r
+                                                                                               </object>\r
+                                                                                       </object>\r
+                                                                               </object>\r
+                                                                               <object class="sizeritem">\r
+                                                                                       <option>1</option>\r
+                                                                                       <flag>wxEXPAND</flag>\r
+                                                                                       <border>5</border>\r
+                                                                                       <object class="wxBoxSizer">\r
+                                                                                               <minsize>65,65</minsize>\r
+                                                                                               <orient>wxHORIZONTAL</orient>\r
+                                                                                               <object class="sizeritem">\r
+                                                                                                       <option>1</option>\r
+                                                                                                       <flag>wxALL|wxEXPAND</flag>\r
+                                                                                                       <border>5</border>\r
+                                                                                                       <object class="wxComboBox" name="m_comboBoxRight">\r
+                                                                                                               <tooltip>Output Audio Interface</tooltip>\r
+                                                                                                               <value></value>\r
+                                                                                                               <content />\r
+                                                                                                       </object>\r
+                                                                                               </object>\r
+                                                                                       </object>\r
+                                                                               </object>\r
+                                                                       </object>\r
+                                                               </object>\r
+                                                       </object>\r
+                                               </object>\r
                                                <object class="sizeritem">\r
                                                        <option>1</option>\r
-                                                       <flag>wxALL|wxEXPAND</flag>\r
+                                                       <flag>wxEXPAND</flag>\r
                                                        <border>5</border>\r
-                                                       <object class="wxComboBox" name="m_comboBoxLeft">\r
-                                                               <style>wxCB_SIMPLE</style>\r
-                                                               <tooltip>Input Audio Interface</tooltip>\r
-                                                               <value></value>\r
-                                                               <content />\r
+                                                       <object class="wxBoxSizer">\r
+                                                               <orient>wxHORIZONTAL</orient>\r
+                                                               <object class="sizeritem">\r
+                                                                       <option>1</option>\r
+                                                                       <flag>wxEXPAND</flag>\r
+                                                                       <border>5</border>\r
+                                                                       <object class="wxBoxSizer">\r
+                                                                               <orient>wxHORIZONTAL</orient>\r
+                                                                               <object class="sizeritem">\r
+                                                                                       <option>1</option>\r
+                                                                                       <flag>wxALL</flag>\r
+                                                                                       <border>5</border>\r
+                                                                                       <object class="wxGauge" name="m_gauge1">\r
+                                                                                               <style>wxGA_HORIZONTAL|wxGA_SMOOTH</style>\r
+                                                                                               <range>100</range>\r
+                                                                                               <value>0</value>\r
+                                                                                       </object>\r
+                                                                               </object>\r
+                                                                       </object>\r
+                                                               </object>\r
+                                                               <object class="sizeritem">\r
+                                                                       <option>1</option>\r
+                                                                       <flag>wxEXPAND</flag>\r
+                                                                       <border>5</border>\r
+                                                                       <object class="wxBoxSizer">\r
+                                                                               <orient>wxHORIZONTAL</orient>\r
+                                                                               <object class="sizeritem">\r
+                                                                                       <option>1</option>\r
+                                                                                       <flag>wxALIGN_CENTER|wxALL|wxEXPAND</flag>\r
+                                                                                       <border>5</border>\r
+                                                                                       <object class="wxSlider" name="m_slider1">\r
+                                                                                               <style>wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP</style>\r
+                                                                                               <value>50</value>\r
+                                                                                               <min>0</min>\r
+                                                                                               <max>100</max>\r
+                                                                                       </object>\r
+                                                                               </object>\r
+                                                                       </object>\r
+                                                               </object>\r
+                                                       </object>\r
+                                               </object>\r
+                                               <object class="sizeritem">\r
+                                                       <option>0</option>\r
+                                                       <flag>wxEXPAND</flag>\r
+                                                       <border>5</border>\r
+                                                       <object class="wxBoxSizer">\r
+                                                               <orient>wxHORIZONTAL</orient>\r
+                                                               <object class="sizeritem">\r
+                                                                       <option>1</option>\r
+                                                                       <flag>wxALIGN_BOTTOM|wxALIGN_RIGHT</flag>\r
+                                                                       <border>5</border>\r
+                                                                       <object class="wxBoxSizer">\r
+                                                                               <orient>wxHORIZONTAL</orient>\r
+                                                                               <object class="sizeritem">\r
+                                                                                       <option>1</option>\r
+                                                                                       <flag></flag>\r
+                                                                                       <border>5</border>\r
+                                                                                       <object class="wxBoxSizer">\r
+                                                                                               <orient>wxVERTICAL</orient>\r
+                                                                                               <object class="sizeritem">\r
+                                                                                                       <option>0</option>\r
+                                                                                                       <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</flag>\r
+                                                                                                       <border>5</border>\r
+                                                                                                       <object class="wxToggleButton" name="m_toggleBtn3">\r
+                                                                                                               <label>On / Off</label>\r
+                                                                                                               <checked>0</checked>\r
+                                                                                                       </object>\r
+                                                                                               </object>\r
+                                                                                       </object>\r
+                                                                               </object>\r
+                                                                               <object class="sizeritem">\r
+                                                                                       <option>1</option>\r
+                                                                                       <flag></flag>\r
+                                                                                       <border>5</border>\r
+                                                                                       <object class="wxBoxSizer">\r
+                                                                                               <orient>wxVERTICAL</orient>\r
+                                                                                               <object class="sizeritem">\r
+                                                                                                       <option>0</option>\r
+                                                                                                       <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>\r
+                                                                                                       <border>5</border>\r
+                                                                                                       <object class="wxToggleButton" name="m_toggleBtn2">\r
+                                                                                                               <label>On / Off</label>\r
+                                                                                                               <checked>1</checked>\r
+                                                                                                       </object>\r
+                                                                                               </object>\r
+                                                                                       </object>\r
+                                                                               </object>\r
+                                                                       </object>\r
+                                                               </object>\r
                                                        </object>\r
                                                </object>\r
                                        </object>\r
                                </object>\r
                                <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxEXPAND</flag>\r
+                                       <option>0</option>\r
+                                       <flag>wxALIGN_BOTTOM|wxALIGN_RIGHT</flag>\r
                                        <border>5</border>\r
                                        <object class="wxBoxSizer">\r
-                                               <minsize>65,65</minsize>\r
                                                <orient>wxVERTICAL</orient>\r
                                                <object class="sizeritem">\r
-                                                       <option>1</option>\r
-                                                       <flag>wxALL|wxEXPAND</flag>\r
+                                                       <option>0</option>\r
+                                                       <flag></flag>\r
                                                        <border>5</border>\r
-                                                       <object class="wxComboBox" name="m_comboBoxRight">\r
-                                                               <style>wxCB_SIMPLE</style>\r
-                                                               <tooltip>Output Audio Interface</tooltip>\r
-                                                               <value></value>\r
-                                                               <content />\r
+                                                       <object class="wxButton" name="m_button1">\r
+                                                               <label>Exit</label>\r
+                                                               <default>1</default>\r
                                                        </object>\r
                                                </object>\r
                                        </object>\r
                                </object>\r
-                               <object class="spacer">\r
-                                       <option>1</option>\r
-                                       <flag>wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <size>0,0</size>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxStaticText" name="m_staticText2">\r
-                                               <style>wxALIGN_RIGHT</style>\r
-                                               <label>Behavor:</label>\r
-                                               <wrap>-1</wrap>\r
-                                       </object>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxGauge" name="m_gauge1">\r
-                                               <style>wxGA_HORIZONTAL|wxGA_SMOOTH</style>\r
-                                               <range>100</range>\r
-                                               <value>0</value>\r
-                                       </object>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxSlider" name="m_slider1">\r
-                                               <style>wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP</style>\r
-                                               <value>50</value>\r
-                                               <min>0</min>\r
-                                               <max>100</max>\r
-                                       </object>\r
-                               </object>\r
-                               <object class="spacer">\r
-                                       <option>1</option>\r
-                                       <flag>wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <size>0,0</size>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxStaticText" name="m_staticText5">\r
-                                               <label></label>\r
-                                               <wrap>-1</wrap>\r
-                                       </object>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>1</option>\r
-                                       <flag>wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxToggleButton" name="m_toggleBtn2">\r
-                                               <label>On / Off</label>\r
-                                               <checked>1</checked>\r
-                                       </object>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>0</option>\r
-                                       <flag>wxALL|wxEXPAND</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxToggleButton" name="m_toggleBtn3">\r
-                                               <label>On / Off</label>\r
-                                               <checked>1</checked>\r
-                                       </object>\r
-                               </object>\r
-                               <object class="spacer">\r
-                                       <option>1</option>\r
-                                       <flag></flag>\r
-                                       <border>5</border>\r
-                                       <size>0,0</size>\r
-                               </object>\r
-                               <object class="spacer">\r
-                                       <option>1</option>\r
-                                       <flag></flag>\r
-                                       <border>5</border>\r
-                                       <size>0,0</size>\r
-                               </object>\r
-                               <object class="spacer">\r
-                                       <option>1</option>\r
-                                       <flag></flag>\r
-                                       <border>5</border>\r
-                                       <size>0,0</size>\r
-                               </object>\r
-                               <object class="sizeritem">\r
-                                       <option>0</option>\r
-                                       <flag>wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL</flag>\r
-                                       <border>5</border>\r
-                                       <object class="wxButton" name="m_button1">\r
-                                               <label>Exit</label>\r
-                                               <default>1</default>\r
-                                       </object>\r
-                               </object>\r
                        </object>\r
                </object>\r
                <object class="wxStatusBar" name="m_statusBar">\r

diff --git a/fdmdv2/pa_cppbinding_test/main.cpp b/fdmdv2/pa_cppbinding_test/main.cpp
index 24aecd4fb09dfc8c2d3e287b450f5cfb94698a39..f3be47f9efdc9843a753738bff7781360211f066 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/main.cpp
+++ b/fdmdv2/pa_cppbinding_test/main.cpp
@@ -51,6 +51,31 @@ void MainFrame::OnExitClick(wxCommandEvent& event)
     Destroy();\r
 }\r
 \r
+void MainFrame::OnComboLeft( wxCommandEvent& event )\r
+{\r
+    event.Skip();\r
+}\r
+\r
+void MainFrame::OnComboRight( wxCommandEvent& event )\r
+{\r
+    event.Skip();\r
+}\r
+\r
+void MainFrame::OnScroll( wxScrollEvent& event )\r
+{\r
+    event.Skip();\r
+}\r
+\r
+void MainFrame::OnTogLeft( wxCommandEvent& event )\r
+{\r
+    event.Skip();\r
+}\r
+\r
+void MainFrame::OnTogRight( wxCommandEvent& event )\r
+{\r
+    event.Skip();\r
+}\r
+\r
 void MainFrame::printSupportedStandardSampleRates(
         const portaudio::DirectionSpecificStreamParameters &inputParameters,
         const portaudio::DirectionSpecificStreamParameters &outputParameters)
@@ -164,7 +189,7 @@ int MainFrame::populateAudioInfo()
             std::cout << "Default high input latency  = " << (*i).defaultHighInputLatency() << std::endl; // 8.3
             std::cout << "Default high output latency = " << (*i).defaultHighOutputLatency() << std::endl; // 8.3
 
-#ifdef WIN32
+#ifdef WIN32_ASIO
             // ASIO specific latency information:
             if ((*i).hostApi().typeId() == paASIO)
             {
@@ -183,7 +208,7 @@ int MainFrame::populateAudioInfo()
                     std::cout << "ASIO buffer granularity     = " << asioDevice.granularity() << std::endl;
                 }
             }
-#endif // WIN32
+#endif // WIN32_ASIO
 
             std::cout << "Default sample rate         = " << (*i).defaultSampleRate() << std::endl; // 8.2
 

diff --git a/fdmdv2/pa_cppbinding_test/main.h b/fdmdv2/pa_cppbinding_test/main.h
index 5684cd664a915e70a2dec5b88b0b90653f627b42..b60de6717be778a825bc0f8a0be6c0a43efbc03d 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/main.h
+++ b/fdmdv2/pa_cppbinding_test/main.h
@@ -55,6 +55,11 @@ class MainFrame : public MainFrameBase
                 const portaudio::DirectionSpecificStreamParameters &inputParameters,
                 const portaudio::DirectionSpecificStreamParameters &outputParameters);
         int populateAudioInfo();
+        void OnComboLeft( wxCommandEvent& event );\r
+        void OnComboRight( wxCommandEvent& event );\r
+        void OnScroll( wxScrollEvent& event );\r
+        void OnTogLeft( wxCommandEvent& event );\r
+        void OnTogRight( wxCommandEvent& event );\r
 };
 
 #endif //__main__

diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk
index 7c2527c9d8458327d6f247090e8e2567cefd9fc5..c93a93619ff54f940b5350ae9fb4afb28926337b 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk
+++ b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk
@@ -44,8 +44,8 @@ LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --un
 IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)./ $(IncludeSwitch)C:/bin/MinGW/msys/1.0/local/include $(IncludeSwitch)./portaudiocpp \r
 IncludePCH             := \r
 RcIncludePath          := \r
-Libs                   := $(LibrarySwitch)portaudiocpp.la $(LibrarySwitch)portaudio.la \r
-LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch). $(LibraryPathSwitch)../../extern/lib/ \r
+Libs                   := $(LibrarySwitch)portaudiocpp $(LibrarySwitch)portaudio \r
+LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch). \r
 \r
 \r
 ##\r

diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project
index 066f5a17e9fc2d711d86a7437fcf0a88676d50ef..b0051278749fdf70b90c6747f047d4d991b97d18 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project
+++ b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project
@@ -55,9 +55,9 @@
         <Preprocessor Value="__WX__"/>
       </Compiler>
       <Linker Options="-mwindows;$(shell wx-config --debug=yes --libs --unicode=yes)" Required="yes">
-        <LibraryPath Value="../extern/lib"/>
-        <Library Value="libportaudio.dll"/>
-        <Library Value="libportaudiocpp.dll.a"/>
+        <LibraryPath Value="."/>
+        <Library Value="libportaudiocpp.la"/>
+        <Library Value="libportaudio.la"/>
       </Linker>
       <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
       <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
@@ -99,9 +99,8 @@
       </Compiler>
       <Linker Options="-mwindows;-s;$(shell wx-config --debug=no --libs --unicode=yes)" Required="yes">
         <LibraryPath Value="."/>
-        <LibraryPath Value="../../extern/lib/"/>
-        <Library Value="libportaudiocpp.la"/>
-        <Library Value="libportaudio.la"/>
+        <Library Value="libportaudiocpp"/>
+        <Library Value="libportaudio"/>
       </Linker>
       <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
       <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>

diff --git a/fdmdv2/thread_audio.cpp b/fdmdv2/thread_audio.cpp
index 72793fdc436ecda76f4c200a46b6f4fc0a101655..d5c465c38043908f159dc69547b293946db22a87 100644 (file)
--- a/fdmdv2/thread_audio.cpp
+++ b/fdmdv2/thread_audio.cpp
@@ -38,7 +38,7 @@ static int audioCallback( void *inputBuffer, void *outputBuffer, unsigned long f
     }\r
     return 0;\r
 }\r
-\r
+#ifdef PORTAUDIO_MAIN\r
 /* Use a PortAudioStream to process audio data. */\r
 int main(void)\r
 {\r
@@ -53,3 +53,4 @@ int main(void)
     Pa_Terminate();\r
     return 0;\r
 }\r
+#endif  //PORTAUDIO_MAIN\r