diff --git a/src/forms/Bookmark/BookmarkPanel.cpp b/src/forms/Bookmark/BookmarkPanel.cpp index 73b1fb2..8c649ce 100644 --- a/src/forms/Bookmark/BookmarkPanel.cpp +++ b/src/forms/Bookmark/BookmarkPanel.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,128 +9,128 @@ /////////////////////////////////////////////////////////////////////////// -BookmarkPanel::BookmarkPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxPanel(parent, id, pos, size, style) +BookmarkPanel::BookmarkPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizer1; - bSizer1 = new wxBoxSizer(wxVERTICAL); - - m_searchText = new wxTextCtrl(this, wxID_ANY, wxT("Search.."), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - bSizer1->Add(m_searchText, 0, wxALL | wxEXPAND, 5); - - m_clearSearchButton = new wxButton(this, wxID_ANY, wxT("Clear Search"), wxDefaultPosition, wxDefaultSize, 0); - bSizer1->Add(m_clearSearchButton, 0, wxBOTTOM | wxEXPAND | wxLEFT | wxRIGHT, 5); - - m_treeView = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE | wxTR_HAS_VARIABLE_ROW_HEIGHT | wxTR_HIDE_ROOT | wxTR_SINGLE); - bSizer1->Add(m_treeView, 1, wxEXPAND, 5); - - m_propPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + bSizer1 = new wxBoxSizer( wxVERTICAL ); + + m_searchText = new wxTextCtrl( this, wxID_ANY, wxT("Search.."), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); + bSizer1->Add( m_searchText, 0, wxALL|wxEXPAND, 5 ); + + m_clearSearchButton = new wxButton( this, wxID_ANY, wxT("Clear Search"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer1->Add( m_clearSearchButton, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + + m_treeView = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_HAS_VARIABLE_ROW_HEIGHT|wxTR_HIDE_ROOT|wxTR_SINGLE ); + bSizer1->Add( m_treeView, 1, wxEXPAND, 5 ); + + m_propPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgPropSizer; - fgPropSizer = new wxFlexGridSizer(0, 2, 0, 0); - fgPropSizer->AddGrowableCol(1); - fgPropSizer->SetFlexibleDirection(wxBOTH); - fgPropSizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); - - m_labelLabel = new wxStaticText(m_propPanel, wxID_ANY, wxT("Label"), wxDefaultPosition, wxDefaultSize, 0); - m_labelLabel->Wrap(-1); - fgPropSizer->Add(m_labelLabel, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 5); - - m_labelText = new wxTextCtrl(m_propPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - fgPropSizer->Add(m_labelText, 0, wxALL | wxEXPAND, 5); - - m_frequencyLabel = new wxStaticText(m_propPanel, wxID_ANY, wxT("Freq"), wxDefaultPosition, wxDefaultSize, 0); - m_frequencyLabel->Wrap(-1); - fgPropSizer->Add(m_frequencyLabel, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 5); - - m_frequencyVal = new wxStaticText(m_propPanel, wxID_ANY, wxT("FrequencyVal"), wxDefaultPosition, wxDefaultSize, 0); - m_frequencyVal->Wrap(-1); - fgPropSizer->Add(m_frequencyVal, 0, wxALL, 5); - - m_bandwidthLabel = new wxStaticText(m_propPanel, wxID_ANY, wxT("BW"), wxDefaultPosition, wxDefaultSize, 0); - m_bandwidthLabel->Wrap(-1); - fgPropSizer->Add(m_bandwidthLabel, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 5); - - m_bandwidthVal = new wxStaticText(m_propPanel, wxID_ANY, wxT("BandwidthVal"), wxDefaultPosition, wxDefaultSize, 0); - m_bandwidthVal->Wrap(-1); - fgPropSizer->Add(m_bandwidthVal, 0, wxALL, 5); - - m_modulationLabel = new wxStaticText(m_propPanel, wxID_ANY, wxT("Type"), wxDefaultPosition, wxDefaultSize, 0); - m_modulationLabel->Wrap(-1); - fgPropSizer->Add(m_modulationLabel, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 5); - - m_modulationVal = new wxStaticText(m_propPanel, wxID_ANY, wxT("TypeVal"), wxDefaultPosition, wxDefaultSize, 0); - m_modulationVal->Wrap(-1); - fgPropSizer->Add(m_modulationVal, 0, wxALL, 5); - - - m_propPanel->SetSizer(fgPropSizer); + fgPropSizer = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgPropSizer->AddGrowableCol( 1 ); + fgPropSizer->SetFlexibleDirection( wxBOTH ); + fgPropSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_labelLabel = new wxStaticText( m_propPanel, wxID_ANY, wxT("Label"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelLabel->Wrap( -1 ); + fgPropSizer->Add( m_labelLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_labelText = new wxTextCtrl( m_propPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); + fgPropSizer->Add( m_labelText, 0, wxALL|wxEXPAND, 5 ); + + m_frequencyLabel = new wxStaticText( m_propPanel, wxID_ANY, wxT("Freq"), wxDefaultPosition, wxDefaultSize, 0 ); + m_frequencyLabel->Wrap( -1 ); + fgPropSizer->Add( m_frequencyLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_frequencyVal = new wxStaticText( m_propPanel, wxID_ANY, wxT("FrequencyVal"), wxDefaultPosition, wxDefaultSize, 0 ); + m_frequencyVal->Wrap( -1 ); + fgPropSizer->Add( m_frequencyVal, 0, wxALL, 5 ); + + m_bandwidthLabel = new wxStaticText( m_propPanel, wxID_ANY, wxT("BW"), wxDefaultPosition, wxDefaultSize, 0 ); + m_bandwidthLabel->Wrap( -1 ); + fgPropSizer->Add( m_bandwidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_bandwidthVal = new wxStaticText( m_propPanel, wxID_ANY, wxT("BandwidthVal"), wxDefaultPosition, wxDefaultSize, 0 ); + m_bandwidthVal->Wrap( -1 ); + fgPropSizer->Add( m_bandwidthVal, 0, wxALL, 5 ); + + m_modulationLabel = new wxStaticText( m_propPanel, wxID_ANY, wxT("Type"), wxDefaultPosition, wxDefaultSize, 0 ); + m_modulationLabel->Wrap( -1 ); + fgPropSizer->Add( m_modulationLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_modulationVal = new wxStaticText( m_propPanel, wxID_ANY, wxT("TypeVal"), wxDefaultPosition, wxDefaultSize, 0 ); + m_modulationVal->Wrap( -1 ); + fgPropSizer->Add( m_modulationVal, 0, wxALL, 5 ); + + + m_propPanel->SetSizer( fgPropSizer ); m_propPanel->Layout(); - fgPropSizer->Fit(m_propPanel); - bSizer1->Add(m_propPanel, 0, wxALL | wxBOTTOM | wxEXPAND | wxTOP, 5); - - m_buttonPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + fgPropSizer->Fit( m_propPanel ); + bSizer1->Add( m_propPanel, 0, wxALL|wxBOTTOM|wxEXPAND|wxTOP, 5 ); + + m_buttonPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_buttonPanelSizer; - m_buttonPanelSizer = new wxBoxSizer(wxVERTICAL); - - - m_buttonPanel->SetSizer(m_buttonPanelSizer); + m_buttonPanelSizer = new wxBoxSizer( wxVERTICAL ); + + + m_buttonPanel->SetSizer( m_buttonPanelSizer ); m_buttonPanel->Layout(); - m_buttonPanelSizer->Fit(m_buttonPanel); - bSizer1->Add(m_buttonPanel, 0, wxALL | wxEXPAND, 5); - - - this->SetSizer(bSizer1); + m_buttonPanelSizer->Fit( m_buttonPanel ); + bSizer1->Add( m_buttonPanel, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( bSizer1 ); this->Layout(); - m_updateTimer.SetOwner(this, wxID_ANY); - + m_updateTimer.SetOwner( this, wxID_ANY ); + // Connect Events - this->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(BookmarkPanel::onEnterWindow)); - this->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(BookmarkPanel::onLeaveWindow)); - this->Connect(wxEVT_MOTION, wxMouseEventHandler(BookmarkPanel::onMotion)); - m_searchText->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(BookmarkPanel::onSearchTextFocus), NULL, this); - m_searchText->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(BookmarkPanel::onSearchText), NULL, this); - m_clearSearchButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BookmarkPanel::onClearSearch), NULL, this); - m_treeView->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(BookmarkPanel::onEnterWindow), NULL, this); - m_treeView->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(BookmarkPanel::onLeaveWindow), NULL, this); - m_treeView->Connect(wxEVT_MOTION, wxMouseEventHandler(BookmarkPanel::onMotion), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler(BookmarkPanel::onTreeBeginDrag), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler(BookmarkPanel::onTreeEndDrag), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler(BookmarkPanel::onTreeActivate), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEventHandler(BookmarkPanel::onTreeCollapse), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEventHandler(BookmarkPanel::onTreeExpanded), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEventHandler(BookmarkPanel::onTreeItemGetTooltip), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEventHandler(BookmarkPanel::onTreeItemMenu), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(BookmarkPanel::onTreeSelect), NULL, this); - m_treeView->Connect(wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEventHandler(BookmarkPanel::onTreeSelectChanging), NULL, this); - m_labelText->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(BookmarkPanel::onLabelText), NULL, this); - m_frequencyVal->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(BookmarkPanel::onDoubleClickFreq), NULL, this); - m_bandwidthVal->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(BookmarkPanel::onDoubleClickBandwidth), NULL, this); - this->Connect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(BookmarkPanel::onUpdateTimer)); + this->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ) ); + this->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ) ); + this->Connect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ) ); + m_searchText->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( BookmarkPanel::onSearchTextFocus ), NULL, this ); + m_searchText->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BookmarkPanel::onSearchText ), NULL, this ); + m_clearSearchButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BookmarkPanel::onClearSearch ), NULL, this ); + m_treeView->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ), NULL, this ); + m_treeView->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ), NULL, this ); + m_treeView->Connect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeBeginDrag ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeEndDrag ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler( BookmarkPanel::onTreeActivate ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEventHandler( BookmarkPanel::onTreeCollapse ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEventHandler( BookmarkPanel::onTreeExpanded ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEventHandler( BookmarkPanel::onTreeItemGetTooltip ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEventHandler( BookmarkPanel::onTreeItemMenu ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( BookmarkPanel::onTreeSelect ), NULL, this ); + m_treeView->Connect( wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEventHandler( BookmarkPanel::onTreeSelectChanging ), NULL, this ); + m_labelText->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( BookmarkPanel::onLabelText ), NULL, this ); + m_frequencyVal->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( BookmarkPanel::onDoubleClickFreq ), NULL, this ); + m_bandwidthVal->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( BookmarkPanel::onDoubleClickBandwidth ), NULL, this ); + this->Connect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( BookmarkPanel::onUpdateTimer ) ); } BookmarkPanel::~BookmarkPanel() { // Disconnect Events - this->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(BookmarkPanel::onEnterWindow)); - this->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(BookmarkPanel::onLeaveWindow)); - this->Disconnect(wxEVT_MOTION, wxMouseEventHandler(BookmarkPanel::onMotion)); - m_searchText->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(BookmarkPanel::onSearchTextFocus), NULL, this); - m_searchText->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(BookmarkPanel::onSearchText), NULL, this); - m_clearSearchButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BookmarkPanel::onClearSearch), NULL, this); - m_treeView->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(BookmarkPanel::onEnterWindow), NULL, this); - m_treeView->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(BookmarkPanel::onLeaveWindow), NULL, this); - m_treeView->Disconnect(wxEVT_MOTION, wxMouseEventHandler(BookmarkPanel::onMotion), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler(BookmarkPanel::onTreeBeginDrag), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler(BookmarkPanel::onTreeEndDrag), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler(BookmarkPanel::onTreeActivate), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEventHandler(BookmarkPanel::onTreeCollapse), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEventHandler(BookmarkPanel::onTreeExpanded), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEventHandler(BookmarkPanel::onTreeItemGetTooltip), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEventHandler(BookmarkPanel::onTreeItemMenu), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(BookmarkPanel::onTreeSelect), NULL, this); - m_treeView->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEventHandler(BookmarkPanel::onTreeSelectChanging), NULL, this); - m_labelText->Disconnect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(BookmarkPanel::onLabelText), NULL, this); - m_frequencyVal->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(BookmarkPanel::onDoubleClickFreq), NULL, this); - m_bandwidthVal->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(BookmarkPanel::onDoubleClickBandwidth), NULL, this); - this->Disconnect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(BookmarkPanel::onUpdateTimer)); - + this->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ) ); + this->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ) ); + this->Disconnect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ) ); + m_searchText->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( BookmarkPanel::onSearchTextFocus ), NULL, this ); + m_searchText->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BookmarkPanel::onSearchText ), NULL, this ); + m_clearSearchButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BookmarkPanel::onClearSearch ), NULL, this ); + m_treeView->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ), NULL, this ); + m_treeView->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ), NULL, this ); + m_treeView->Disconnect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeBeginDrag ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeEndDrag ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler( BookmarkPanel::onTreeActivate ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEventHandler( BookmarkPanel::onTreeCollapse ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEventHandler( BookmarkPanel::onTreeExpanded ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEventHandler( BookmarkPanel::onTreeItemGetTooltip ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEventHandler( BookmarkPanel::onTreeItemMenu ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( BookmarkPanel::onTreeSelect ), NULL, this ); + m_treeView->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEventHandler( BookmarkPanel::onTreeSelectChanging ), NULL, this ); + m_labelText->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( BookmarkPanel::onLabelText ), NULL, this ); + m_frequencyVal->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( BookmarkPanel::onDoubleClickFreq ), NULL, this ); + m_bandwidthVal->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( BookmarkPanel::onDoubleClickBandwidth ), NULL, this ); + this->Disconnect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( BookmarkPanel::onUpdateTimer ) ); + } diff --git a/src/forms/Bookmark/BookmarkPanel.fbp b/src/forms/Bookmark/BookmarkPanel.fbp index 5faf349..4538c02 100644 --- a/src/forms/Bookmark/BookmarkPanel.fbp +++ b/src/forms/Bookmark/BookmarkPanel.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ BookmarkPanel 1000 none + 0 BookmarkPanel @@ -48,13 +49,20 @@ wxTAB_TRAVERSAL - + + + + + + + + onEnterWindow @@ -145,7 +153,14 @@ + + + + + + + @@ -189,25 +204,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Clear Search + + 0 0 @@ -222,6 +243,8 @@ protected 1 + + Resizable 1 @@ -236,8 +259,15 @@ + + + + + + onClearSearch + @@ -318,7 +348,14 @@ + + + + + + + onEnterWindow @@ -419,7 +456,14 @@ wxTAB_TRAVERSAL + + + + + + + @@ -487,6 +531,7 @@ 0 wxID_ANY Label + 0 0 @@ -512,7 +557,14 @@ -1 + + + + + + + @@ -599,7 +651,14 @@ + + + + + + + @@ -661,6 +720,7 @@ 0 wxID_ANY Freq + 0 0 @@ -686,7 +746,14 @@ -1 + + + + + + + @@ -744,6 +811,7 @@ 0 wxID_ANY FrequencyVal + 0 0 @@ -769,7 +837,14 @@ -1 + + + + + + + @@ -827,6 +902,7 @@ 0 wxID_ANY BW + 0 0 @@ -852,7 +928,14 @@ -1 + + + + + + + @@ -910,6 +993,7 @@ 0 wxID_ANY BandwidthVal + 0 0 @@ -935,7 +1019,14 @@ -1 + + + + + + + @@ -993,6 +1084,7 @@ 0 wxID_ANY Type + 0 0 @@ -1018,7 +1110,14 @@ -1 + + + + + + + @@ -1076,6 +1175,7 @@ 0 wxID_ANY TypeVal + 0 0 @@ -1101,7 +1201,14 @@ -1 + + + + + + + @@ -1184,7 +1291,14 @@ wxTAB_TRAVERSAL + + + + + + + diff --git a/src/forms/Bookmark/BookmarkPanel.h b/src/forms/Bookmark/BookmarkPanel.h index 2e1a4fb..4dcca81 100644 --- a/src/forms/Bookmark/BookmarkPanel.h +++ b/src/forms/Bookmark/BookmarkPanel.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -16,6 +16,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -29,53 +32,53 @@ /////////////////////////////////////////////////////////////////////////////// /// Class BookmarkPanel /////////////////////////////////////////////////////////////////////////////// -class BookmarkPanel : public wxPanel +class BookmarkPanel : public wxPanel { -private: - -protected: - wxTextCtrl* m_searchText; - wxButton* m_clearSearchButton; - wxTreeCtrl* m_treeView; - wxPanel* m_propPanel; - wxStaticText* m_labelLabel; - wxTextCtrl* m_labelText; - wxStaticText* m_frequencyLabel; - wxStaticText* m_frequencyVal; - wxStaticText* m_bandwidthLabel; - wxStaticText* m_bandwidthVal; - wxStaticText* m_modulationLabel; - wxStaticText* m_modulationVal; - wxPanel* m_buttonPanel; - wxTimer m_updateTimer; - - // Virtual event handlers, overide them in your derived class - virtual void onEnterWindow(wxMouseEvent& event) { event.Skip(); } - virtual void onLeaveWindow(wxMouseEvent& event) { event.Skip(); } - virtual void onMotion(wxMouseEvent& event) { event.Skip(); } - virtual void onSearchTextFocus(wxMouseEvent& event) { event.Skip(); } - virtual void onSearchText(wxCommandEvent& event) { event.Skip(); } - virtual void onClearSearch(wxCommandEvent& event) { event.Skip(); } - virtual void onTreeBeginDrag(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeEndDrag(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeActivate(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeCollapse(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeExpanded(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeItemGetTooltip(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeItemMenu(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeSelect(wxTreeEvent& event) { event.Skip(); } - virtual void onTreeSelectChanging(wxTreeEvent& event) { event.Skip(); } - virtual void onLabelText(wxCommandEvent& event) { event.Skip(); } - virtual void onDoubleClickFreq(wxMouseEvent& event) { event.Skip(); } - virtual void onDoubleClickBandwidth(wxMouseEvent& event) { event.Skip(); } - virtual void onUpdateTimer(wxTimerEvent& event) { event.Skip(); } - - -public: - - BookmarkPanel(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(169, 471), long style = wxTAB_TRAVERSAL); - ~BookmarkPanel(); - + private: + + protected: + wxTextCtrl* m_searchText; + wxButton* m_clearSearchButton; + wxTreeCtrl* m_treeView; + wxPanel* m_propPanel; + wxStaticText* m_labelLabel; + wxTextCtrl* m_labelText; + wxStaticText* m_frequencyLabel; + wxStaticText* m_frequencyVal; + wxStaticText* m_bandwidthLabel; + wxStaticText* m_bandwidthVal; + wxStaticText* m_modulationLabel; + wxStaticText* m_modulationVal; + wxPanel* m_buttonPanel; + wxTimer m_updateTimer; + + // Virtual event handlers, overide them in your derived class + virtual void onEnterWindow( wxMouseEvent& event ) { event.Skip(); } + virtual void onLeaveWindow( wxMouseEvent& event ) { event.Skip(); } + virtual void onMotion( wxMouseEvent& event ) { event.Skip(); } + virtual void onSearchTextFocus( wxMouseEvent& event ) { event.Skip(); } + virtual void onSearchText( wxCommandEvent& event ) { event.Skip(); } + virtual void onClearSearch( wxCommandEvent& event ) { event.Skip(); } + virtual void onTreeBeginDrag( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeEndDrag( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeActivate( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeCollapse( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeExpanded( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeItemGetTooltip( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeItemMenu( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeSelect( wxTreeEvent& event ) { event.Skip(); } + virtual void onTreeSelectChanging( wxTreeEvent& event ) { event.Skip(); } + virtual void onLabelText( wxCommandEvent& event ) { event.Skip(); } + virtual void onDoubleClickFreq( wxMouseEvent& event ) { event.Skip(); } + virtual void onDoubleClickBandwidth( wxMouseEvent& event ) { event.Skip(); } + virtual void onUpdateTimer( wxTimerEvent& event ) { event.Skip(); } + + + public: + + BookmarkPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 169,471 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~BookmarkPanel(); + }; #endif //__BOOKMARKPANEL_H__ diff --git a/src/forms/Dialog/AboutDialog.fbp b/src/forms/Dialog/AboutDialog.fbp index d94fe1f..883012c 100644 --- a/src/forms/Dialog/AboutDialog.fbp +++ b/src/forms/Dialog/AboutDialog.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 0 AboutDialogBase - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + AboutDialogBase - + 530,420 wxDEFAULT_DIALOG_STYLE - + About - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + dlgSizer wxVERTICAL none @@ -102,77 +102,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_hPanel 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_hSizer wxHORIZONTAL none @@ -185,78 +185,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,20,70,0 0 0 wxID_ANY CubicSDR - + 0 - - + + 0 - + 1 m_appName 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -271,81 +271,81 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_aboutNotebook 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Developers 0 @@ -353,79 +353,79 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_dbScroll 1 - - + + protected 1 - + Resizable 5 5 1 - - + + 0 - - - + + + wxHSCROLL|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_dbPane wxVERTICAL none @@ -436,10 +436,10 @@ 3 wxBOTH - - + + 20 - + m_dbSizer wxFLEX_GROWMODE_ALL none @@ -454,78 +454,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,15,70,0 0 0 wxID_ANY Developed By - + 0 - - + + 0 - + 1 m_dbHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -537,78 +537,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,-1,70,0 0 0 wxID_ANY GitHub - + 0 - - + + 0 - + 1 m_dbGHHeader 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -620,78 +620,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,-1,70,0 0 0 wxID_ANY Twitter - + 0 - - + + 0 - + 1 m_dbTwitter 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -703,78 +703,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Charles J. Cliffe - + 0 - - + + 0 - + 1 m_dbCharlesCliffe 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -786,78 +786,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @cjcliffe - + 0 - - + + 0 - + 1 m_dbghCC 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -869,78 +869,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @ccliffe - + 0 - - + + 0 - + 1 m_dbtCC 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -952,78 +952,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Vincent Sonnier - + 0 - - + + 0 - + 1 m_dbVincentSonnier 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1035,78 +1035,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @vsonnier - + 0 - - + + 0 - + 1 m_dbghVS 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1118,78 +1118,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @VincentSonnier - + 0 - - + + 0 - + 1 m_dbtVS 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1203,76 +1203,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_dbDivider1 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1282,10 +1282,10 @@ 2 wxBOTH - - + + 20 - + m_cSizer wxFLEX_GROWMODE_ALL none @@ -1300,78 +1300,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,15,70,0 0 0 wxID_ANY Contributors - + 0 - - + + 0 - + 1 m_cContributorsHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1383,78 +1383,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,-1,70,0 0 0 wxID_ANY GitHub - + 0 - - + + 0 - + 1 m_cGitHub 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1466,78 +1466,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Corne Lukken - + 0 - - + + 0 - + 1 m_cCorneLukken 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1549,78 +1549,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @Dantali0n - + 0 - - + + 0 - + 1 m_cghCL 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1632,78 +1632,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Stanisław Pitucha - + 0 - - + + 0 - + 1 m_cStainislawPitucha 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1715,78 +1715,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @viraptor - + 0 - - + + 0 - + 1 m_cghSP 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1798,78 +1798,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Ștefan Talpalaru - + 0 - - + + 0 - + 1 m_cghStefanTalpalaru 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1881,78 +1881,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @stefantalpalaru - + 0 - - + + 0 - + 1 m_cghST 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1964,78 +1964,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Chris Motch - + 0 - - + + 0 - + 1 m_cCrisMotch 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2047,78 +2047,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @bodrick - + 0 - - + + 0 - + 1 m_cghCM 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2130,78 +2130,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Mariusz Ryndzionek - + 0 - - + + 0 - + 1 m_cMariuszRyndzionek 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2213,78 +2213,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @mryndzionek - + 0 - - + + 0 - + 1 m_cghMR 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2296,78 +2296,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Jiang Wei - + 0 - - + + 0 - + 1 m_cJiangWei 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2379,78 +2379,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @jocover - + 0 - - + + 0 - + 1 m_cghJW 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2462,78 +2462,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Tom Swartz - + 0 - - + + 0 - + 1 m_cTomSwartz 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2545,78 +2545,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @tomswartz07 - + 0 - - + + 0 - + 1 m_cghTS 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2628,78 +2628,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Infinity Cyberworks - + 0 - - + + 0 - + 1 m_cInfinityCyberworks 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2711,78 +2711,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY @infinitycyberworks - + 0 - - + + 0 - + 1 m_cghIC 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2791,7 +2791,7 @@ - + Donations 0 @@ -2799,79 +2799,79 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_dScroll 1 - - + + protected 1 - + Resizable 5 5 1 - - + + 0 - - - + + + wxHSCROLL|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_dBSizer wxVERTICAL none @@ -2880,7 +2880,7 @@ wxALL|wxEXPAND 1 - + m_dSizer wxVERTICAL none @@ -2893,78 +2893,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,15,70,0 0 0 wxID_ANY Thanks to everyone who donated at cubicsdr.com! - + 0 - - + + 0 - + 1 m_dHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2976,76 +2976,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_dDivider1 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3057,78 +3057,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY SDRplay / sdrplay.com - + 0 - - + + 0 - + 1 m_dSDRplay 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3140,78 +3140,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Michael Ladd - + 0 - - + + 0 - + 1 m_dMichaelLadd 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3223,78 +3223,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Automotive Templates - + 0 - - + + 0 - + 1 m_dAutoMotiveTemplates 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3306,78 +3306,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Jorge Morales - + 0 - - + + 0 - + 1 m_dJorgeMorales 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3389,78 +3389,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Michael Rooke - + 0 - - + + 0 - + 1 m_dMichaelRooke 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3472,78 +3472,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY TNCOM - + 0 - - + + 0 - + 1 m_dTNCOM 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3555,78 +3555,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Erik Mikkel Wied - + 0 - - + + 0 - + 1 m_dErikWied 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3638,78 +3638,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Robert Duering - + 0 - - + + 0 - + 1 m_dRobertDuering 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3721,78 +3721,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Jim Deitch - + 0 - - + + 0 - + 1 m_dJimDeitch 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3804,78 +3804,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY NooElec Inc. / nooelec.com - + 0 - - + + 0 - + 1 m_dNooElec 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3887,78 +3887,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY David Ahlgren - + 0 - - + + 0 - + 1 m_dDavidAhlgren 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3970,78 +3970,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Ronald Cook - + 0 - - + + 0 - + 1 m_dRonaldCook 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4053,78 +4053,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Eric Peterson - + 0 - - + + 0 - + 1 m_dEricPeterson 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4136,78 +4136,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Geo Distributing - + 0 - - + + 0 - + 1 m_dGeoDistributing 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4219,78 +4219,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY James Carson - + 0 - - + + 0 - + 1 m_dJamesCarson 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4302,78 +4302,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Craig Williams - + 0 - - + + 0 - + 1 m_dCraigWilliams 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4385,78 +4385,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Rudolf Schaffer - + 0 - - + + 0 - + 1 m_dRudolfShaffer 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4468,78 +4468,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY John Katon - + 0 - - + + 0 - + 1 m_dJohnKaton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4551,78 +4551,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Vincent Sonnier - + 0 - - + + 0 - + 1 m_dVincentSonnier 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4634,78 +4634,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY corq's auctions/L. Easterly LTD (x 4) - + 0 - - + + 0 - + 1 m_dCorq 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4717,78 +4717,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Ivan Alekseev - + 0 - - + + 0 - + 1 m_dIvanAlekseev 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4800,78 +4800,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Ole-Jørgen Næss Kolsrud - + 0 - - + + 0 - + 1 m_dOleJorgenKolsrud 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4883,78 +4883,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Henrik Jagemyr - + 0 - - + + 0 - + 1 m_dHenrikJagemyr 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4966,78 +4966,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Peter Haines - + 0 - - + + 0 - + 1 m_dPeterHaines 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5049,78 +5049,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Leon Abrassart - + 0 - - + + 0 - + 1 m_dLeonAbrassart 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5132,78 +5132,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY George Alan Talbot - + 0 - - + + 0 - + 1 m_dGeorgeTalbot 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5215,78 +5215,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Francisco Borja Marcos de la Puerta - + 0 - - + + 0 - + 1 m_dFranciscoPuerta 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5298,78 +5298,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Ronald A. Lundeen - + 0 - - + + 0 - + 1 m_dRonaldLundeen 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5381,78 +5381,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Walter Horbert - + 0 - - + + 0 - + 1 m_dWalterHorbert 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5464,78 +5464,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY William Lloyd-Davies - + 0 - - + + 0 - + 1 m_dWilliamLD 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5547,78 +5547,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Bratislav Arandjelovic - + 0 - - + + 0 - + 1 m_dBratislavArandjelovic 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5630,78 +5630,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Gary Martin - + 0 - - + + 0 - + 1 m_dGaryMartin 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5713,78 +5713,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Einars Repse - + 0 - - + + 0 - + 1 m_dEinarsRepse 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5796,78 +5796,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Timothy Gatton - + 0 - - + + 0 - + 1 m_dTimothyGatton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5879,78 +5879,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Stephen Cuccio - + 0 - - + + 0 - + 1 m_dStephenCuccio 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5962,78 +5962,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Keshavlal Patel - + 0 - - + + 0 - + 1 m_dKeshavlalPatel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6045,78 +6045,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Bob Schatzman - + 0 - - + + 0 - + 1 m_dBobSchatzman 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6128,78 +6128,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Robert Ross - + 0 - - + + 0 - + 1 m_dRobertRoss 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6211,78 +6211,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Roberto Bellotti - + 0 - - + + 0 - + 1 m_dRobertoBellotti 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6294,78 +6294,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Serge Van der Torre - + 0 - - + + 0 - + 1 m_dSergeVanderTorre 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6377,78 +6377,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Dieter Schneider - + 0 - - + + 0 - + 1 m_dDieterSchneider 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6460,78 +6460,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Petrika Janeku - + 0 - - + + 0 - + 1 m_dPetrikaJaneku 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6543,78 +6543,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Chad Myslinsky - + 0 - - + + 0 - + 1 m_dChadMyslinsky 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6626,78 +6626,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Charlie Bruckner - + 0 - - + + 0 - + 1 m_dCharlieBruckner 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6709,78 +6709,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Jordan Parker - + 0 - - + + 0 - + 1 m_dJordanParker 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6792,78 +6792,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Robert Chave - + 0 - - + + 0 - + 1 m_dRobertChave 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6875,78 +6875,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Marvin Calvert - + 0 - - + + 0 - + 1 m_dMarvinCalvert 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6958,78 +6958,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Erfurter Feurblume - + 0 - - + + 0 - + 1 m_dErfurterFeurblume 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7041,78 +7041,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Makarenko Aleksey - + 0 - - + + 0 - + 1 m_dMakarenkoAleksey 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7124,78 +7124,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Anthony Lambiris - + 0 - - + + 0 - + 1 m_dAnthonyLambiris 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7207,78 +7207,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Joe Burtinsky - + 0 - - + + 0 - + 1 m_dJoeBurtinsky 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7290,78 +7290,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Dale Puckett - + 0 - - + + 0 - + 1 m_dDalePuckett 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7370,7 +7370,7 @@ - + Special Thanks 0 @@ -7378,79 +7378,79 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_stScroll 1 - - + + protected 1 - + Resizable 5 5 1 - - + + 0 - - - + + + wxHSCROLL|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_stBSizer wxVERTICAL none @@ -7459,7 +7459,7 @@ wxALL|wxEXPAND 1 - + m_stSizer wxVERTICAL none @@ -7472,78 +7472,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,15,70,0 0 0 wxID_ANY Special Thanks To - + 0 - - + + 0 - + 1 m_stHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7555,76 +7555,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_stDivider1 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7636,78 +7636,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,92,10,70,0 0 0 wxID_ANY SoapySDR Development and Assistance: - + 0 - - + + 0 - + 1 m_stSoapyDevAssistHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7719,78 +7719,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Josh Blum / @guruofquality / pothosware.com - + 0 - - + + 0 - + 1 m_stJoshBlum 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7802,76 +7802,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_stDivider2 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7883,78 +7883,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,92,10,70,0 0 0 wxID_ANY Liquid-DSP Development and Assistance: - + 0 - - + + 0 - + 1 m_stLiquidDSPHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -7966,78 +7966,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Joseph D. Gaeddert / @jgaeddert / liquidsdr.com - + 0 - - + + 0 - + 1 m_stJosephGaeddert 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8049,76 +8049,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_stDivider3 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8130,78 +8130,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,92,10,70,0 0 0 wxID_ANY Ideas, Direction && Encouragement: - + 0 - - + + 0 - + 1 m_stIdeasDirectionsHeader 1 - - + + protected 1 - + Resizable 1 - + wxST_NO_AUTORESIZE - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8213,78 +8213,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Ton Machielsen / @Toontje / @EA3HOE - + 0 - - + + 0 - + 1 m_stTonMachielsen 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8296,78 +8296,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Mike Ladd / KD2KOG.com - + 0 - - + + 0 - + 1 m_stMikeLadd 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8379,78 +8379,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY SDRplay team / @SDRplay / SDRplay.com - + 0 - - + + 0 - + 1 m_stSDRplay 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8462,78 +8462,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY SDRplay Facebook group - + 0 - - + + 0 - + 1 m_stSDRplayFB 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8545,78 +8545,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Paul Warren / @pwarren - + 0 - - + + 0 - + 1 m_stPaulWarren 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8628,78 +8628,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Segesdi Károly / @jazzkutya - + 0 - - + + 0 - + 1 m_stSegesdiKaroly 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8711,78 +8711,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Reddit RTL-SDR group /r/rtlsdr - + 0 - - + + 0 - + 1 m_stRedditRTLSDR 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8794,78 +8794,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY NooElec team / NooElec.com - + 0 - - + + 0 - + 1 m_stNooElec 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8877,78 +8877,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Everyone who's contributed to the GitHub issues; thanks! - + 0 - - + + 0 - + 1 m_stGHIssues 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -8960,78 +8960,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Please feel free to nominate anyone we might have missed. - + 0 - - + + 0 - + 1 m_stNominate 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forms/Dialog/AboutDialogBase.cpp b/src/forms/Dialog/AboutDialogBase.cpp index ae974d2..63993f2 100644 --- a/src/forms/Dialog/AboutDialogBase.cpp +++ b/src/forms/Dialog/AboutDialogBase.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/src/forms/Dialog/AboutDialogBase.h b/src/forms/Dialog/AboutDialogBase.h index 2021d1d..d026be9 100644 --- a/src/forms/Dialog/AboutDialogBase.h +++ b/src/forms/Dialog/AboutDialogBase.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/src/forms/Dialog/ActionDialogBase.cpp b/src/forms/Dialog/ActionDialogBase.cpp index eb61f13..0ca97de 100644 --- a/src/forms/Dialog/ActionDialogBase.cpp +++ b/src/forms/Dialog/ActionDialogBase.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,45 +9,45 @@ /////////////////////////////////////////////////////////////////////////// -ActionDialogBase::ActionDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) +ActionDialogBase::ActionDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer(wxVERTICAL); - - m_questionText = new wxStaticText(this, wxID_ANY, wxT("Question"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE); - m_questionText->Wrap(-1); - mainSizer->Add(m_questionText, 1, wxALL | wxEXPAND, 5); - + mainSizer = new wxBoxSizer( wxVERTICAL ); + + m_questionText = new wxStaticText( this, wxID_ANY, wxT("Question"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); + m_questionText->Wrap( -1 ); + mainSizer->Add( m_questionText, 1, wxALL|wxEXPAND, 5 ); + wxBoxSizer* buttonSizer; - buttonSizer = new wxBoxSizer(wxHORIZONTAL); - - m_cancelButton = new wxButton(this, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0); - buttonSizer->Add(m_cancelButton, 1, wxALL | wxEXPAND, 5); - - m_okButton = new wxButton(this, wxID_ANY, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0); - buttonSizer->Add(m_okButton, 1, wxALL | wxEXPAND, 5); - - - mainSizer->Add(buttonSizer, 1, wxEXPAND, 5); - - - this->SetSizer(mainSizer); + buttonSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_cancelButton = new wxButton( this, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + buttonSizer->Add( m_cancelButton, 1, wxALL|wxEXPAND, 5 ); + + m_okButton = new wxButton( this, wxID_ANY, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0 ); + buttonSizer->Add( m_okButton, 1, wxALL|wxEXPAND, 5 ); + + + mainSizer->Add( buttonSizer, 1, wxEXPAND, 5 ); + + + this->SetSizer( mainSizer ); this->Layout(); - mainSizer->Fit(this); - - this->Centre(wxBOTH); - + mainSizer->Fit( this ); + + this->Centre( wxBOTH ); + // Connect Events - m_cancelButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ActionDialogBase::onClickCancel), NULL, this); - m_okButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ActionDialogBase::onClickOK), NULL, this); + m_cancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActionDialogBase::onClickCancel ), NULL, this ); + m_okButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActionDialogBase::onClickOK ), NULL, this ); } ActionDialogBase::~ActionDialogBase() { // Disconnect Events - m_cancelButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ActionDialogBase::onClickCancel), NULL, this); - m_okButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ActionDialogBase::onClickOK), NULL, this); - + m_cancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActionDialogBase::onClickCancel ), NULL, this ); + m_okButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActionDialogBase::onClickOK ), NULL, this ); + } diff --git a/src/forms/Dialog/ActionDialogBase.fbp b/src/forms/Dialog/ActionDialogBase.fbp index 8dc234d..e6e2e72 100644 --- a/src/forms/Dialog/ActionDialogBase.fbp +++ b/src/forms/Dialog/ActionDialogBase.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ ActionDialogBase 1000 none + 0 ActionDialogBase @@ -54,13 +55,20 @@ - + + + + + + + + @@ -75,17 +83,23 @@ + + + + + + @@ -126,6 +140,7 @@ 0 wxID_ANY Question + 0 0 @@ -143,7 +158,7 @@ Resizable 1 - wxALIGN_CENTRE + wxALIGN_CENTER_HORIZONTAL 0 @@ -151,7 +166,14 @@ -1 + + + + + + + @@ -200,25 +222,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Cancel + + 0 0 @@ -233,6 +261,8 @@ protected 1 + + Resizable 1 @@ -247,8 +277,15 @@ + + + + + + onClickCancel + @@ -288,25 +325,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY OK + + 0 0 @@ -321,6 +364,8 @@ protected 1 + + Resizable 1 @@ -335,8 +380,15 @@ + + + + + + onClickOK + diff --git a/src/forms/Dialog/ActionDialogBase.h b/src/forms/Dialog/ActionDialogBase.h index b3f3a86..6ecda19 100644 --- a/src/forms/Dialog/ActionDialogBase.h +++ b/src/forms/Dialog/ActionDialogBase.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -16,6 +16,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -26,25 +29,25 @@ /////////////////////////////////////////////////////////////////////////////// /// Class ActionDialogBase /////////////////////////////////////////////////////////////////////////////// -class ActionDialogBase : public wxDialog +class ActionDialogBase : public wxDialog { -private: - -protected: - wxStaticText* m_questionText; - wxButton* m_cancelButton; - wxButton* m_okButton; - - // Virtual event handlers, overide them in your derived class - virtual void onClickCancel(wxCommandEvent& event) { event.Skip(); } - virtual void onClickOK(wxCommandEvent& event) { event.Skip(); } - - -public: - - ActionDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("QuestionTitle"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE); - ~ActionDialogBase(); - + private: + + protected: + wxStaticText* m_questionText; + wxButton* m_cancelButton; + wxButton* m_okButton; + + // Virtual event handlers, overide them in your derived class + virtual void onClickCancel( wxCommandEvent& event ) { event.Skip(); } + virtual void onClickOK( wxCommandEvent& event ) { event.Skip(); } + + + public: + + ActionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("QuestionTitle"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~ActionDialogBase(); + }; #endif //__ACTIONDIALOGBASE_H__ diff --git a/src/forms/Dialog/PortSelectorDialog.fbp b/src/forms/Dialog/PortSelectorDialog.fbp index 13b6b3c..4637dbf 100644 --- a/src/forms/Dialog/PortSelectorDialog.fbp +++ b/src/forms/Dialog/PortSelectorDialog.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 0 PortSelectorDialog - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + PortSelectorDialogBase - + 304,197 wxDEFAULT_DIALOG_STYLE - + Select Port - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + dlgSizer wxVERTICAL none @@ -102,78 +102,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Select a detected port or enter your own - + 0 - - + + 0 - + 1 m_staticText1 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -185,83 +185,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 - + 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_portList 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - + + + + + + + + + + + + + + onListSelect - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -282,78 +282,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Port - + 0 - - + + 0 - + 1 m_staticText2 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -365,86 +365,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_portSelection 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -458,77 +458,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_buttonPanel 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer2 wxHORIZONTAL none @@ -541,17 +541,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -559,65 +559,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Cancel - + 0 - - + + 0 - + 1 m_cancelButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + onCancelButton - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -639,17 +639,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -657,65 +657,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY OK - + 0 - - + + 0 - + 1 m_okButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + onOKButton - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forms/Dialog/PortSelectorDialogBase.cpp b/src/forms/Dialog/PortSelectorDialogBase.cpp index ea4e561..605c59e 100644 --- a/src/forms/Dialog/PortSelectorDialogBase.cpp +++ b/src/forms/Dialog/PortSelectorDialogBase.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,70 +9,70 @@ /////////////////////////////////////////////////////////////////////////// -PortSelectorDialogBase::PortSelectorDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) +PortSelectorDialogBase::PortSelectorDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + wxBoxSizer* dlgSizer; - dlgSizer = new wxBoxSizer(wxVERTICAL); - - m_staticText1 = new wxStaticText(this, wxID_ANY, wxT("Select a detected port or enter your own"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText1->Wrap(-1); - dlgSizer->Add(m_staticText1, 0, wxEXPAND | wxALL, 5); - - m_portList = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0); - dlgSizer->Add(m_portList, 1, wxALL | wxEXPAND, 5); - + dlgSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticText1 = new wxStaticText( this, wxID_ANY, wxT("Select a detected port or enter your own"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1->Wrap( -1 ); + dlgSizer->Add( m_staticText1, 0, wxEXPAND|wxALL, 5 ); + + m_portList = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + dlgSizer->Add( m_portList, 1, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer(wxHORIZONTAL); - - bSizer3->SetMinSize(wxSize(-1, 30)); - m_staticText2 = new wxStaticText(this, wxID_ANY, wxT("Port"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText2->Wrap(-1); - bSizer3->Add(m_staticText2, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5); - - m_portSelection = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - bSizer3->Add(m_portSelection, 1, wxEXPAND | wxRIGHT, 5); - - - dlgSizer->Add(bSizer3, 1, wxEXPAND, 5); - - m_buttonPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + bSizer3 = new wxBoxSizer( wxHORIZONTAL ); + + bSizer3->SetMinSize( wxSize( -1,30 ) ); + m_staticText2 = new wxStaticText( this, wxID_ANY, wxT("Port"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2->Wrap( -1 ); + bSizer3->Add( m_staticText2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_portSelection = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer3->Add( m_portSelection, 1, wxEXPAND|wxRIGHT, 5 ); + + + dlgSizer->Add( bSizer3, 1, wxEXPAND, 5 ); + + m_buttonPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer(wxHORIZONTAL); - - m_cancelButton = new wxButton(m_buttonPanel, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0); - bSizer2->Add(m_cancelButton, 0, wxALL | wxALIGN_BOTTOM, 5); - - - bSizer2->Add(0, 0, 1, wxEXPAND, 5); - - m_okButton = new wxButton(m_buttonPanel, wxID_ANY, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0); - bSizer2->Add(m_okButton, 0, wxALL | wxALIGN_BOTTOM, 5); - - - m_buttonPanel->SetSizer(bSizer2); + bSizer2 = new wxBoxSizer( wxHORIZONTAL ); + + m_cancelButton = new wxButton( m_buttonPanel, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_cancelButton, 0, wxALL|wxALIGN_BOTTOM, 5 ); + + + bSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_okButton = new wxButton( m_buttonPanel, wxID_ANY, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_okButton, 0, wxALL|wxALIGN_BOTTOM, 5 ); + + + m_buttonPanel->SetSizer( bSizer2 ); m_buttonPanel->Layout(); - bSizer2->Fit(m_buttonPanel); - dlgSizer->Add(m_buttonPanel, 0, wxEXPAND | wxALL, 5); - - - this->SetSizer(dlgSizer); + bSizer2->Fit( m_buttonPanel ); + dlgSizer->Add( m_buttonPanel, 0, wxEXPAND | wxALL, 5 ); + + + this->SetSizer( dlgSizer ); this->Layout(); - - this->Centre(wxBOTH); - + + this->Centre( wxBOTH ); + // Connect Events - m_portList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(PortSelectorDialogBase::onListSelect), NULL, this); - m_cancelButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PortSelectorDialogBase::onCancelButton), NULL, this); - m_okButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PortSelectorDialogBase::onOKButton), NULL, this); + m_portList->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( PortSelectorDialogBase::onListSelect ), NULL, this ); + m_cancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PortSelectorDialogBase::onCancelButton ), NULL, this ); + m_okButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PortSelectorDialogBase::onOKButton ), NULL, this ); } PortSelectorDialogBase::~PortSelectorDialogBase() { // Disconnect Events - m_portList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(PortSelectorDialogBase::onListSelect), NULL, this); - m_cancelButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PortSelectorDialogBase::onCancelButton), NULL, this); - m_okButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PortSelectorDialogBase::onOKButton), NULL, this); - + m_portList->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( PortSelectorDialogBase::onListSelect ), NULL, this ); + m_cancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PortSelectorDialogBase::onCancelButton ), NULL, this ); + m_okButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PortSelectorDialogBase::onOKButton ), NULL, this ); + } diff --git a/src/forms/Dialog/PortSelectorDialogBase.h b/src/forms/Dialog/PortSelectorDialogBase.h index 50db428..b3b6652 100644 --- a/src/forms/Dialog/PortSelectorDialogBase.h +++ b/src/forms/Dialog/PortSelectorDialogBase.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -19,6 +19,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -29,30 +32,30 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PortSelectorDialogBase /////////////////////////////////////////////////////////////////////////////// -class PortSelectorDialogBase : public wxDialog +class PortSelectorDialogBase : public wxDialog { -private: - -protected: - wxStaticText* m_staticText1; - wxListBox* m_portList; - wxStaticText* m_staticText2; - wxTextCtrl* m_portSelection; - wxPanel* m_buttonPanel; - wxButton* m_cancelButton; - wxButton* m_okButton; - - // Virtual event handlers, overide them in your derived class - virtual void onListSelect(wxCommandEvent& event) { event.Skip(); } - virtual void onCancelButton(wxCommandEvent& event) { event.Skip(); } - virtual void onOKButton(wxCommandEvent& event) { event.Skip(); } - - -public: - - PortSelectorDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Select Port"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(304, 197), long style = wxDEFAULT_DIALOG_STYLE); - ~PortSelectorDialogBase(); - + private: + + protected: + wxStaticText* m_staticText1; + wxListBox* m_portList; + wxStaticText* m_staticText2; + wxTextCtrl* m_portSelection; + wxPanel* m_buttonPanel; + wxButton* m_cancelButton; + wxButton* m_okButton; + + // Virtual event handlers, overide them in your derived class + virtual void onListSelect( wxCommandEvent& event ) { event.Skip(); } + virtual void onCancelButton( wxCommandEvent& event ) { event.Skip(); } + virtual void onOKButton( wxCommandEvent& event ) { event.Skip(); } + + + public: + + PortSelectorDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Select Port"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 304,197 ), long style = wxDEFAULT_DIALOG_STYLE ); + ~PortSelectorDialogBase(); + }; #endif //__PORTSELECTORDIALOGBASE_H__ diff --git a/src/forms/DigitalConsole/DigitalConsole.fbp b/src/forms/DigitalConsole/DigitalConsole.fbp index 90aed1d..662af08 100644 --- a/src/forms/DigitalConsole/DigitalConsole.fbp +++ b/src/forms/DigitalConsole/DigitalConsole.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 0 DigitalConsole - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DigitalConsoleFrame - + 441,394 wxCAPTION|wxFRAME_FLOAT_ON_PARENT|wxMAXIMIZE|wxMAXIMIZE_BOX|wxMINIMIZE|wxMINIMIZE_BOX|wxRESIZE_BORDER ; Digital Output - + wxWS_EX_PROCESS_UI_UPDATES - + wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL 1 - - - - - - - - - + + + + + + + + + OnClose - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + mainSizer wxVERTICAL none @@ -98,7 +98,7 @@ wxEXPAND 1 - + dataViewSizer wxVERTICAL none @@ -111,86 +111,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,-1,76,0 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_dataView 1 - - + + protected 1 - + Resizable 1 - + wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_NOHIDESEL|wxTE_READONLY|wxTE_WORDWRAP - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - + + wxWS_EX_PROCESS_UI_UPDATES - - wxALWAYS_SHOW_SB|wxFULL_REPAINT_ON_RESIZE|wxNO_BORDER|wxSIMPLE_BORDER|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxALWAYS_SHOW_SB|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL|wxBORDER_SIMPLE|wxBORDER_NONE + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200,7 +200,7 @@ wxALL|wxEXPAND 0 - + buttonSizer wxHORIZONTAL none @@ -213,17 +213,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -231,65 +231,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Clear - + 0 - - + + 0 - + 1 m_clearButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnClear - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -301,17 +301,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -319,65 +319,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Copy - + 0 - - + + 0 - + 1 m_copyButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnCopy - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -389,17 +389,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -407,65 +407,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Stop - + 0 - - + + 0 - + 1 m_pauseButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnPause - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forms/DigitalConsole/DigitalConsoleFrame.cpp b/src/forms/DigitalConsole/DigitalConsoleFrame.cpp index 16324db..42cf466 100644 --- a/src/forms/DigitalConsole/DigitalConsoleFrame.cpp +++ b/src/forms/DigitalConsole/DigitalConsoleFrame.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,65 +9,65 @@ /////////////////////////////////////////////////////////////////////////// -DigitalConsoleFrame::DigitalConsoleFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style) +DigitalConsoleFrame::DigitalConsoleFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) { - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - this->SetExtraStyle(wxWS_EX_PROCESS_UI_UPDATES); - + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + this->SetExtraStyle( wxWS_EX_PROCESS_UI_UPDATES ); + wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer(wxVERTICAL); - + mainSizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* dataViewSizer; - dataViewSizer = new wxBoxSizer(wxVERTICAL); - - m_dataView = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP | wxTE_MULTILINE | wxTE_NOHIDESEL | wxTE_READONLY | wxTE_WORDWRAP | wxALWAYS_SHOW_SB | wxFULL_REPAINT_ON_RESIZE | wxNO_BORDER | wxSIMPLE_BORDER | wxVSCROLL); - m_dataView->SetExtraStyle(wxWS_EX_PROCESS_UI_UPDATES); - m_dataView->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString)); - - dataViewSizer->Add(m_dataView, 1, wxEXPAND, 5); - - - mainSizer->Add(dataViewSizer, 1, wxEXPAND, 5); - + dataViewSizer = new wxBoxSizer( wxVERTICAL ); + + m_dataView = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_NOHIDESEL|wxTE_READONLY|wxTE_WORDWRAP|wxALWAYS_SHOW_SB|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL|wxBORDER_SIMPLE|wxBORDER_NONE ); + m_dataView->SetExtraStyle( wxWS_EX_PROCESS_UI_UPDATES ); + m_dataView->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + dataViewSizer->Add( m_dataView, 1, wxEXPAND, 5 ); + + + mainSizer->Add( dataViewSizer, 1, wxEXPAND, 5 ); + wxBoxSizer* buttonSizer; - buttonSizer = new wxBoxSizer(wxHORIZONTAL); - - m_clearButton = new wxButton(this, wxID_ANY, wxT("Clear"), wxDefaultPosition, wxDefaultSize, 0); - buttonSizer->Add(m_clearButton, 1, wxEXPAND, 5); - - m_copyButton = new wxButton(this, wxID_ANY, wxT("Copy"), wxDefaultPosition, wxDefaultSize, 0); - buttonSizer->Add(m_copyButton, 1, wxEXPAND, 5); - - m_pauseButton = new wxButton(this, wxID_ANY, wxT("Stop"), wxDefaultPosition, wxDefaultSize, 0); - buttonSizer->Add(m_pauseButton, 1, wxEXPAND, 5); - - - mainSizer->Add(buttonSizer, 0, wxALL | wxEXPAND, 5); - - - this->SetSizer(mainSizer); + buttonSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_clearButton = new wxButton( this, wxID_ANY, wxT("Clear"), wxDefaultPosition, wxDefaultSize, 0 ); + buttonSizer->Add( m_clearButton, 1, wxEXPAND, 5 ); + + m_copyButton = new wxButton( this, wxID_ANY, wxT("Copy"), wxDefaultPosition, wxDefaultSize, 0 ); + buttonSizer->Add( m_copyButton, 1, wxEXPAND, 5 ); + + m_pauseButton = new wxButton( this, wxID_ANY, wxT("Stop"), wxDefaultPosition, wxDefaultSize, 0 ); + buttonSizer->Add( m_pauseButton, 1, wxEXPAND, 5 ); + + + mainSizer->Add( buttonSizer, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( mainSizer ); this->Layout(); - m_refreshTimer.SetOwner(this, wxID_ANY); - m_refreshTimer.Start(250); - - - this->Centre(wxBOTH); - + m_refreshTimer.SetOwner( this, wxID_ANY ); + m_refreshTimer.Start( 250 ); + + + this->Centre( wxBOTH ); + // Connect Events - this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DigitalConsoleFrame::OnClose)); - m_clearButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DigitalConsoleFrame::OnClear), NULL, this); - m_copyButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DigitalConsoleFrame::OnCopy), NULL, this); - m_pauseButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DigitalConsoleFrame::OnPause), NULL, this); - this->Connect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(DigitalConsoleFrame::DoRefresh)); + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DigitalConsoleFrame::OnClose ) ); + m_clearButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DigitalConsoleFrame::OnClear ), NULL, this ); + m_copyButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DigitalConsoleFrame::OnCopy ), NULL, this ); + m_pauseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DigitalConsoleFrame::OnPause ), NULL, this ); + this->Connect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( DigitalConsoleFrame::DoRefresh ) ); } DigitalConsoleFrame::~DigitalConsoleFrame() { // Disconnect Events - this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DigitalConsoleFrame::OnClose)); - m_clearButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DigitalConsoleFrame::OnClear), NULL, this); - m_copyButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DigitalConsoleFrame::OnCopy), NULL, this); - m_pauseButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DigitalConsoleFrame::OnPause), NULL, this); - this->Disconnect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(DigitalConsoleFrame::DoRefresh)); - + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DigitalConsoleFrame::OnClose ) ); + m_clearButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DigitalConsoleFrame::OnClear ), NULL, this ); + m_copyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DigitalConsoleFrame::OnCopy ), NULL, this ); + m_pauseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DigitalConsoleFrame::OnPause ), NULL, this ); + this->Disconnect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( DigitalConsoleFrame::DoRefresh ) ); + } diff --git a/src/forms/DigitalConsole/DigitalConsoleFrame.h b/src/forms/DigitalConsole/DigitalConsoleFrame.h index 76d7b9e..08ad18a 100644 --- a/src/forms/DigitalConsole/DigitalConsoleFrame.h +++ b/src/forms/DigitalConsole/DigitalConsoleFrame.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -17,6 +17,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -27,31 +30,31 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DigitalConsoleFrame /////////////////////////////////////////////////////////////////////////////// -class DigitalConsoleFrame : public wxFrame +class DigitalConsoleFrame : public wxFrame { -private: - -protected: - wxTextCtrl* m_dataView; - wxButton* m_clearButton; - wxButton* m_copyButton; - wxButton* m_pauseButton; - wxTimer m_refreshTimer; - - // Virtual event handlers, overide them in your derived class - virtual void OnClose(wxCloseEvent& event) { event.Skip(); } - virtual void OnClear(wxCommandEvent& event) { event.Skip(); } - virtual void OnCopy(wxCommandEvent& event) { event.Skip(); } - virtual void OnPause(wxCommandEvent& event) { event.Skip(); } - virtual void DoRefresh(wxTimerEvent& event) { event.Skip(); } - - -public: - - DigitalConsoleFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Digital Output"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(441, 394), long style = wxCAPTION | wxFRAME_FLOAT_ON_PARENT | wxMAXIMIZE | wxMAXIMIZE_BOX | wxMINIMIZE | wxMINIMIZE_BOX | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxTAB_TRAVERSAL); - - ~DigitalConsoleFrame(); - + private: + + protected: + wxTextCtrl* m_dataView; + wxButton* m_clearButton; + wxButton* m_copyButton; + wxButton* m_pauseButton; + wxTimer m_refreshTimer; + + // Virtual event handlers, overide them in your derived class + virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } + virtual void OnClear( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCopy( wxCommandEvent& event ) { event.Skip(); } + virtual void OnPause( wxCommandEvent& event ) { event.Skip(); } + virtual void DoRefresh( wxTimerEvent& event ) { event.Skip(); } + + + public: + + DigitalConsoleFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Digital Output"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 441,394 ), long style = wxCAPTION|wxFRAME_FLOAT_ON_PARENT|wxMAXIMIZE|wxMAXIMIZE_BOX|wxMINIMIZE|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL ); + + ~DigitalConsoleFrame(); + }; #endif //__DIGITALCONSOLEFRAME_H__ diff --git a/src/forms/SDRDevices/SDRDeviceAdd.fbp b/src/forms/SDRDevices/SDRDeviceAdd.fbp index f5cb574..0c2cee2 100644 --- a/src/forms/SDRDevices/SDRDeviceAdd.fbp +++ b/src/forms/SDRDevices/SDRDeviceAdd.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 0 SDRDeviceAddForm - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + SDRDeviceAddForm - + 395,293 wxDEFAULT_DIALOG_STYLE - + Add SoapySDR Device - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer6 wxVERTICAL none @@ -102,78 +102,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Manually add a SoapyRemote or SoapySDR device. Useful for a device that is not detected automatically. - + 0 - - + + 0 - + 1 m_staticText4 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -195,83 +195,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 - + 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_soapyModule 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + OnSoapyModuleChanged - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -293,78 +293,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY <Parameter> - + 0 - - + + 0 - + 1 m_paramLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -376,86 +376,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + -1,-1 0 -1,48 1 m_paramText 1 - - + + protected 1 - + Resizable 1 - + wxTE_DONTWRAP - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + wxHSCROLL - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -473,7 +473,7 @@ wxEXPAND 1 - + bSizer7 wxHORIZONTAL none @@ -496,17 +496,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -514,65 +514,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Cancel - + 0 - - + + 0 - + 1 m_cancelButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnCancelButton - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -584,17 +584,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -602,65 +602,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Ok - + 0 - - + + 0 - + 1 m_OkButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnOkButton - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forms/SDRDevices/SDRDeviceAddForm.cpp b/src/forms/SDRDevices/SDRDeviceAddForm.cpp index d305a10..64c34ca 100644 --- a/src/forms/SDRDevices/SDRDeviceAddForm.cpp +++ b/src/forms/SDRDevices/SDRDeviceAddForm.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,75 +9,75 @@ /////////////////////////////////////////////////////////////////////////// -SDRDeviceAddForm::SDRDeviceAddForm(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) +SDRDeviceAddForm::SDRDeviceAddForm( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + wxBoxSizer* bSizer6; - bSizer6 = new wxBoxSizer(wxVERTICAL); - - m_staticText4 = new wxStaticText(this, wxID_ANY, wxT("Manually add a SoapyRemote or SoapySDR device. \n\nUseful for a device that is not detected automatically."), wxDefaultPosition, wxDefaultSize, 0); - m_staticText4->Wrap(-1); - bSizer6->Add(m_staticText4, 0, wxALL, 8); - - - bSizer6->Add(0, 0, 1, wxEXPAND, 5); - + bSizer6 = new wxBoxSizer( wxVERTICAL ); + + m_staticText4 = new wxStaticText( this, wxID_ANY, wxT("Manually add a SoapyRemote or SoapySDR device. \n\nUseful for a device that is not detected automatically."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText4->Wrap( -1 ); + bSizer6->Add( m_staticText4, 0, wxALL, 8 ); + + + bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + wxArrayString m_soapyModuleChoices; - m_soapyModule = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_soapyModuleChoices, 0); - m_soapyModule->SetSelection(0); - bSizer6->Add(m_soapyModule, 0, wxALL, 8); - - - bSizer6->Add(0, 0, 1, wxEXPAND, 5); - - m_paramLabel = new wxStaticText(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0); - m_paramLabel->Wrap(-1); - bSizer6->Add(m_paramLabel, 0, wxALL, 8); - - m_paramText = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP | wxHSCROLL); - m_paramText->SetMinSize(wxSize(-1, 48)); - - bSizer6->Add(m_paramText, 1, wxALL | wxEXPAND, 8); - - - bSizer6->Add(0, 0, 1, wxEXPAND, 5); - + m_soapyModule = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_soapyModuleChoices, 0 ); + m_soapyModule->SetSelection( 0 ); + bSizer6->Add( m_soapyModule, 0, wxALL, 8 ); + + + bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_paramLabel = new wxStaticText( this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); + m_paramLabel->Wrap( -1 ); + bSizer6->Add( m_paramLabel, 0, wxALL, 8 ); + + m_paramText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxHSCROLL ); + m_paramText->SetMinSize( wxSize( -1,48 ) ); + + bSizer6->Add( m_paramText, 1, wxALL|wxEXPAND, 8 ); + + + bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer(wxHORIZONTAL); - - - bSizer7->Add(0, 0, 1, wxEXPAND, 5); - - m_cancelButton = new wxButton(this, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0); - bSizer7->Add(m_cancelButton, 0, wxALL, 2); - - m_OkButton = new wxButton(this, wxID_ANY, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0); - bSizer7->Add(m_OkButton, 0, wxALL, 2); - - - bSizer6->Add(bSizer7, 1, wxEXPAND, 8); - - - bSizer6->Add(0, 0, 1, wxEXPAND, 5); - - - this->SetSizer(bSizer6); + bSizer7 = new wxBoxSizer( wxHORIZONTAL ); + + + bSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_cancelButton = new wxButton( this, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer7->Add( m_cancelButton, 0, wxALL, 2 ); + + m_OkButton = new wxButton( this, wxID_ANY, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer7->Add( m_OkButton, 0, wxALL, 2 ); + + + bSizer6->Add( bSizer7, 1, wxEXPAND, 8 ); + + + bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + + + this->SetSizer( bSizer6 ); this->Layout(); - - this->Centre(wxBOTH); - + + this->Centre( wxBOTH ); + // Connect Events - m_soapyModule->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(SDRDeviceAddForm::OnSoapyModuleChanged), NULL, this); - m_cancelButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SDRDeviceAddForm::OnCancelButton), NULL, this); - m_OkButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SDRDeviceAddForm::OnOkButton), NULL, this); + m_soapyModule->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SDRDeviceAddForm::OnSoapyModuleChanged ), NULL, this ); + m_cancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SDRDeviceAddForm::OnCancelButton ), NULL, this ); + m_OkButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SDRDeviceAddForm::OnOkButton ), NULL, this ); } SDRDeviceAddForm::~SDRDeviceAddForm() { // Disconnect Events - m_soapyModule->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(SDRDeviceAddForm::OnSoapyModuleChanged), NULL, this); - m_cancelButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SDRDeviceAddForm::OnCancelButton), NULL, this); - m_OkButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SDRDeviceAddForm::OnOkButton), NULL, this); - + m_soapyModule->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SDRDeviceAddForm::OnSoapyModuleChanged ), NULL, this ); + m_cancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SDRDeviceAddForm::OnCancelButton ), NULL, this ); + m_OkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SDRDeviceAddForm::OnOkButton ), NULL, this ); + } diff --git a/src/forms/SDRDevices/SDRDeviceAddForm.h b/src/forms/SDRDevices/SDRDeviceAddForm.h index 3f60877..2ea6bdf 100644 --- a/src/forms/SDRDevices/SDRDeviceAddForm.h +++ b/src/forms/SDRDevices/SDRDeviceAddForm.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -18,6 +18,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -28,29 +31,29 @@ /////////////////////////////////////////////////////////////////////////////// /// Class SDRDeviceAddForm /////////////////////////////////////////////////////////////////////////////// -class SDRDeviceAddForm : public wxDialog +class SDRDeviceAddForm : public wxDialog { -private: - -protected: - wxStaticText* m_staticText4; - wxChoice* m_soapyModule; - wxStaticText* m_paramLabel; - wxTextCtrl* m_paramText; - wxButton* m_cancelButton; - wxButton* m_OkButton; - - // Virtual event handlers, overide them in your derived class - virtual void OnSoapyModuleChanged(wxCommandEvent& event) { event.Skip(); } - virtual void OnCancelButton(wxCommandEvent& event) { event.Skip(); } - virtual void OnOkButton(wxCommandEvent& event) { event.Skip(); } - - -public: - - SDRDeviceAddForm(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Add SoapySDR Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(395, 293), long style = wxDEFAULT_DIALOG_STYLE); - ~SDRDeviceAddForm(); - + private: + + protected: + wxStaticText* m_staticText4; + wxChoice* m_soapyModule; + wxStaticText* m_paramLabel; + wxTextCtrl* m_paramText; + wxButton* m_cancelButton; + wxButton* m_OkButton; + + // Virtual event handlers, overide them in your derived class + virtual void OnSoapyModuleChanged( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelButton( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkButton( wxCommandEvent& event ) { event.Skip(); } + + + public: + + SDRDeviceAddForm( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Add SoapySDR Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 395,293 ), long style = wxDEFAULT_DIALOG_STYLE ); + ~SDRDeviceAddForm(); + }; #endif //__SDRDEVICEADDFORM_H__ diff --git a/src/forms/SDRDevices/SDRDevices.fbp b/src/forms/SDRDevices/SDRDevices.fbp index 4fc959b..5a5d0e6 100644 --- a/src/forms/SDRDevices/SDRDevices.fbp +++ b/src/forms/SDRDevices/SDRDevices.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 0 SDRDevicesForm - + . - + 1 1 1 @@ -29,113 +29,113 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + devFrame - + 700,467 wxDEFAULT_FRAME_STYLE - + CubicSDR :: SDR Devices - - - + + + wxTAB_TRAVERSAL 1 - - - - - - - - - + + + + + + + + + OnClose - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + 1 1 - + 1 - + 0 wxID_ANY - - + + devStatusBar protected - - - wxST_SIZEGRIP - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + wxSTB_SIZEGRIP + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + devFrameSizer wxVERTICAL none @@ -148,77 +148,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_panel3 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer4 wxHORIZONTAL none @@ -231,77 +231,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_panel6 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer6 wxVERTICAL none @@ -314,97 +314,97 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 0 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 devTree 1 - - + + protected 1 - + Resizable 1 - + wxTR_DEFAULT_STYLE - + 0 - - - - - - - - - - - + + + + + + + + + + + OnTreeDoubleClick - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + OnDeleteItem - - - - - - - - - - - - - + + + + + + + + + + + + + OnSelectionChanged - - - - + + + + @@ -416,77 +416,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_panel4 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer5 wxHORIZONTAL none @@ -499,17 +499,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -517,65 +517,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Refresh - + 0 - - + + 0 - + 1 m_refreshButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - + + + + + + + + + + + + + + OnRefreshDevices - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -587,17 +587,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -605,65 +605,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Add - + 0 - - + + 0 - + 1 m_addRemoteButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - + + + + + + + + + + + + + + OnAddRemote - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -675,17 +675,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -693,65 +693,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Start - + 0 - - + + 0 - + 1 m_useSelectedButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - + + + + + + + + + + + + + + OnUseSelected - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -769,77 +769,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_panel61 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer7 wxVERTICAL none @@ -852,78 +852,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY SoapySDR Device Options - + 0 - - + + 0 - + 1 m_staticText1 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -935,81 +935,81 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - - + + 1 - + 0 0 wxID_ANY 1 - + 0 - - + + 0 - + 1 m_propertyGrid 1 - - + + protected 1 - + Resizable 1 - + wxPG_DEFAULT_STYLE - + 0 - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + OnPropGridChanged - - - - + + + + OnPropGridFocus - - + + diff --git a/src/forms/SDRDevices/SDRDevicesForm.cpp b/src/forms/SDRDevices/SDRDevicesForm.cpp index d3f0fd5..decada2 100644 --- a/src/forms/SDRDevices/SDRDevicesForm.cpp +++ b/src/forms/SDRDevices/SDRDevicesForm.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,107 +9,107 @@ /////////////////////////////////////////////////////////////////////////// -devFrame::devFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style) +devFrame::devFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) { - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - - devStatusBar = this->CreateStatusBar(1, wxST_SIZEGRIP, wxID_ANY); + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + devStatusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY ); wxBoxSizer* devFrameSizer; - devFrameSizer = new wxBoxSizer(wxVERTICAL); - - m_panel3 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + devFrameSizer = new wxBoxSizer( wxVERTICAL ); + + m_panel3 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer(wxHORIZONTAL); - - m_panel6 = new wxPanel(m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + + m_panel6 = new wxPanel( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer6; - bSizer6 = new wxBoxSizer(wxVERTICAL); - - devTree = new wxTreeCtrl(m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE); - devTree->Enable(false); - - bSizer6->Add(devTree, 1, wxEXPAND, 5); - - m_panel4 = new wxPanel(m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + bSizer6 = new wxBoxSizer( wxVERTICAL ); + + devTree = new wxTreeCtrl( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE ); + devTree->Enable( false ); + + bSizer6->Add( devTree, 1, wxEXPAND, 5 ); + + m_panel4 = new wxPanel( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer(wxHORIZONTAL); - - m_refreshButton = new wxButton(m_panel4, wxID_ANY, wxT("Refresh"), wxDefaultPosition, wxDefaultSize, 0); - bSizer5->Add(m_refreshButton, 1, wxALL, 5); - - m_addRemoteButton = new wxButton(m_panel4, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0); - bSizer5->Add(m_addRemoteButton, 1, wxALL, 5); - - m_useSelectedButton = new wxButton(m_panel4, wxID_ANY, wxT("Start"), wxDefaultPosition, wxDefaultSize, 0); - bSizer5->Add(m_useSelectedButton, 1, wxALL | wxALIGN_CENTER_VERTICAL, 5); - - - m_panel4->SetSizer(bSizer5); + bSizer5 = new wxBoxSizer( wxHORIZONTAL ); + + m_refreshButton = new wxButton( m_panel4, wxID_ANY, wxT("Refresh"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer5->Add( m_refreshButton, 1, wxALL, 5 ); + + m_addRemoteButton = new wxButton( m_panel4, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer5->Add( m_addRemoteButton, 1, wxALL, 5 ); + + m_useSelectedButton = new wxButton( m_panel4, wxID_ANY, wxT("Start"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer5->Add( m_useSelectedButton, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + + m_panel4->SetSizer( bSizer5 ); m_panel4->Layout(); - bSizer5->Fit(m_panel4); - bSizer6->Add(m_panel4, 0, wxEXPAND, 5); - - - m_panel6->SetSizer(bSizer6); + bSizer5->Fit( m_panel4 ); + bSizer6->Add( m_panel4, 0, wxEXPAND, 5 ); + + + m_panel6->SetSizer( bSizer6 ); m_panel6->Layout(); - bSizer6->Fit(m_panel6); - bSizer4->Add(m_panel6, 1, wxEXPAND | wxALL, 5); - - m_panel61 = new wxPanel(m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + bSizer6->Fit( m_panel6 ); + bSizer4->Add( m_panel6, 1, wxEXPAND | wxALL, 5 ); + + m_panel61 = new wxPanel( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer(wxVERTICAL); - - m_staticText1 = new wxStaticText(m_panel61, wxID_ANY, wxT("SoapySDR Device Options"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText1->Wrap(-1); - bSizer7->Add(m_staticText1, 0, wxALL, 5); - + bSizer7 = new wxBoxSizer( wxVERTICAL ); + + m_staticText1 = new wxStaticText( m_panel61, wxID_ANY, wxT("SoapySDR Device Options"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1->Wrap( -1 ); + bSizer7->Add( m_staticText1, 0, wxALL, 5 ); + m_propertyGrid = new wxPropertyGrid(m_panel61, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_DEFAULT_STYLE); - bSizer7->Add(m_propertyGrid, 1, wxALL | wxEXPAND, 5); - - - m_panel61->SetSizer(bSizer7); + bSizer7->Add( m_propertyGrid, 1, wxALL|wxEXPAND, 5 ); + + + m_panel61->SetSizer( bSizer7 ); m_panel61->Layout(); - bSizer7->Fit(m_panel61); - bSizer4->Add(m_panel61, 1, wxEXPAND | wxALL, 5); - - - m_panel3->SetSizer(bSizer4); + bSizer7->Fit( m_panel61 ); + bSizer4->Add( m_panel61, 1, wxEXPAND | wxALL, 5 ); + + + m_panel3->SetSizer( bSizer4 ); m_panel3->Layout(); - bSizer4->Fit(m_panel3); - devFrameSizer->Add(m_panel3, 1, wxEXPAND | wxALL, 5); - - - this->SetSizer(devFrameSizer); + bSizer4->Fit( m_panel3 ); + devFrameSizer->Add( m_panel3, 1, wxEXPAND | wxALL, 5 ); + + + this->SetSizer( devFrameSizer ); this->Layout(); - m_deviceTimer.SetOwner(this, wxID_ANY); - - this->Centre(wxBOTH); - + m_deviceTimer.SetOwner( this, wxID_ANY ); + + this->Centre( wxBOTH ); + // Connect Events - this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(devFrame::OnClose)); - devTree->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(devFrame::OnTreeDoubleClick), NULL, this); - devTree->Connect(wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEventHandler(devFrame::OnDeleteItem), NULL, this); - devTree->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(devFrame::OnSelectionChanged), NULL, this); - m_refreshButton->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(devFrame::OnRefreshDevices), NULL, this); - m_addRemoteButton->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(devFrame::OnAddRemote), NULL, this); - m_useSelectedButton->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(devFrame::OnUseSelected), NULL, this); - m_propertyGrid->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(devFrame::OnPropGridChanged), NULL, this); - m_propertyGrid->Connect(wxEVT_SET_FOCUS, wxFocusEventHandler(devFrame::OnPropGridFocus), NULL, this); - this->Connect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(devFrame::OnDeviceTimer)); + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( devFrame::OnClose ) ); + devTree->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( devFrame::OnTreeDoubleClick ), NULL, this ); + devTree->Connect( wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEventHandler( devFrame::OnDeleteItem ), NULL, this ); + devTree->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( devFrame::OnSelectionChanged ), NULL, this ); + m_refreshButton->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( devFrame::OnRefreshDevices ), NULL, this ); + m_addRemoteButton->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( devFrame::OnAddRemote ), NULL, this ); + m_useSelectedButton->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( devFrame::OnUseSelected ), NULL, this ); + m_propertyGrid->Connect( wxEVT_PG_CHANGED, wxPropertyGridEventHandler( devFrame::OnPropGridChanged ), NULL, this ); + m_propertyGrid->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( devFrame::OnPropGridFocus ), NULL, this ); + this->Connect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( devFrame::OnDeviceTimer ) ); } devFrame::~devFrame() { // Disconnect Events - this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(devFrame::OnClose)); - devTree->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(devFrame::OnTreeDoubleClick), NULL, this); - devTree->Disconnect(wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEventHandler(devFrame::OnDeleteItem), NULL, this); - devTree->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(devFrame::OnSelectionChanged), NULL, this); - m_refreshButton->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(devFrame::OnRefreshDevices), NULL, this); - m_addRemoteButton->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(devFrame::OnAddRemote), NULL, this); - m_useSelectedButton->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(devFrame::OnUseSelected), NULL, this); - m_propertyGrid->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(devFrame::OnPropGridChanged), NULL, this); - m_propertyGrid->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(devFrame::OnPropGridFocus), NULL, this); - this->Disconnect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(devFrame::OnDeviceTimer)); - + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( devFrame::OnClose ) ); + devTree->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( devFrame::OnTreeDoubleClick ), NULL, this ); + devTree->Disconnect( wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEventHandler( devFrame::OnDeleteItem ), NULL, this ); + devTree->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( devFrame::OnSelectionChanged ), NULL, this ); + m_refreshButton->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( devFrame::OnRefreshDevices ), NULL, this ); + m_addRemoteButton->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( devFrame::OnAddRemote ), NULL, this ); + m_useSelectedButton->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( devFrame::OnUseSelected ), NULL, this ); + m_propertyGrid->Disconnect( wxEVT_PG_CHANGED, wxPropertyGridEventHandler( devFrame::OnPropGridChanged ), NULL, this ); + m_propertyGrid->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( devFrame::OnPropGridFocus ), NULL, this ); + this->Disconnect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( devFrame::OnDeviceTimer ) ); + } diff --git a/src/forms/SDRDevices/SDRDevicesForm.h b/src/forms/SDRDevices/SDRDevicesForm.h index c4976f0..dda2458 100644 --- a/src/forms/SDRDevices/SDRDevicesForm.h +++ b/src/forms/SDRDevices/SDRDevicesForm.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 27 2017) +// C++ code generated with wxFormBuilder (version Aug 8 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -17,13 +17,13 @@ #include #include #include +#include +#include +#include #include #include #include #include -#include -#include -#include #include #include #include @@ -35,43 +35,43 @@ /////////////////////////////////////////////////////////////////////////////// /// Class devFrame /////////////////////////////////////////////////////////////////////////////// -class devFrame : public wxFrame +class devFrame : public wxFrame { -private: - -protected: - wxStatusBar* devStatusBar; - wxPanel* m_panel3; - wxPanel* m_panel6; - wxTreeCtrl* devTree; - wxPanel* m_panel4; - wxButton* m_refreshButton; - wxButton* m_addRemoteButton; - wxButton* m_useSelectedButton; - wxPanel* m_panel61; - wxStaticText* m_staticText1; - wxPropertyGrid* m_propertyGrid; - wxTimer m_deviceTimer; - - // Virtual event handlers, overide them in your derived class - virtual void OnClose(wxCloseEvent& event) { event.Skip(); } - virtual void OnTreeDoubleClick(wxMouseEvent& event) { event.Skip(); } - virtual void OnDeleteItem(wxTreeEvent& event) { event.Skip(); } - virtual void OnSelectionChanged(wxTreeEvent& event) { event.Skip(); } - virtual void OnRefreshDevices(wxMouseEvent& event) { event.Skip(); } - virtual void OnAddRemote(wxMouseEvent& event) { event.Skip(); } - virtual void OnUseSelected(wxMouseEvent& event) { event.Skip(); } - virtual void OnPropGridChanged(wxPropertyGridEvent& event) { event.Skip(); } - virtual void OnPropGridFocus(wxFocusEvent& event) { event.Skip(); } - virtual void OnDeviceTimer(wxTimerEvent& event) { event.Skip(); } - - -public: - - devFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("CubicSDR :: SDR Devices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(700, 467), long style = wxDEFAULT_FRAME_STYLE | wxTAB_TRAVERSAL); - - ~devFrame(); - + private: + + protected: + wxStatusBar* devStatusBar; + wxPanel* m_panel3; + wxPanel* m_panel6; + wxTreeCtrl* devTree; + wxPanel* m_panel4; + wxButton* m_refreshButton; + wxButton* m_addRemoteButton; + wxButton* m_useSelectedButton; + wxPanel* m_panel61; + wxStaticText* m_staticText1; + wxPropertyGrid* m_propertyGrid; + wxTimer m_deviceTimer; + + // Virtual event handlers, overide them in your derived class + virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } + virtual void OnTreeDoubleClick( wxMouseEvent& event ) { event.Skip(); } + virtual void OnDeleteItem( wxTreeEvent& event ) { event.Skip(); } + virtual void OnSelectionChanged( wxTreeEvent& event ) { event.Skip(); } + virtual void OnRefreshDevices( wxMouseEvent& event ) { event.Skip(); } + virtual void OnAddRemote( wxMouseEvent& event ) { event.Skip(); } + virtual void OnUseSelected( wxMouseEvent& event ) { event.Skip(); } + virtual void OnPropGridChanged( wxPropertyGridEvent& event ) { event.Skip(); } + virtual void OnPropGridFocus( wxFocusEvent& event ) { event.Skip(); } + virtual void OnDeviceTimer( wxTimerEvent& event ) { event.Skip(); } + + + public: + + devFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("CubicSDR :: SDR Devices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 700,467 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + + ~devFrame(); + }; #endif //__SDRDEVICESFORM_H__