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

diff --git a/fdmdv2/pa_cppbinding_test/Release/pa_cppbinding_test.exe b/fdmdv2/pa_cppbinding_test/Release/pa_cppbinding_test.exe
index f67b11308595c77fc32c6ddbe396f7bc7e982ca9..cc2158ca569718160d27dc3c0b6eccec18249c24 100644 (file)
Binary files a/fdmdv2/pa_cppbinding_test/Release/pa_cppbinding_test.exe and b/fdmdv2/pa_cppbinding_test/Release/pa_cppbinding_test.exe differ

diff --git a/fdmdv2/pa_cppbinding_test/gui.cpp b/fdmdv2/pa_cppbinding_test/gui.cpp
index 99791cb59944b4f8e28ed7b831eb625767f2e5db..5a2d98bfaad77b26c38c9df543d6a3b6c3551c44 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.cpp
+++ b/fdmdv2/pa_cppbinding_test/gui.cpp
@@ -11,190 +11,190 @@
 \r
 MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
-       \r
-       m_menuBar = new wxMenuBar( 0 );\r
-       m_menuFile = new wxMenu();\r
-       wxMenuItem* menuFileExit;\r
-       menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+X"), wxEmptyString, wxITEM_NORMAL );\r
-       m_menuFile->Append( menuFileExit );\r
-       \r
-       m_menuBar->Append( m_menuFile, _("&File") ); \r
-       \r
-       this->SetMenuBar( m_menuBar );\r
-       \r
-       wxBoxSizer* mainSizer;\r
-       mainSizer = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_audioInfo = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
-       m_audioInfo->SetMinSize( wxSize( 65,65 ) );\r
-       \r
-       wxBoxSizer* bSizer17;\r
-       bSizer17 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       wxBoxSizer* bSizer151;\r
-       bSizer151 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
-       wxStaticBoxSizer* sbSizerLeft;\r
-       sbSizerLeft = new wxStaticBoxSizer( new wxStaticBox( m_audioInfo, wxID_ANY, _("label") ), wxVERTICAL );\r
-       \r
-       m_listBoxTopLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
-       sbSizerLeft->Add( m_listBoxTopLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 3 );\r
-       \r
-       \r
-       bSizer151->Add( sbSizerLeft, 1, wxEXPAND, 1 );\r
-       \r
-       wxStaticBoxSizer* sbSizerRight;\r
-       sbSizerRight = new wxStaticBoxSizer( new wxStaticBox( m_audioInfo, wxID_ANY, _("label") ), wxVERTICAL );\r
-       \r
-       m_textTopRight = new wxTextCtrl( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTE_DONTWRAP|wxTE_MULTILINE );\r
-       m_textTopRight->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );\r
-       \r
-       sbSizerRight->Add( m_textTopRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 3 );\r
-       \r
-       \r
-       bSizer151->Add( sbSizerRight, 1, wxEXPAND, 1 );\r
-       \r
-       \r
-       bSizer17->Add( bSizer151, 1, wxEXPAND, 5 );\r
-       \r
-       wxBoxSizer* bSizer15;\r
-       bSizer15 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
-       wxBoxSizer* bSizer9;\r
-       bSizer9 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_listBoxMidLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
-       bSizer9->Add( m_listBoxMidLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
-       bSizer15->Add( bSizer9, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 1 );\r
-       \r
-       wxBoxSizer* bSizer18;\r
-       bSizer18 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_listBoxMidRight = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
-       bSizer18->Add( m_listBoxMidRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
-       bSizer15->Add( bSizer18, 1, wxEXPAND, 5 );\r
-       \r
-       \r
-       bSizer17->Add( bSizer15, 1, wxEXPAND, 1 );\r
-       \r
-       wxBoxSizer* bSizer91;\r
-       bSizer91 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
-       wxBoxSizer* bSizer71;\r
-       bSizer71 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
-       m_listBoxBottomLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
-       bSizer71->Add( m_listBoxBottomLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
-       bSizer91->Add( bSizer71, 1, wxEXPAND, 5 );\r
-       \r
-       wxBoxSizer* bSizer31;\r
-       bSizer31 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
-       bSizer31->SetMinSize( wxSize( 65,65 ) ); \r
-       m_listBoxBottomRight = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
-       bSizer31->Add( m_listBoxBottomRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
-       \r
-       \r
-       bSizer91->Add( bSizer31, 1, wxEXPAND, 5 );\r
-       \r
-       \r
-       bSizer17->Add( bSizer91, 1, wxEXPAND, 1 );\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
-       m_btnLeft = new wxButton( m_audioInfo, wxID_ANY, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer12->Add( m_btnLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 );\r
-       \r
-       \r
-       bSizer13->Add( bSizer12, 1, 0, 1 );\r
-       \r
-       wxBoxSizer* bSizer11;\r
-       bSizer11 = new wxBoxSizer( wxVERTICAL );\r
-       \r
-       m_btnRight = new wxButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer11->Add( m_btnRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 1 );\r
-       \r
-       \r
-       bSizer13->Add( bSizer11, 1, 0, 1 );\r
-       \r
-       \r
-       bSizer14->Add( bSizer13, 1, wxALIGN_BOTTOM|wxALIGN_RIGHT, 1 );\r
-       \r
-       \r
-       bSizer17->Add( bSizer14, 0, wxEXPAND, 5 );\r
-       \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
-       bSizer16->Add( m_button1, 0, 0, 1 );\r
-       \r
-       \r
-       bSizer17->Add( bSizer16, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 1 );\r
-       \r
-       \r
-       m_audioInfo->SetSizer( bSizer17 );\r
-       m_audioInfo->Layout();\r
-       bSizer17->Fit( m_audioInfo );\r
-       mainSizer->Add( m_audioInfo, 1, wxALIGN_CENTER|wxEXPAND, 1 );\r
-       \r
-       \r
-       this->SetSizer( mainSizer );\r
-       this->Layout();\r
-       m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );\r
-       \r
-       this->Centre( wxBOTH );\r
-       \r
-       // Connect Events\r
-       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
-       this->Connect( menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) );\r
-       m_listBoxTopLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftBox ), NULL, this );\r
-       m_listBoxTopLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftDClick ), NULL, this );\r
-       m_listBoxMidLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxClick ), NULL, this );\r
-       m_listBoxMidLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxDClick ), NULL, this );\r
-       m_listBoxMidRight->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxClick ), NULL, this );\r
-       m_listBoxMidRight->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxDClick ), NULL, this );\r
-       m_listBoxBottomLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftClick ), NULL, this );\r
-       m_listBoxBottomLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftDClick ), NULL, this );\r
-       m_listBoxBottomRight->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtClick ), NULL, this );\r
-       m_listBoxBottomRight->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtDClick ), NULL, this );\r
-       m_btnLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnLeft ), NULL, this );\r
-       m_btnRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnRight ), NULL, this );\r
-       m_button1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this );\r
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+\r
+    m_menuBar = new wxMenuBar( 0 );\r
+    m_menuFile = new wxMenu();\r
+    wxMenuItem* menuFileExit;\r
+    menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) + wxT('    ') + wxT("Alt+X"), wxEmptyString, wxITEM_NORMAL );\r
+    m_menuFile->Append( menuFileExit );\r
+\r
+    m_menuBar->Append( m_menuFile, _("&File") );\r
+\r
+    this->SetMenuBar( m_menuBar );\r
+\r
+    wxBoxSizer* mainSizer;\r
+    mainSizer = new wxBoxSizer( wxVERTICAL );\r
+\r
+    m_audioInfo = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+    m_audioInfo->SetMinSize( wxSize( 65,65 ) );\r
+\r
+    wxBoxSizer* bSizer17;\r
+    bSizer17 = new wxBoxSizer( wxVERTICAL );\r
+\r
+    wxBoxSizer* bSizer151;\r
+    bSizer151 = new wxBoxSizer( wxHORIZONTAL );\r
+\r
+    wxStaticBoxSizer* sbSizerLeft;\r
+    sbSizerLeft = new wxStaticBoxSizer( new wxStaticBox( m_audioInfo, wxID_ANY, _("label") ), wxVERTICAL );\r
+\r
+    m_listBoxTopLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
+    sbSizerLeft->Add( m_listBoxTopLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 3 );\r
+\r
+\r
+    bSizer151->Add( sbSizerLeft, 1, wxEXPAND, 1 );\r
+\r
+    wxStaticBoxSizer* sbSizerRight;\r
+    sbSizerRight = new wxStaticBoxSizer( new wxStaticBox( m_audioInfo, wxID_ANY, _("label") ), wxVERTICAL );\r
+\r
+    m_textTopRight = new wxTextCtrl( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTE_DONTWRAP|wxTE_MULTILINE );\r
+    m_textTopRight->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );\r
+\r
+    sbSizerRight->Add( m_textTopRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 3 );\r
+\r
+\r
+    bSizer151->Add( sbSizerRight, 1, wxEXPAND, 1 );\r
+\r
+\r
+    bSizer17->Add( bSizer151, 1, wxEXPAND, 5 );\r
+\r
+    wxBoxSizer* bSizer15;\r
+    bSizer15 = new wxBoxSizer( wxHORIZONTAL );\r
+\r
+    wxBoxSizer* bSizer9;\r
+    bSizer9 = new wxBoxSizer( wxVERTICAL );\r
+\r
+    m_listBoxMidLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
+    bSizer9->Add( m_listBoxMidLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
+\r
+\r
+    bSizer15->Add( bSizer9, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 1 );\r
+\r
+    wxBoxSizer* bSizer18;\r
+    bSizer18 = new wxBoxSizer( wxVERTICAL );\r
+\r
+    m_listBoxMidRight = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
+    bSizer18->Add( m_listBoxMidRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
+\r
+\r
+    bSizer15->Add( bSizer18, 1, wxEXPAND, 5 );\r
+\r
+\r
+    bSizer17->Add( bSizer15, 1, wxEXPAND, 1 );\r
+\r
+    wxBoxSizer* bSizer91;\r
+    bSizer91 = new wxBoxSizer( wxHORIZONTAL );\r
+\r
+    wxBoxSizer* bSizer71;\r
+    bSizer71 = new wxBoxSizer( wxHORIZONTAL );\r
+\r
+    m_listBoxBottomLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
+    bSizer71->Add( m_listBoxBottomLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
+\r
+\r
+    bSizer91->Add( bSizer71, 1, wxEXPAND, 5 );\r
+\r
+    wxBoxSizer* bSizer31;\r
+    bSizer31 = new wxBoxSizer( wxHORIZONTAL );\r
+\r
+    bSizer31->SetMinSize( wxSize( 65,65 ) );\r
+    m_listBoxBottomRight = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );\r
+    bSizer31->Add( m_listBoxBottomRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );\r
+\r
+\r
+    bSizer91->Add( bSizer31, 1, wxEXPAND, 5 );\r
+\r
+\r
+    bSizer17->Add( bSizer91, 1, wxEXPAND, 1 );\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
+    m_btnLeft = new wxButton( m_audioInfo, wxID_ANY, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );\r
+    bSizer12->Add( m_btnLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 );\r
+\r
+\r
+    bSizer13->Add( bSizer12, 1, 0, 1 );\r
+\r
+    wxBoxSizer* bSizer11;\r
+    bSizer11 = new wxBoxSizer( wxVERTICAL );\r
+\r
+    m_btnRight = new wxButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 );\r
+    bSizer11->Add( m_btnRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 1 );\r
+\r
+\r
+    bSizer13->Add( bSizer11, 1, 0, 1 );\r
+\r
+\r
+    bSizer14->Add( bSizer13, 1, wxALIGN_BOTTOM|wxALIGN_RIGHT, 1 );\r
+\r
+\r
+    bSizer17->Add( bSizer14, 0, wxEXPAND, 5 );\r
+\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
+    bSizer16->Add( m_button1, 0, 0, 1 );\r
+\r
+\r
+    bSizer17->Add( bSizer16, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 1 );\r
+\r
+\r
+    m_audioInfo->SetSizer( bSizer17 );\r
+    m_audioInfo->Layout();\r
+    bSizer17->Fit( m_audioInfo );\r
+    mainSizer->Add( m_audioInfo, 1, wxALIGN_CENTER|wxEXPAND, 1 );\r
+\r
+\r
+    this->SetSizer( mainSizer );\r
+    this->Layout();\r
+    m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );\r
+\r
+    this->Centre( wxBOTH );\r
+\r
+    // Connect Events\r
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
+    this->Connect( menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) );\r
+    m_listBoxTopLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftBox ), NULL, this );\r
+    m_listBoxTopLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftDClick ), NULL, this );\r
+    m_listBoxMidLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxClick ), NULL, this );\r
+    m_listBoxMidLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxDClick ), NULL, this );\r
+    m_listBoxMidRight->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxClick ), NULL, this );\r
+    m_listBoxMidRight->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxDClick ), NULL, this );\r
+    m_listBoxBottomLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftClick ), NULL, this );\r
+    m_listBoxBottomLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftDClick ), NULL, this );\r
+    m_listBoxBottomRight->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtClick ), NULL, this );\r
+    m_listBoxBottomRight->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtDClick ), NULL, this );\r
+    m_btnLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnLeft ), NULL, this );\r
+    m_btnRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnRight ), NULL, this );\r
+    m_button1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this );\r
 }\r
 \r
 MainFrameBase::~MainFrameBase()\r
 {\r
-       // Disconnect Events\r
-       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
-       this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) );\r
-       m_listBoxTopLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftBox ), NULL, this );\r
-       m_listBoxTopLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftDClick ), NULL, this );\r
-       m_listBoxMidLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxClick ), NULL, this );\r
-       m_listBoxMidLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxDClick ), NULL, this );\r
-       m_listBoxMidRight->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxClick ), NULL, this );\r
-       m_listBoxMidRight->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxDClick ), NULL, this );\r
-       m_listBoxBottomLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftClick ), NULL, this );\r
-       m_listBoxBottomLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftDClick ), NULL, this );\r
-       m_listBoxBottomRight->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtClick ), NULL, this );\r
-       m_listBoxBottomRight->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtDClick ), NULL, this );\r
-       m_btnLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnLeft ), NULL, this );\r
-       m_btnRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnRight ), NULL, this );\r
-       m_button1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this );\r
-       \r
+    // Disconnect Events\r
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
+    this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) );\r
+    m_listBoxTopLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftBox ), NULL, this );\r
+    m_listBoxTopLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftDClick ), NULL, this );\r
+    m_listBoxMidLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxClick ), NULL, this );\r
+    m_listBoxMidLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxDClick ), NULL, this );\r
+    m_listBoxMidRight->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxClick ), NULL, this );\r
+    m_listBoxMidRight->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxDClick ), NULL, this );\r
+    m_listBoxBottomLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftClick ), NULL, this );\r
+    m_listBoxBottomLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftDClick ), NULL, this );\r
+    m_listBoxBottomRight->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtClick ), NULL, this );\r
+    m_listBoxBottomRight->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtDClick ), NULL, this );\r
+    m_btnLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnLeft ), NULL, this );\r
+    m_btnRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnRight ), 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.h b/fdmdv2/pa_cppbinding_test/gui.h
index f2e12868fa8539fd4fd893b795715dc70012e623..540d6bcb9f16062236e9562b80c2316518702752 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/gui.h
+++ b/fdmdv2/pa_cppbinding_test/gui.h
@@ -35,48 +35,48 @@
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class MainFrameBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class MainFrameBase : public wxFrame \r
+class MainFrameBase : public wxFrame\r
 {\r
-       private:\r
-       \r
-       protected:\r
-               wxMenuBar* m_menuBar;\r
-               wxMenu* m_menuFile;\r
-               wxPanel* m_audioInfo;\r
-               wxListBox* m_listBoxTopLeft;\r
-               wxTextCtrl* m_textTopRight;\r
-               wxListBox* m_listBoxMidLeft;\r
-               wxListBox* m_listBoxMidRight;\r
-               wxListBox* m_listBoxBottomLeft;\r
-               wxListBox* m_listBoxBottomRight;\r
-               wxButton* m_btnLeft;\r
-               wxButton* m_btnRight;\r
-               wxButton* m_button1;\r
-               wxStatusBar* m_statusBar;\r
-               \r
-               // Virtual event handlers, overide them in your derived class\r
-               virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); }\r
-               virtual void OnExitClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListBoxTopLeftBox( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListBoxTopLeftDClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListMidLeftBoxClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListMidLeftBoxDClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListMidRightBoxClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListMidRightBoxDClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListBoxBottomLeftClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListBoxBottomLeftDClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListBoxBottomRIghtClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnListBoxBottomRIghtDClick( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnBtnLeft( wxCommandEvent& event ) { event.Skip(); }\r
-               virtual void OnBtnRight( 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( 651,445 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
-               \r
-               ~MainFrameBase();\r
-       \r
+    private:\r
+\r
+    protected:\r
+        wxMenuBar* m_menuBar;\r
+        wxMenu* m_menuFile;\r
+        wxPanel* m_audioInfo;\r
+        wxListBox* m_listBoxTopLeft;\r
+        wxTextCtrl* m_textTopRight;\r
+        wxListBox* m_listBoxMidLeft;\r
+        wxListBox* m_listBoxMidRight;\r
+        wxListBox* m_listBoxBottomLeft;\r
+        wxListBox* m_listBoxBottomRight;\r
+        wxButton* m_btnLeft;\r
+        wxButton* m_btnRight;\r
+        wxButton* m_button1;\r
+        wxStatusBar* m_statusBar;\r
+\r
+        // Virtual event handlers, overide them in your derived class\r
+        virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); }\r
+        virtual void OnExitClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListBoxTopLeftBox( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListBoxTopLeftDClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListMidLeftBoxClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListMidLeftBoxDClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListMidRightBoxClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListMidRightBoxDClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListBoxBottomLeftClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListBoxBottomLeftDClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListBoxBottomRIghtClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnListBoxBottomRIghtDClick( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnBtnLeft( wxCommandEvent& event ) { event.Skip(); }\r
+        virtual void OnBtnRight( 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( 651,445 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+\r
+        ~MainFrameBase();\r
+\r
 };\r
 \r
 #endif //__GUI_H__\r

diff --git a/fdmdv2/pa_cppbinding_test/main.cpp b/fdmdv2/pa_cppbinding_test/main.cpp
index f8584ddfab2380c8d21b402f16cb6999104ef32d..26dd162dbe85aaa700658001da8c983ec9be4bb9 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/main.cpp
+++ b/fdmdv2/pa_cppbinding_test/main.cpp
@@ -298,4 +298,54 @@ int MainFrame::populateAudioInfo()
     return 0;
 }
 
+void MainFrame::OnListBoxTopLeftBox( wxCommandEvent& event )\r
+{\r
+    //wxMessageBox(wxT("Got OnListBoxTopLeftBox()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListBoxTopLeftDClick( wxCommandEvent& event )\r
+{\r
+    wxMessageBox(wxT("Got OnListBoxTopLeftDClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListMidLeftBoxClick( wxCommandEvent& event )\r
+{\r
+//    wxMessageBox(wxT("Got OnListMidLeftBoxClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListMidLeftBoxDClick( wxCommandEvent& event )\r
+{\r
+    wxMessageBox(wxT("Got OnListMidLeftBoxDClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListMidRightBoxClick( wxCommandEvent& event )\r
+{\r
+//    wxMessageBox(wxT("Got OnListMidRightBoxClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListMidRightBoxDClick( wxCommandEvent& event )\r
+{\r
+    wxMessageBox(wxT("Got OnListMidRightBoxDClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListBoxBottomLeftClick( wxCommandEvent& event )\r
+{\r
+//    wxMessageBox(wxT("Got OnListBoxBottomLeftClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListBoxBottomLeftDClick( wxCommandEvent& event )\r
+{\r
+    wxMessageBox(wxT("Got OnListBoxBottomLeftDClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListBoxBottomRIghtClick( wxCommandEvent& event )\r
+{\r
+//    wxMessageBox(wxT("Got OnListBoxBottomRIghtClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
+void MainFrame::OnListBoxBottomRIghtDClick( wxCommandEvent& event )\r
+{\r
+    wxMessageBox(wxT("Got OnListBoxBottomRIghtDClick()"), wxT("Interface Test"), wxOK);\r
+}\r
+\r
 \r

diff --git a/fdmdv2/pa_cppbinding_test/main.h b/fdmdv2/pa_cppbinding_test/main.h
index eab05ec4af98d190ad5171df03b72484e8178fdb..530e1a14ed794be1ec5310c091d34bd4b748283a 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/main.h
+++ b/fdmdv2/pa_cppbinding_test/main.h
@@ -61,6 +61,16 @@ class MainFrame : public MainFrameBase
         void OnScroll( wxScrollEvent& event );\r
         void OnBtnLeft( wxCommandEvent& event );\r
         void OnBtnRight( wxCommandEvent& event );\r
+        void OnListBoxTopLeftBox( wxCommandEvent& event );\r
+        void OnListBoxTopLeftDClick( wxCommandEvent& event );\r
+        void OnListMidLeftBoxClick( wxCommandEvent& event );\r
+        void OnListMidLeftBoxDClick( wxCommandEvent& event );\r
+        void OnListMidRightBoxClick( wxCommandEvent& event );\r
+        void OnListMidRightBoxDClick( wxCommandEvent& event );\r
+        void OnListBoxBottomLeftClick( wxCommandEvent& event );\r
+        void OnListBoxBottomLeftDClick( wxCommandEvent& event );\r
+        void OnListBoxBottomRIghtClick( wxCommandEvent& event );\r
+        void OnListBoxBottomRIghtDClick( 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 5d3dacd79e68b9a97d19c4da7b1ad63be80aa361..c45a07f6ba40b1461743372f8c634fc3f7f57b61 100644 (file)
--- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk
+++ b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=5/25/2012\r
+Date                   :=5/27/2012\r
 CodeLitePath           :="C:\Program Files\CodeLite"\r
 LinkerName             :=g++\r
 ArchiveTool            :=ar rcus\r