Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 drs4eb (5.0.6+git20211217+ds-1) unstable; urgency=medium
 .
   * Initial release. (Closes: #979400)
Author: Gürkan Myczko <tar@debian.org>
Bug-Debian: https://bugs.debian.org/979400

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2022-03-30

--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/DRSOsc.cpp
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/DRSOsc.cpp
@@ -1,2072 +1,2086 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 27 2012)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "DRSOsc.h"
-
-#include "down.xpm"
-#include "drsosc.xpm"
-#include "left.xpm"
-#include "pos.xpm"
-#include "right.xpm"
-#include "up.xpm"
-
-///////////////////////////////////////////////////////////////////////////
-
-DOFrame_fb::DOFrame_fb( 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 );
-
-	m_menubar1 = new wxMenuBar( 0 );
-	m_menu1 = new wxMenu();
-	wxMenuItem* m_menuSave;
-	m_menuSave = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("&Save...") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuSave );
-
-	wxMenuItem* m_menuPrint;
-	m_menuPrint = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("&Print") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuPrint );
-
-	m_menu1->AppendSeparator();
-
-	wxMenuItem* m_menuExit;
-	m_menuExit = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("E&xit") ) + wxT('\t') + wxT("Ctrl+X"), wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuExit );
-
-	m_menubar1->Append( m_menu1, wxT("&File") );
-
-	m_menu4 = new wxMenu();
-	wxMenuItem* m_menuCursorA;
-	m_menuCursorA = new wxMenuItem( m_menu4, ID_CURSORA, wxString( wxT("Cursor A") ) + wxT('\t') + wxT("Ctrl+A"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuCursorA );
-
-	wxMenuItem* m_menuCursorB;
-	m_menuCursorB = new wxMenuItem( m_menu4, ID_CURSORB, wxString( wxT("Cursor B") ) + wxT('\t') + wxT("Ctrl+B"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuCursorB );
-
-	wxMenuItem* m_menuItem13;
-	m_menuItem13 = new wxMenuItem( m_menu4, wxID_ANY, wxString( wxT("Snap Cursor") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuItem13 );
-
-	m_menubar1->Append( m_menu4, wxT("C&ursor") );
-
-	m_menu3 = new wxMenu();
-	wxMenuItem* m_menuConfig;
-	m_menuConfig = new wxMenuItem( m_menu3, wxID_ANY, wxString( wxT("Config...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu3->Append( m_menuConfig );
-
-	wxMenuItem* m_menuMeasure;
-	m_menuMeasure = new wxMenuItem( m_menu3, wxID_ANY, wxString( wxT("Measure...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu3->Append( m_menuMeasure );
-
-	wxMenuItem* m_menuDisplay;
-	m_menuDisplay = new wxMenuItem( m_menu3, wxID_ANY, wxString( wxT("Display...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu3->Append( m_menuDisplay );
-
-	m_menubar1->Append( m_menu3, wxT("&Tools") );
-
-	m_menu2 = new wxMenu();
-	wxMenuItem* m_menuAbout;
-	m_menuAbout = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("About...") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuAbout );
-
-	m_menubar1->Append( m_menu2, wxT("&Help") );
-
-	this->SetMenuBar( m_menubar1 );
-
-	wxBoxSizer* bSizer1;
-	bSizer1 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_pnScreen = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER );
-	bSizer1->Add( m_pnScreen, 1, wxEXPAND, 5 );
-
-	m_pnControls = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-	m_pnControls->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer2;
-	bSizer2 = new wxBoxSizer( wxVERTICAL );
-
-	wxStaticBoxSizer* sbSizer1;
-	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Trigger") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer4;
-	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_slTrgLevel = new wxSlider( m_pnControls, ID_TR_LEVEL, -250, -500, 500, wxDefaultPosition, wxSize( 20,120 ), wxSL_VERTICAL|wxSTATIC_BORDER );
-	m_slTrgLevel->SetToolTip( wxT("Set Trigger Level") );
-
-	bSizer4->Add( m_slTrgLevel, 0, 0, 5 );
-
-	wxBoxSizer* bSizer5;
-	bSizer5 = new wxBoxSizer( wxVERTICAL );
-
-	wxBoxSizer* bSizer32;
-	bSizer32 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_btRun = new wxButton( m_pnControls, ID_RUN, wxT("Stop"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_btRun->SetToolTip( wxT("Start/Stop Acquisition") );
-
-	bSizer32->Add( m_btRun, 1, wxEXPAND, 5 );
-
-	m_btSingle = new wxButton( m_pnControls, ID_SINGLE, wxT("Single"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_btSingle->SetToolTip( wxT("Arm for Single Trigger") );
-
-	bSizer32->Add( m_btSingle, 1, wxEXPAND, 5 );
-
-
-	bSizer5->Add( bSizer32, 0, wxEXPAND, 5 );
-
-	wxStaticBoxSizer* sbSizer18;
-	sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Type") ), wxHORIZONTAL );
-
-	wxBoxSizer* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
-
-	m_rbNormal = new wxRadioButton( m_pnControls, ID_TR_NORMAL, wxT("Normal"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_rbNormal->SetValue( true );
-	m_rbNormal->SetToolTip( wxT("Set Normal Trigger Mode") );
-
-	bSizer7->Add( m_rbNormal, 0, 0, 5 );
-
-	m_rbAuto = new wxRadioButton( m_pnControls, ID_TR_AUTO, wxT("Auto"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_rbAuto->SetToolTip( wxT("Set Auto Trigger Mode") );
-
-	bSizer7->Add( m_rbAuto, 0, 0, 5 );
-
-
-	sbSizer18->Add( bSizer7, 0, 0, 5 );
-
-	m_bpPolarity = new wxBitmapButton( m_pnControls, ID_TR_POLARITY, wxBitmap( pos_xpm ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	m_bpPolarity->SetToolTip( wxT("Set Trigger Polarity") );
-
-	sbSizer18->Add( m_bpPolarity, 0, wxALIGN_CENTER|wxRIGHT|wxLEFT, 2 );
-
-	m_btTrgCfg = new wxButton( m_pnControls, ID_TRGCFG, wxT("CFG"), wxDefaultPosition, wxSize( 45,-1 ), 0 );
-	m_btTrgCfg->SetToolTip( wxT("Show advanced trigger configuration") );
-
-	sbSizer18->Add( m_btTrgCfg, 1, wxALIGN_CENTER, 5 );
-
-
-	bSizer5->Add( sbSizer18, 0, 0, 5 );
-
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_staticText59 = new wxStaticText( m_pnControls, wxID_ANY, wxT("Max"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText59->Wrap( -1 );
-	bSizer31->Add( m_staticText59, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
-
-	m_staticText60 = new wxStaticText( m_pnControls, wxID_ANY, wxT("Delay"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText60->Wrap( -1 );
-	bSizer31->Add( m_staticText60, 1, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
-
-	m_staticText61 = new wxStaticText( m_pnControls, wxID_ANY, wxT("Min"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText61->Wrap( -1 );
-	bSizer31->Add( m_staticText61, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-	bSizer5->Add( bSizer31, 0, wxEXPAND, 5 );
-
-	m_slTrgDelay = new wxSlider( m_pnControls, ID_TR_DELAY, 100, 0, 100, wxDefaultPosition, wxSize( -1,20 ), wxSL_HORIZONTAL|wxSTATIC_BORDER );
-	m_slTrgDelay->SetToolTip( wxT("Set Trigger Delay") );
-
-	bSizer5->Add( m_slTrgDelay, 0, wxEXPAND, 5 );
-
-
-	bSizer4->Add( bSizer5, 1, wxEXPAND, 5 );
-
-
-	sbSizer1->Add( bSizer4, 1, wxEXPAND, 2 );
-
-	wxString m_rbSourceChoices[] = { wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("E"), wxT("X") };
-	int m_rbSourceNChoices = sizeof( m_rbSourceChoices ) / sizeof( wxString );
-	m_rbSource = new wxRadioBox( m_pnControls, ID_TR_SOURCE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbSourceNChoices, m_rbSourceChoices, 1, wxRA_SPECIFY_ROWS );
-	m_rbSource->SetSelection( 0 );
-	m_rbSource->SetToolTip( wxT("Select channel to trigger on (E for external)") );
-
-	sbSizer1->Add( m_rbSource, 0, wxALIGN_CENTER, 0 );
-
-
-	bSizer2->Add( sbSizer1, 0, 0, 5 );
-
-	wxStaticBoxSizer* sbSizer2;
-	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Horizontal") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer20;
-	bSizer20 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_bpButton2 = new wxBitmapButton( m_pnControls, ID_HSCALEDOWN, wxBitmap( left_xpm ), wxDefaultPosition, wxSize( -1,32 ), wxBU_AUTODRAW );
-	bSizer20->Add( m_bpButton2, 0, wxEXPAND, 10 );
-
-	m_stHScale = new wxStaticText( m_pnControls, wxID_ANY, wxT("ns/div"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE );
-	m_stHScale->Wrap( -1 );
-	m_stHScale->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 75, 90, 90, false, wxEmptyString ) );
-
-	bSizer20->Add( m_stHScale, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_bpButton3 = new wxBitmapButton( m_pnControls, ID_HSCALEUP, wxBitmap( right_xpm ), wxDefaultPosition, wxSize( -1,32 ), wxBU_AUTODRAW );
-	bSizer20->Add( m_bpButton3, 0, wxEXPAND, 10 );
-
-
-	sbSizer2->Add( bSizer20, 0, wxEXPAND, 5 );
-
-	m_slHOffset = new wxSlider( m_pnControls, ID_HOR_POS, 0, -1000, 1000, wxDefaultPosition, wxSize( -1,20 ), wxSL_HORIZONTAL|wxSTATIC_BORDER );
-	m_slHOffset->SetToolTip( wxT("Set Horizontal Position") );
-
-	sbSizer2->Add( m_slHOffset, 0, wxEXPAND, 3 );
-
-
-	bSizer2->Add( sbSizer2, 0, wxEXPAND, 5 );
-
-	wxStaticBoxSizer* sbSizer3;
-	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Vertical") ), wxHORIZONTAL );
-
-	wxBoxSizer* bSizer9;
-	bSizer9 = new wxBoxSizer( wxVERTICAL );
-
-	m_btCh1 = new wxToggleButton( m_pnControls, ID_CHON1, wxT("1"), wxDefaultPosition, wxSize( 30,27 ), 0 );
-	m_btCh1->SetValue( true );
-	m_btCh1->SetFont( wxFont( 12, 74, 90, 92, false, wxEmptyString ) );
-	m_btCh1->SetToolTip( wxT("Enable Channel 1") );
-
-	bSizer9->Add( m_btCh1, 0, wxALIGN_CENTER, 5 );
-
-	m_slPos1 = new wxSlider( m_pnControls, ID_POS1, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxSTATIC_BORDER );
-	m_slPos1->SetBackgroundColour( wxColour( 255, 255, 0 ) );
-	m_slPos1->SetToolTip( wxT("Move Channel 1 Vertical Position") );
-	m_slPos1->SetMinSize( wxSize( -1,70 ) );
-	m_slPos1->SetMaxSize( wxSize( -1,70 ) );
-
-	bSizer9->Add( m_slPos1, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton4 = new wxBitmapButton( m_pnControls, ID_SCALEUP1, wxBitmap( up_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer9->Add( m_bpButton4, 0, wxALIGN_CENTER_HORIZONTAL, 0 );
-
-	m_stScale1 = new wxStaticText( m_pnControls, wxID_ANY, wxT("500mV"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_CENTRE|wxST_NO_AUTORESIZE );
-	m_stScale1->Wrap( -1 );
-	m_stScale1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 75, 90, 90, false, wxEmptyString ) );
-
-	bSizer9->Add( m_stScale1, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 0 );
-
-	m_bpButton5 = new wxBitmapButton( m_pnControls, ID_SCALEDN1, wxBitmap( down_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer9->Add( m_bpButton5, 0, wxALIGN_CENTER_HORIZONTAL, 0 );
-
-
-	sbSizer3->Add( bSizer9, 1, wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer10;
-	bSizer10 = new wxBoxSizer( wxVERTICAL );
-
-	m_btCh2 = new wxToggleButton( m_pnControls, ID_CHON2, wxT("2"), wxDefaultPosition, wxSize( 30,27 ), 0 );
-	m_btCh2->SetValue( true );
-	m_btCh2->SetFont( wxFont( 12, 74, 90, 92, false, wxEmptyString ) );
-	m_btCh2->SetToolTip( wxT("Enable Channel 2") );
-
-	bSizer10->Add( m_btCh2, 0, wxALIGN_CENTER, 5 );
-
-	m_slPos2 = new wxSlider( m_pnControls, ID_POS2, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxSTATIC_BORDER );
-	m_slPos2->SetBackgroundColour( wxColour( 170, 170, 255 ) );
-	m_slPos2->SetToolTip( wxT("Move Channel 2 Vertical Position") );
-	m_slPos2->SetMinSize( wxSize( -1,70 ) );
-	m_slPos2->SetMaxSize( wxSize( -1,70 ) );
-
-	bSizer10->Add( m_slPos2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton6 = new wxBitmapButton( m_pnControls, ID_SCALEUP2, wxBitmap( up_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer10->Add( m_bpButton6, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_stScale2 = new wxStaticText( m_pnControls, wxID_ANY, wxT("500mV"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE );
-	m_stScale2->Wrap( -1 );
-	m_stScale2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 75, 90, 90, false, wxEmptyString ) );
-
-	bSizer10->Add( m_stScale2, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton7 = new wxBitmapButton( m_pnControls, ID_SCALEDN2, wxBitmap( down_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer10->Add( m_bpButton7, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-	sbSizer3->Add( bSizer10, 1, wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer11;
-	bSizer11 = new wxBoxSizer( wxVERTICAL );
-
-	m_btCh3 = new wxToggleButton( m_pnControls, ID_CHON3, wxT("3"), wxDefaultPosition, wxSize( 30,27 ), 0 );
-	m_btCh3->SetFont( wxFont( 12, 74, 90, 92, false, wxEmptyString ) );
-	m_btCh3->SetToolTip( wxT("Enable Channel 3") );
-
-	bSizer11->Add( m_btCh3, 0, wxALIGN_CENTER, 5 );
-
-	m_slPos3 = new wxSlider( m_pnControls, ID_POS3, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxSTATIC_BORDER );
-	m_slPos3->SetBackgroundColour( wxColour( 255, 170, 170 ) );
-	m_slPos3->SetToolTip( wxT("Move Channel 3 Vertical Position") );
-	m_slPos3->SetMinSize( wxSize( -1,70 ) );
-	m_slPos3->SetMaxSize( wxSize( -1,70 ) );
-
-	bSizer11->Add( m_slPos3, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton8 = new wxBitmapButton( m_pnControls, ID_SCALEUP3, wxBitmap( up_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer11->Add( m_bpButton8, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_stScale3 = new wxStaticText( m_pnControls, wxID_ANY, wxT("500mV"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE );
-	m_stScale3->Wrap( -1 );
-	m_stScale3->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 75, 90, 90, false, wxEmptyString ) );
-
-	bSizer11->Add( m_stScale3, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton9 = new wxBitmapButton( m_pnControls, ID_SCALEDN3, wxBitmap( down_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer11->Add( m_bpButton9, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-	sbSizer3->Add( bSizer11, 1, wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer13;
-	bSizer13 = new wxBoxSizer( wxVERTICAL );
-
-	m_btCh4 = new wxToggleButton( m_pnControls, ID_CHON4, wxT("4"), wxDefaultPosition, wxSize( 30,27 ), 0 );
-	m_btCh4->SetFont( wxFont( 12, 74, 90, 92, false, wxEmptyString ) );
-	m_btCh4->SetToolTip( wxT("Enable Channel 4") );
-
-	bSizer13->Add( m_btCh4, 0, wxALIGN_CENTER, 5 );
-
-	m_slPos4 = new wxSlider( m_pnControls, ID_POS4, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxSTATIC_BORDER );
-	m_slPos4->SetBackgroundColour( wxColour( 170, 255, 170 ) );
-	m_slPos4->SetToolTip( wxT("Move Channel 4 Vertical Position") );
-	m_slPos4->SetMinSize( wxSize( -1,70 ) );
-	m_slPos4->SetMaxSize( wxSize( -1,70 ) );
-
-	bSizer13->Add( m_slPos4, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton10 = new wxBitmapButton( m_pnControls, ID_SCALEUP4, wxBitmap( up_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer13->Add( m_bpButton10, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_stScale4 = new wxStaticText( m_pnControls, wxID_ANY, wxT("500mV"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE );
-	m_stScale4->Wrap( -1 );
-	m_stScale4->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 75, 90, 90, false, wxEmptyString ) );
-
-	bSizer13->Add( m_stScale4, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_bpButton11 = new wxBitmapButton( m_pnControls, ID_SCALEDN4, wxBitmap( down_xpm ), wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW );
-	bSizer13->Add( m_bpButton11, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-	sbSizer3->Add( bSizer13, 1, wxEXPAND, 5 );
-
-
-	bSizer2->Add( sbSizer3, 0, wxEXPAND, 5 );
-
-	wxStaticBoxSizer* sbSizer8;
-	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
-	wxBoxSizer* bSizer131;
-	bSizer131 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_staticText76 = new wxStaticText( m_pnControls, wxID_ANY, wxT("Cursor:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText76->Wrap( -1 );
-	bSizer131->Add( m_staticText76, 0, wxALIGN_CENTER, 5 );
-
-	m_toggleCursorA = new wxToggleButton( m_pnControls, ID_CURSORA, wxT("&A"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	m_toggleCursorA->SetToolTip( wxT("Activate Cursor A") );
-	m_toggleCursorA->SetMinSize( wxSize( 40,-1 ) );
-	m_toggleCursorA->SetMaxSize( wxSize( 40,-1 ) );
-
-	bSizer131->Add( m_toggleCursorA, 0, wxALIGN_CENTER, 5 );
-
-	m_toggleCursorB = new wxToggleButton( m_pnControls, ID_CURSORB, wxT("&B"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	m_toggleCursorB->SetToolTip( wxT("Activate Cursor B") );
-	m_toggleCursorB->SetMinSize( wxSize( 40,-1 ) );
-	m_toggleCursorB->SetMaxSize( wxSize( 40,-1 ) );
-
-	bSizer131->Add( m_toggleCursorB, 0, wxALIGN_CENTER, 5 );
-
-	m_checkBox8 = new wxCheckBox( m_pnControls, wxID_ANY, wxT("Snap"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer131->Add( m_checkBox8, 1, wxALIGN_CENTER|wxLEFT, 5 );
-
-
-	sbSizer8->Add( bSizer131, 0, wxEXPAND, 5 );
-
-
-	bSizer2->Add( sbSizer8, 0, wxEXPAND, 5 );
-
-	wxStaticBoxSizer* sbSizer4;
-	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
-	wxGridSizer* gSizer1;
-	gSizer1 = new wxGridSizer( 3, 2, 0, 0 );
-
-	m_btConfig = new wxButton( m_pnControls, ID_CONFIG, wxT("&Config"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btConfig->SetToolTip( wxT("Bring up Configuration Dialog") );
-
-	gSizer1->Add( m_btConfig, 0, wxEXPAND, 5 );
-
-	m_btSave = new wxButton( m_pnControls, ID_SAVE, wxT("&Save"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btSave->SetToolTip( wxT("Save Waveforms") );
-
-	gSizer1->Add( m_btSave, 0, wxEXPAND, 5 );
-
-	m_btMeasure = new wxButton( m_pnControls, ID_MEASURE, wxT("&Measure"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btMeasure->SetToolTip( wxT("Bring up Measurement Dialog") );
-
-	gSizer1->Add( m_btMeasure, 0, wxEXPAND, 5 );
-
-	m_btDisplay = new wxButton( m_pnControls, ID_MEASURE, wxT("&Display"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btDisplay->SetToolTip( wxT("Bring up Measurement Dialog") );
-
-	gSizer1->Add( m_btDisplay, 0, wxEXPAND, 5 );
-
-	m_btPrint = new wxButton( m_pnControls, ID_PRINT, wxT("&Print"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btPrint->SetToolTip( wxT("Print Waveforms") );
-
-	gSizer1->Add( m_btPrint, 0, wxEXPAND, 5 );
-
-
-	sbSizer4->Add( gSizer1, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-	bSizer2->Add( sbSizer4, 0, wxEXPAND, 5 );
-
-	wxStaticBoxSizer* sbSizer9;
-	sbSizer9 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxEmptyString ), wxHORIZONTAL );
-
-	wxGridSizer* gSizer4;
-	gSizer4 = new wxGridSizer( 1, 2, 0, 0 );
-
-	m_btAbout = new wxButton( m_pnControls, ID_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btAbout->SetToolTip( wxT("Display About Box") );
-
-	gSizer4->Add( m_btAbout, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-	m_btExit = new wxButton( m_pnControls, ID_EXIT, wxT("E&xit"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_btExit->SetToolTip( wxT("Exit Program") );
-
-	gSizer4->Add( m_btExit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-
-	sbSizer9->Add( gSizer4, 1, 0, 5 );
-
-
-	bSizer2->Add( sbSizer9, 0, wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer3;
-	bSizer3 = new wxBoxSizer( wxHORIZONTAL );
-
-
-	bSizer2->Add( bSizer3, 1, wxEXPAND, 5 );
-
-
-	m_pnControls->SetSizer( bSizer2 );
-	m_pnControls->Layout();
-	bSizer2->Fit( m_pnControls );
-	bSizer1->Add( m_pnControls, 0, wxEXPAND, 0 );
-
-
-	this->SetSizer( bSizer1 );
-	this->Layout();
-
-	// Connect Events
-	this->Connect( m_menuSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnSave ) );
-	this->Connect( m_menuPrint->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnPrint ) );
-	this->Connect( m_menuExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnExit ) );
-	this->Connect( m_menuCursorA->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnCursor ) );
-	this->Connect( m_menuCursorB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnCursor ) );
-	this->Connect( m_menuItem13->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnSnap ) );
-	this->Connect( m_menuConfig->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnConfig ) );
-	this->Connect( m_menuMeasure->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnMeasure ) );
-	this->Connect( m_menuDisplay->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnDisplay ) );
-	this->Connect( m_menuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnAbout ) );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slTrgLevel->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_btRun->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
-	m_btSingle->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
-	m_rbNormal->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_rbAuto->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_bpPolarity->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_btTrgCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_rbSource->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_bpButton2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
-	m_bpButton3->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slHOffset->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_btCh1->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos1->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_btCh2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos2->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton7->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_btCh3->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos3->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_btCh4->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos4->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_toggleCursorA->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
-	m_toggleCursorB->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
-	m_checkBox8->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSnap ), NULL, this );
-	m_btConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnConfig ), NULL, this );
-	m_btSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSave ), NULL, this );
-	m_btMeasure->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnMeasure ), NULL, this );
-	m_btDisplay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnDisplay ), NULL, this );
-	m_btPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnPrint ), NULL, this );
-	m_btAbout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnAbout ), NULL, this );
-	m_btExit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnExit ), NULL, this );
-}
-
-DOFrame_fb::~DOFrame_fb()
-{
-	// Disconnect Events
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnSave ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnPrint ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnExit ) );
-	this->Disconnect( ID_CURSORA, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnCursor ) );
-	this->Disconnect( ID_CURSORB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnCursor ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnSnap ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnConfig ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnMeasure ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnDisplay ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnAbout ) );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slTrgLevel->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_btRun->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
-	m_btSingle->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
-	m_rbNormal->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_rbAuto->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_bpPolarity->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_btTrgCfg->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_slTrgDelay->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
-	m_rbSource->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
-	m_bpButton2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
-	m_bpButton3->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slHOffset->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_btCh1->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos1->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_btCh2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos2->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton7->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_btCh3->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos3->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_btCh4->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_slPos4->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
-	m_bpButton10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_bpButton11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
-	m_toggleCursorA->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
-	m_toggleCursorB->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
-	m_checkBox8->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSnap ), NULL, this );
-	m_btConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnConfig ), NULL, this );
-	m_btSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSave ), NULL, this );
-	m_btMeasure->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnMeasure ), NULL, this );
-	m_btDisplay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnDisplay ), NULL, this );
-	m_btPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnPrint ), NULL, this );
-	m_btAbout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnAbout ), NULL, this );
-	m_btExit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnExit ), NULL, this );
-
-}
-
-ConfigDialog_fb::ConfigDialog_fb( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer12;
-	bSizer12 = new wxBoxSizer( wxVERTICAL );
-
-	wxStaticBoxSizer* sbSizer5111;
-	sbSizer5111 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Board") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer37;
-	bSizer37 = new wxBoxSizer( wxHORIZONTAL );
-
-	wxArrayString m_cbBoardChoices;
-	m_cbBoard = new wxChoice( this, ID_BSEL, wxDefaultPosition, wxDefaultSize, m_cbBoardChoices, 0 );
-	m_cbBoard->SetSelection( 0 );
-	bSizer37->Add( m_cbBoard, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-	m_btScan = new wxButton( this, wxID_ANY, wxT("Rescan"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_btScan, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-	m_btInfo = new wxButton( this, wxID_ANY, wxT("Info"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_btInfo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
-	sbSizer5111->Add( bSizer37, 1, wxEXPAND, 5 );
-
-	m_cbMulti = new wxCheckBox( this, ID_MULTI, wxT("Configure multi-board daisy-chain"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbMulti->Enable( false );
-
-	sbSizer5111->Add( m_cbMulti, 0, wxRIGHT|wxLEFT, 5 );
-
-
-	bSizer12->Add( sbSizer5111, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer511;
-	sbSizer511 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Channels") ), wxVERTICAL );
-
-	wxString m_rbChHalfChoices[] = { wxT("even channels"), wxT("odd channels"), wxT("combined") };
-	int m_rbChHalfNChoices = sizeof( m_rbChHalfChoices ) / sizeof( wxString );
-	m_rbChHalf = new wxRadioBox( this, ID_CH_HALF, wxT("2048-bin option"), wxDefaultPosition, wxDefaultSize, m_rbChHalfNChoices, m_rbChHalfChoices, 1, wxRA_SPECIFY_ROWS );
-	m_rbChHalf->SetSelection( 0 );
-	sbSizer511->Add( m_rbChHalf, 0, wxBOTTOM, 5 );
-
-	m_cbClkOn = new wxCheckBox( this, wxID_ANY, wxT("Connect reference clock to all channels"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer511->Add( m_cbClkOn, 0, wxTOP, 5 );
-
-
-	bSizer12->Add( sbSizer511, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer17;
-	sbSizer17 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Input Range") ), wxVERTICAL );
-
-	wxString m_rbRangeChoices[] = { wxT("-0.5V to +0.5V"), wxT("-0.05V to +0.95V"), wxT("0V to +1V") };
-	int m_rbRangeNChoices = sizeof( m_rbRangeChoices ) / sizeof( wxString );
-	m_rbRange = new wxRadioBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbRangeNChoices, m_rbRangeChoices, 1, wxRA_SPECIFY_ROWS );
-	m_rbRange->SetSelection( 2 );
-	sbSizer17->Add( m_rbRange, 0, 0, 5 );
-
-
-	bSizer12->Add( sbSizer17, 0, wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer512;
-	sbSizer512 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Sampling Speed") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer1813;
-	bSizer1813 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_tbFreq = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	m_tbFreq->SetMaxLength( 0 );
-	bSizer1813->Add( m_tbFreq, 0, wxALIGN_CENTER|wxRIGHT|wxLEFT, 5 );
-
-	m_staticText26 = new wxStaticText( this, wxID_ANY, wxT("GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText26->Wrap( -1 );
-	bSizer1813->Add( m_staticText26, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxTOP, 5 );
-
-	m_cbLocked = new wxCheckBox( this, wxID_ANY, wxT("Lock"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1813->Add( m_cbLocked, 0, wxALIGN_CENTER|wxLEFT, 10 );
-
-	m_staticText261 = new wxStaticText( this, wxID_ANY, wxT("Actual speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText261->Wrap( -1 );
-	bSizer1813->Add( m_staticText261, 0, wxALIGN_CENTER|wxLEFT, 40 );
-
-	m_stActFreq = new wxStaticText( this, wxID_ANY, wxT("0.000 GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stActFreq->Wrap( -1 );
-	bSizer1813->Add( m_stActFreq, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
-
-
-	sbSizer512->Add( bSizer1813, 0, wxEXPAND, 5 );
-
-
-	bSizer12->Add( sbSizer512, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer5;
-	sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Voltage Calibration") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer18;
-	bSizer18 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_cbCalOn = new wxCheckBox( this, wxID_ANY, wxT("Voltage on"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer18->Add( m_cbCalOn, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-	m_teCal = new wxTextCtrl( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	m_teCal->SetMaxLength( 0 );
-	bSizer18->Add( m_teCal, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-	m_slCal = new wxSlider( this, wxID_ANY, 0, -500, 500, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSTATIC_BORDER );
-	bSizer18->Add( m_slCal, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-	m_staticText10 = new wxStaticText( this, wxID_ANY, wxT("mV"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText10->Wrap( -1 );
-	bSizer18->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-
-	sbSizer5->Add( bSizer18, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-	m_cbCalibrated = new wxCheckBox( this, ID_DISP_CALIBRATED, wxT("Apply Primary Calibration (Cell)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbCalibrated->SetValue(true);
-	sbSizer5->Add( m_cbCalibrated, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_cbCalibrated2 = new wxCheckBox( this, ID_DISP_CALIBRATED2, wxT("Apply Secondary Calibration (Readout)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbCalibrated2->SetValue(true);
-	sbSizer5->Add( m_cbCalibrated2, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_cbSpikes = new wxCheckBox( this, wxID_ANY, wxT("Remove Spikes"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer5->Add( m_cbSpikes, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_button13 = new wxButton( this, wxID_ANY, wxT("Execute Voltage Calibration"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer5->Add( m_button13, 0, wxALIGN_CENTER|wxALL, 5 );
-
-	m_gaugeCalVolt = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,15 ), wxGA_HORIZONTAL );
-	sbSizer5->Add( m_gaugeCalVolt, 1, wxEXPAND, 5 );
-
-
-	bSizer12->Add( sbSizer5, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer6;
-	sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Timing Calibration") ), wxVERTICAL );
-
-	m_cbRotated = new wxCheckBox( this, ID_DISP_ROTATED, wxT("Rotate waveforms relative to trigger"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbRotated->SetValue(true);
-	sbSizer6->Add( m_cbRotated, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_cbTCalOn = new wxCheckBox( this, ID_DISP_TCALIBRATED, wxT("Apply Timing Calibration"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbTCalOn->SetValue(true);
-	sbSizer6->Add( m_cbTCalOn, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_cbTrgCorr = new wxCheckBox( this, ID_DISP_TRGCORR, wxT("Correct horizontal trigger position"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbTrgCorr->SetValue(true);
-	sbSizer6->Add( m_cbTrgCorr, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_cbExtRefclk = new wxCheckBox( this, ID_REFCLK, wxT("Use external reference clock"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer6->Add( m_cbExtRefclk, 0, wxRIGHT|wxLEFT, 5 );
-
-	m_button14 = new wxButton( this, wxID_ANY, wxT("Execute Timing Calibration"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer6->Add( m_button14, 0, wxALIGN_CENTER|wxALL, 5 );
-
-	m_gaugeCalTime = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,15 ), wxGA_HORIZONTAL );
-	sbSizer6->Add( m_gaugeCalTime, 1, wxEXPAND, 5 );
-
-
-	bSizer12->Add( sbSizer6, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	m_button10 = new wxButton( this, wxID_ANY, wxT("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer12->Add( m_button10, 0, wxALL|wxALIGN_RIGHT, 5 );
-
-
-	this->SetSizer( bSizer12 );
-	this->Layout();
-	bSizer12->Fit( this );
-
-	// Connect Events
-	m_cbBoard->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
-	m_btScan->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRescan ), NULL, this );
-	m_btInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnInfo ), NULL, this );
-	m_cbMulti->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
-	m_rbChHalf->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnChannelHalf ), NULL, this );
-	m_cbClkOn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClkOn ), NULL, this );
-	m_rbRange->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnInputRange ), NULL, this );
-	m_tbFreq->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnFreq ), NULL, this );
-	m_cbLocked->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnLock ), NULL, this );
-	m_cbCalOn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnCalOn ), NULL, this );
-	m_teCal->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnCalEnter ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_cbCalibrated->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbCalibrated2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbSpikes->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRemoveSpikes ), NULL, this );
-	m_button13->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalVolt ), NULL, this );
-	m_cbRotated->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbTCalOn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbTrgCorr->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbExtRefclk->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_button14->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalTime ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClose ), NULL, this );
-}
-
-ConfigDialog_fb::~ConfigDialog_fb()
-{
-	// Disconnect Events
-	m_cbBoard->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
-	m_btScan->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRescan ), NULL, this );
-	m_btInfo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnInfo ), NULL, this );
-	m_cbMulti->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
-	m_rbChHalf->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnChannelHalf ), NULL, this );
-	m_cbClkOn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClkOn ), NULL, this );
-	m_rbRange->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnInputRange ), NULL, this );
-	m_tbFreq->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnFreq ), NULL, this );
-	m_cbLocked->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnLock ), NULL, this );
-	m_cbCalOn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnCalOn ), NULL, this );
-	m_teCal->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnCalEnter ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_slCal->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
-	m_cbCalibrated->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbCalibrated2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbSpikes->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRemoveSpikes ), NULL, this );
-	m_button13->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalVolt ), NULL, this );
-	m_cbRotated->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbTCalOn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbTrgCorr->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_cbExtRefclk->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
-	m_button14->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalTime ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClose ), NULL, this );
-
-}
-
-DisplayDialog_fb::DisplayDialog_fb( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer12;
-	bSizer12 = new wxBoxSizer( wxVERTICAL );
-
-	wxStaticBoxSizer* sbSizer7;
-	sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Options") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer34;
-	bSizer34 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_checkBox7 = new wxCheckBox( this, wxID_ANY, wxT("Display Date/Time"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer34->Add( m_checkBox7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-	m_checkBox71 = new wxCheckBox( this, wxID_ANY, wxT("Show Grid"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBox71->SetValue(true);
-	bSizer34->Add( m_checkBox71, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox88 = new wxCheckBox( this, wxID_ANY, wxT("Lines"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBox88->SetValue(true);
-	bSizer34->Add( m_checkBox88, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	sbSizer7->Add( bSizer34, 1, wxEXPAND, 5 );
-
-	m_checkBox73 = new wxCheckBox( this, wxID_ANY, wxT("Show hardware scalers"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer7->Add( m_checkBox73, 0, wxALL, 5 );
-
-
-	bSizer12->Add( sbSizer7, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer71;
-	sbSizer71 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Display Mode") ), wxVERTICAL );
-
-	m_rbShowSample = new wxRadioButton( this, ID_DISPSAMPLE, wxT("Sample"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_rbShowSample->SetValue( true );
-	sbSizer71->Add( m_rbShowSample, 0, wxALL, 5 );
-
-	wxBoxSizer* bSizer39;
-	bSizer39 = new wxBoxSizer( wxHORIZONTAL );
-
-	wxBoxSizer* bSizer40;
-	bSizer40 = new wxBoxSizer( wxVERTICAL );
-
-	m_rbShowAverage = new wxRadioButton( this, ID_DISPAVERAGE, wxT("Average"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_rbShowAverage->Enable( false );
-
-	bSizer40->Add( m_rbShowAverage, 0, wxALL, 5 );
-
-	m_rbShowPersist = new wxRadioButton( this, ID_DISPPERSIST, wxT("Persistance"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_rbShowPersist->Enable( false );
-
-	bSizer40->Add( m_rbShowPersist, 0, wxALL, 5 );
-
-
-	bSizer39->Add( bSizer40, 1, wxEXPAND, 5 );
-
-	m_staticText59 = new wxStaticText( this, wxID_ANY, wxT("Number of waveforms:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText59->Wrap( -1 );
-	bSizer39->Add( m_staticText59, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_cbNumber = new wxComboBox( this, ID_DISPNUMBER, wxT("16"), wxDefaultPosition, wxDefaultSize, 0, NULL, wxTE_PROCESS_ENTER );
-	m_cbNumber->Append( wxT("2") );
-	m_cbNumber->Append( wxT("4") );
-	m_cbNumber->Append( wxT("8") );
-	m_cbNumber->Append( wxT("16") );
-	m_cbNumber->Append( wxT("32") );
-	m_cbNumber->Append( wxT("64") );
-	m_cbNumber->Append( wxT("128") );
-	m_cbNumber->Append( wxT("256") );
-	m_cbNumber->Enable( false );
-
-	bSizer39->Add( m_cbNumber, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-	sbSizer71->Add( bSizer39, 1, wxEXPAND, 5 );
-
-
-	bSizer12->Add( sbSizer71, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	wxStaticBoxSizer* sbSizer711;
-	sbSizer711 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Math Display") ), wxVERTICAL );
-
-	wxBoxSizer* bSizer14;
-	bSizer14 = new wxBoxSizer( wxVERTICAL );
-
-	wxFlexGridSizer* gSizer2;
-	gSizer2 = new wxFlexGridSizer( 3, 5, 0, 0 );
-	gSizer2->SetFlexibleDirection( wxBOTH );
-	gSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-	m_staticText11 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText11->Wrap( -1 );
-	gSizer2->Add( m_staticText11, 0, wxALL, 5 );
-
-	m_staticText12 = new wxStaticText( this, wxID_ANY, wxT("CH1"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText12->Wrap( -1 );
-	m_staticText12->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText12->SetBackgroundColour( wxColour( 255, 255, 0 ) );
-
-	gSizer2->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText13 = new wxStaticText( this, wxID_ANY, wxT("CH2"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText13->Wrap( -1 );
-	m_staticText13->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText13->SetBackgroundColour( wxColour( 170, 170, 255 ) );
-
-	gSizer2->Add( m_staticText13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText14 = new wxStaticText( this, wxID_ANY, wxT("CH3"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText14->Wrap( -1 );
-	m_staticText14->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText14->SetBackgroundColour( wxColour( 255, 170, 170 ) );
-
-	gSizer2->Add( m_staticText14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText15 = new wxStaticText( this, wxID_ANY, wxT("CH4"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText15->Wrap( -1 );
-	m_staticText15->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText15->SetBackgroundColour( wxColour( 170, 255, 170 ) );
-
-	gSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText17 = new wxStaticText( this, wxID_ANY, wxT("Period Jitter"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText17->Wrap( -1 );
-	gSizer2->Add( m_staticText17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox13 = new wxCheckBox( this, ID_PJ1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox14 = new wxCheckBox( this, ID_PJ2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox15 = new wxCheckBox( this, ID_PJ3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox16 = new wxCheckBox( this, ID_PJ4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	bSizer14->Add( gSizer2, 0, 0, 5 );
-
-
-	sbSizer711->Add( bSizer14, 1, wxEXPAND, 5 );
-
-
-	bSizer12->Add( sbSizer711, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-	m_button10 = new wxButton( this, wxID_ANY, wxT("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer12->Add( m_button10, 0, wxALL|wxALIGN_RIGHT, 5 );
-
-
-	this->SetSizer( bSizer12 );
-	this->Layout();
-	bSizer12->Fit( this );
-
-	// Connect Events
-	m_checkBox7->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnDateTime ), NULL, this );
-	m_checkBox71->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnShowGrid ), NULL, this );
-	m_checkBox88->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnLines ), NULL, this );
-	m_checkBox73->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnScalers ), NULL, this );
-	m_rbShowSample->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_rbShowAverage->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_rbShowPersist->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_cbNumber->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_cbNumber->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_checkBox13->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_checkBox14->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_checkBox15->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_checkBox16->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnClose ), NULL, this );
-}
-
-DisplayDialog_fb::~DisplayDialog_fb()
-{
-	// Disconnect Events
-	m_checkBox7->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnDateTime ), NULL, this );
-	m_checkBox71->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnShowGrid ), NULL, this );
-	m_checkBox88->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnLines ), NULL, this );
-	m_checkBox73->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnScalers ), NULL, this );
-	m_rbShowSample->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_rbShowAverage->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_rbShowPersist->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_cbNumber->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_cbNumber->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
-	m_checkBox13->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_checkBox14->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_checkBox15->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_checkBox16->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnClose ), NULL, this );
-
-}
-
-MeasureDialog_fb::MeasureDialog_fb( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer14;
-	bSizer14 = new wxBoxSizer( wxVERTICAL );
-
-	wxFlexGridSizer* gSizer2;
-	gSizer2 = new wxFlexGridSizer( 17, 5, 0, 0 );
-	gSizer2->SetFlexibleDirection( wxBOTH );
-	gSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-	m_staticText11 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText11->Wrap( -1 );
-	gSizer2->Add( m_staticText11, 0, wxALL, 5 );
-
-	m_staticText12 = new wxStaticText( this, wxID_ANY, wxT("CH1"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText12->Wrap( -1 );
-	m_staticText12->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText12->SetBackgroundColour( wxColour( 255, 255, 0 ) );
-
-	gSizer2->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText13 = new wxStaticText( this, wxID_ANY, wxT("CH2"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText13->Wrap( -1 );
-	m_staticText13->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText13->SetBackgroundColour( wxColour( 170, 170, 255 ) );
-
-	gSizer2->Add( m_staticText13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText14 = new wxStaticText( this, wxID_ANY, wxT("CH3"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText14->Wrap( -1 );
-	m_staticText14->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText14->SetBackgroundColour( wxColour( 255, 170, 170 ) );
-
-	gSizer2->Add( m_staticText14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText15 = new wxStaticText( this, wxID_ANY, wxT("CH4"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText15->Wrap( -1 );
-	m_staticText15->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText15->SetBackgroundColour( wxColour( 170, 255, 170 ) );
-
-	gSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
-
-	m_staticText80 = new wxStaticText( this, wxID_ANY, wxT("Amplitude"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText80->Wrap( -1 );
-	m_staticText80->SetFont( wxFont( 16, 74, 90, 92, false, wxEmptyString ) );
-
-	gSizer2->Add( m_staticText80, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticText81 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText81->Wrap( -1 );
-	gSizer2->Add( m_staticText81, 0, wxALL, 5 );
-
-	m_staticText82 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText82->Wrap( -1 );
-	gSizer2->Add( m_staticText82, 0, wxALL, 5 );
-
-	m_staticText83 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	gSizer2->Add( m_staticText83, 0, wxALL, 5 );
-
-	m_staticText84 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	gSizer2->Add( m_staticText84, 0, wxALL, 5 );
-
-	m_staticText16 = new wxStaticText( this, wxID_ANY, wxT("Level"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText16->Wrap( -1 );
-	gSizer2->Add( m_staticText16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox9 = new wxCheckBox( this, ID_LEVEL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox9, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox10 = new wxCheckBox( this, ID_LEVEL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox11 = new wxCheckBox( this, ID_LEVEL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox12 = new wxCheckBox( this, ID_LEVEL4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText17 = new wxStaticText( this, wxID_ANY, wxT("Peak-Peak Amplitude"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText17->Wrap( -1 );
-	gSizer2->Add( m_staticText17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox13 = new wxCheckBox( this, ID_PKPK1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox14 = new wxCheckBox( this, ID_PKPK2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox15 = new wxCheckBox( this, ID_PKPK3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox16 = new wxCheckBox( this, ID_PKPK4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText19 = new wxStaticText( this, wxID_ANY, wxT("RMS"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText19->Wrap( -1 );
-	gSizer2->Add( m_staticText19, 0, wxALL, 5 );
-
-	m_checkBox17 = new wxCheckBox( this, ID_RMS1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox17, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-	m_checkBox18 = new wxCheckBox( this, ID_RMS2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox18, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-	m_checkBox19 = new wxCheckBox( this, ID_RMS3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox19, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-	m_checkBox20 = new wxCheckBox( this, ID_RMS4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox20, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-	m_staticText90 = new wxStaticText( this, wxID_ANY, wxT("Vertical slice"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText90->Wrap( -1 );
-	gSizer2->Add( m_staticText90, 0, wxALL, 5 );
-
-	m_checkBox74 = new wxCheckBox( this, ID_VS1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox74, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox75 = new wxCheckBox( this, ID_VS2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox75, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox76 = new wxCheckBox( this, ID_VS3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox76, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox77 = new wxCheckBox( this, ID_VS4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox77, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText91 = new wxStaticText( this, wxID_ANY, wxT("Gated charge"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText91->Wrap( -1 );
-	gSizer2->Add( m_staticText91, 0, wxALL, 5 );
-
-	m_checkBox82 = new wxCheckBox( this, ID_CHRG1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox82, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox83 = new wxCheckBox( this, ID_CHRG2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox83, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox84 = new wxCheckBox( this, ID_CHRG3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox84, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox85 = new wxCheckBox( this, ID_CHRG4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox85, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	gSizer2->Add( m_staticline4, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-	m_staticline41 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	gSizer2->Add( m_staticline41, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-	m_staticline42 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	gSizer2->Add( m_staticline42, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-	m_staticline43 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	gSizer2->Add( m_staticline43, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-	m_staticline44 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	gSizer2->Add( m_staticline44, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-	m_staticText85 = new wxStaticText( this, wxID_ANY, wxT("Time"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText85->Wrap( -1 );
-	m_staticText85->SetFont( wxFont( 16, 74, 90, 92, false, wxEmptyString ) );
-
-	gSizer2->Add( m_staticText85, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticText86 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText86->Wrap( -1 );
-	gSizer2->Add( m_staticText86, 0, wxALL, 5 );
-
-	m_staticText87 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText87->Wrap( -1 );
-	gSizer2->Add( m_staticText87, 0, wxALL, 5 );
-
-	m_staticText88 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText88->Wrap( -1 );
-	gSizer2->Add( m_staticText88, 0, wxALL, 5 );
-
-	m_staticText89 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText89->Wrap( -1 );
-	gSizer2->Add( m_staticText89, 0, wxALL, 5 );
-
-	m_staticText20 = new wxStaticText( this, wxID_ANY, wxT("Frequency"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText20->Wrap( -1 );
-	gSizer2->Add( m_staticText20, 0, wxALL, 5 );
-
-	m_checkBox21 = new wxCheckBox( this, ID_FREQ1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox21, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox22 = new wxCheckBox( this, ID_FREQ2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox22, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox23 = new wxCheckBox( this, ID_FREQ3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox23, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox24 = new wxCheckBox( this, ID_FREQ4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox24, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText21 = new wxStaticText( this, wxID_ANY, wxT("Period"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	gSizer2->Add( m_staticText21, 0, wxALL, 5 );
-
-	m_checkBox25 = new wxCheckBox( this, ID_PERIOD1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox25, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox26 = new wxCheckBox( this, ID_PERIOD2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox26, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox27 = new wxCheckBox( this, ID_PERIOD3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox27, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox28 = new wxCheckBox( this, ID_PERIOD4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox28, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText22 = new wxStaticText( this, wxID_ANY, wxT("Rise time"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText22->Wrap( -1 );
-	gSizer2->Add( m_staticText22, 0, wxALL, 5 );
-
-	m_checkBox29 = new wxCheckBox( this, ID_RISE1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox29, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox30 = new wxCheckBox( this, ID_RISE2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox30, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox31 = new wxCheckBox( this, ID_RISE3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox31, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox32 = new wxCheckBox( this, ID_RISE4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox32, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText23 = new wxStaticText( this, wxID_ANY, wxT("Fall time"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText23->Wrap( -1 );
-	gSizer2->Add( m_staticText23, 0, wxALL, 5 );
-
-	m_checkBox33 = new wxCheckBox( this, ID_FALL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox33, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox34 = new wxCheckBox( this, ID_FALL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox34, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox35 = new wxCheckBox( this, ID_FALL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox35, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox36 = new wxCheckBox( this, ID_FALL4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox36, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText221 = new wxStaticText( this, wxID_ANY, wxT("Positive width"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText221->Wrap( -1 );
-	gSizer2->Add( m_staticText221, 0, wxALL, 5 );
-
-	m_checkBox291 = new wxCheckBox( this, ID_POSWIDTH1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox291, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_checkBox2911 = new wxCheckBox( this, ID_POSWIDTH2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2911, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_checkBox2912 = new wxCheckBox( this, ID_POSWIDTH3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2912, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_checkBox2913 = new wxCheckBox( this, ID_POSWIDTH4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2913, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticText2211 = new wxStaticText( this, wxID_ANY, wxT("Negative width"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText2211->Wrap( -1 );
-	gSizer2->Add( m_staticText2211, 0, wxALL, 5 );
-
-	m_checkBox2914 = new wxCheckBox( this, ID_NEGWIDTH1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2914, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_checkBox2915 = new wxCheckBox( this, ID_NEGWIDTH2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2915, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_checkBox2916 = new wxCheckBox( this, ID_NEGWIDTH3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2916, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_checkBox2917 = new wxCheckBox( this, ID_NEGWIDTH4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox2917, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticText231 = new wxStaticText( this, wxID_ANY, wxT("CH(x+1)-CH(x) delay"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText231->Wrap( -1 );
-	gSizer2->Add( m_staticText231, 0, wxALL, 5 );
-
-	m_checkBox37 = new wxCheckBox( this, ID_CHNDELAY1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox37, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox38 = new wxCheckBox( this, ID_CHNDELAY2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox38, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox39 = new wxCheckBox( this, ID_CHNDELAY3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox39, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox40 = new wxCheckBox( this, ID_CHNDELAY4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox40, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText901 = new wxStaticText( this, wxID_ANY, wxT("Horizontal slice"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText901->Wrap( -1 );
-	gSizer2->Add( m_staticText901, 0, wxALL, 5 );
-
-	m_checkBox78 = new wxCheckBox( this, ID_HS1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox78, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox79 = new wxCheckBox( this, ID_HS2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox79, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox80 = new wxCheckBox( this, ID_HS3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox80, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_checkBox81 = new wxCheckBox( this, ID_HS4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	gSizer2->Add( m_checkBox81, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	bSizer14->Add( gSizer2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer14->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer35;
-	bSizer35 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_cbStat = new wxCheckBox( this, wxID_ANY, wxT("Display Statistics"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbStat->SetValue(true);
-	bSizer35->Add( m_cbStat, 1, wxALL|wxEXPAND, 5 );
-
-	m_cbHist = new wxCheckBox( this, wxID_ANY, wxT("Display Histograms"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer35->Add( m_cbHist, 1, wxALL|wxEXPAND, 5 );
-
-
-	bSizer14->Add( bSizer35, 1, wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_staticText27 = new wxStaticText( this, wxID_ANY, wxT("Accumulate"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText27->Wrap( -1 );
-	bSizer25->Add( m_staticText27, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-	m_cbNAverage = new wxComboBox( this, wxID_ANY, wxT("1000"), wxDefaultPosition, wxSize( 100,-1 ), 0, NULL, wxTE_PROCESS_ENTER );
-	m_cbNAverage->Append( wxT("10") );
-	m_cbNAverage->Append( wxT("50") );
-	m_cbNAverage->Append( wxT("100") );
-	m_cbNAverage->Append( wxT("500") );
-	m_cbNAverage->Append( wxT("1000") );
-	m_cbNAverage->Append( wxT("5000") );
-	m_cbNAverage->Append( wxT("10000") );
-	m_cbNAverage->Append( wxT("50000") );
-	m_cbNAverage->Append( wxT("1000000") );
-	bSizer25->Add( m_cbNAverage, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText271 = new wxStaticText( this, wxID_ANY, wxT("measurements"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText271->Wrap( -1 );
-	bSizer25->Add( m_staticText271, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-	bSizer14->Add( bSizer25, 0, wxEXPAND, 5 );
-
-	m_button15 = new wxButton( this, wxID_ANY, wxT("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer14->Add( m_button15, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer14->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
-
-	m_cbIndicator = new wxCheckBox( this, wxID_ANY, wxT("Display Indicators"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cbIndicator->SetValue(true);
-	bSizer14->Add( m_cbIndicator, 0, wxALL, 5 );
-
-	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer14->Add( m_staticline21, 0, wxEXPAND | wxALL, 5 );
-
-	m_button11 = new wxButton( this, wxID_ANY, wxT("Cl&ose"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer14->Add( m_button11, 0, wxALIGN_RIGHT|wxALL, 10 );
-
-
-	this->SetSizer( bSizer14 );
-	this->Layout();
-	bSizer14->Fit( this );
-
-	// Connect Events
-	m_checkBox9->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox10->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox11->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox12->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox13->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox14->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox15->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox16->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox17->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox18->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox19->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox20->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox74->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox75->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox76->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox77->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox82->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox83->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox84->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox85->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox21->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox22->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox23->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox24->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox25->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox26->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox27->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox28->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox29->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox30->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox31->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox32->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox33->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox34->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox35->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox36->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox291->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2911->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2912->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2913->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2914->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2915->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2916->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2917->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox37->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox38->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox39->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox40->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox78->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox79->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox80->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox81->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_cbStat->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStat ), NULL, this );
-	m_cbHist->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnHist ), NULL, this );
-	m_cbNAverage->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
-	m_cbNAverage->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
-	m_button15->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStatReset ), NULL, this );
-	m_cbIndicator->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnIndicator ), NULL, this );
-	m_button11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnClose ), NULL, this );
-}
-
-MeasureDialog_fb::~MeasureDialog_fb()
-{
-	// Disconnect Events
-	m_checkBox9->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox10->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox11->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox12->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox13->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox14->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox15->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox16->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox17->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox18->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox19->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox20->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox74->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox75->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox76->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox77->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox82->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox83->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox84->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox85->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox21->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox22->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox23->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox24->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox25->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox26->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox27->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox28->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox29->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox30->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox31->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox32->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox33->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox34->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox35->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox36->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox291->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2911->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2912->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2913->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2914->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2915->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2916->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox2917->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox37->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox38->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox39->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox40->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox78->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox79->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox80->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_checkBox81->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
-	m_cbStat->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStat ), NULL, this );
-	m_cbHist->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnHist ), NULL, this );
-	m_cbNAverage->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
-	m_cbNAverage->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
-	m_button15->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStatReset ), NULL, this );
-	m_cbIndicator->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnIndicator ), NULL, this );
-	m_button11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnClose ), NULL, this );
-
-}
-
-TriggerDialog_fb::TriggerDialog_fb( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer14;
-	bSizer14 = new wxBoxSizer( wxVERTICAL );
-
-	wxBoxSizer* bSizer35;
-	bSizer35 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_staticText12 = new wxStaticText( this, wxID_ANY, wxT("CH1"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText12->Wrap( -1 );
-	m_staticText12->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText12->SetBackgroundColour( wxColour( 255, 255, 0 ) );
-
-	bSizer35->Add( m_staticText12, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
-
-	m_staticText13 = new wxStaticText( this, wxID_ANY, wxT("CH2"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText13->Wrap( -1 );
-	m_staticText13->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText13->SetBackgroundColour( wxColour( 170, 170, 255 ) );
-
-	bSizer35->Add( m_staticText13, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
-
-	m_staticText14 = new wxStaticText( this, wxID_ANY, wxT("CH3"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText14->Wrap( -1 );
-	m_staticText14->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText14->SetBackgroundColour( wxColour( 255, 170, 170 ) );
-
-	bSizer35->Add( m_staticText14, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
-
-	m_staticText15 = new wxStaticText( this, wxID_ANY, wxT("CH4"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText15->Wrap( -1 );
-	m_staticText15->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText15->SetBackgroundColour( wxColour( 170, 255, 170 ) );
-
-	bSizer35->Add( m_staticText15, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
-
-	m_staticText16 = new wxStaticText( this, wxID_ANY, wxT("EXT"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText16->Wrap( -1 );
-	m_staticText16->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-	m_staticText16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-	bSizer35->Add( m_staticText16, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
-
-
-	bSizer14->Add( bSizer35, 1, wxBOTTOM|wxEXPAND, 5 );
-
-	m_staticline11 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer14->Add( m_staticline11, 0, wxEXPAND, 5 );
-
-	m_staticText771 = new wxStaticText( this, wxID_ANY, wxT("Trigger logic"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText771->Wrap( -1 );
-	bSizer14->Add( m_staticText771, 0, wxALIGN_CENTER|wxALL, 5 );
-
-	wxBoxSizer* bSizer36;
-	bSizer36 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_cbOR1 = new wxCheckBox( this, ID_OR1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer36->Add( m_cbOR1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText17 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText17->Wrap( -1 );
-	bSizer36->Add( m_staticText17, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbOR2 = new wxCheckBox( this, ID_OR2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer36->Add( m_cbOR2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText171 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText171->Wrap( -1 );
-	bSizer36->Add( m_staticText171, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbOR3 = new wxCheckBox( this, ID_OR3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer36->Add( m_cbOR3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText172 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText172->Wrap( -1 );
-	bSizer36->Add( m_staticText172, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbOR4 = new wxCheckBox( this, ID_OR4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer36->Add( m_cbOR4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText173 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText173->Wrap( -1 );
-	bSizer36->Add( m_staticText173, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbOREXT = new wxCheckBox( this, ID_OREXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer36->Add( m_cbOREXT, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	bSizer14->Add( bSizer36, 1, wxEXPAND|wxRIGHT|wxLEFT, 16 );
-
-	m_staticText84 = new wxStaticText( this, wxID_ANY, wxT("- OR -"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText84->Wrap( -1 );
-	bSizer14->Add( m_staticText84, 0, wxALL|wxEXPAND, 5 );
-
-	wxBoxSizer* bSizer37;
-	bSizer37 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_cbAND1 = new wxCheckBox( this, ID_AND1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_cbAND1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText18 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText18->Wrap( -1 );
-	bSizer37->Add( m_staticText18, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbAND2 = new wxCheckBox( this, ID_AND2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_cbAND2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText181 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText181->Wrap( -1 );
-	bSizer37->Add( m_staticText181, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbAND3 = new wxCheckBox( this, ID_AND3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_cbAND3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText182 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText182->Wrap( -1 );
-	bSizer37->Add( m_staticText182, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbAND4 = new wxCheckBox( this, ID_AND4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_cbAND4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-	m_staticText183 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText183->Wrap( -1 );
-	bSizer37->Add( m_staticText183, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-	m_cbANDEXT = new wxCheckBox( this, ID_ANDEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer37->Add( m_cbANDEXT, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	bSizer14->Add( bSizer37, 1, wxEXPAND|wxRIGHT|wxLEFT, 16 );
-
-	m_cbTrans = new wxCheckBox( this, ID_TRANS, wxT("Enable Transparent Trigger"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer14->Add( m_cbTrans, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer14->Add( m_staticline10, 0, wxEXPAND, 5 );
-
-	m_staticText77 = new wxStaticText( this, wxID_ANY, wxT("Trigger level"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	bSizer14->Add( m_staticText77, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-	wxBoxSizer* bSizer33;
-	bSizer33 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_tbLevel1 = new wxTextCtrl( this, ID_LEVEL1, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	bSizer33->Add( m_tbLevel1, 1, wxALL, 5 );
-
-	m_tbLevel2 = new wxTextCtrl( this, ID_LEVEL2, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	bSizer33->Add( m_tbLevel2, 1, wxALL, 5 );
-
-	m_tbLevel3 = new wxTextCtrl( this, ID_LEVEL3, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	bSizer33->Add( m_tbLevel3, 1, wxALL, 5 );
-
-	m_tbLevel4 = new wxTextCtrl( this, ID_LEVEL4, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	bSizer33->Add( m_tbLevel4, 1, wxALL, 5 );
-
-	m_staticText78 = new wxStaticText( this, wxID_ANY, wxT("Volt"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	bSizer33->Add( m_staticText78, 1, wxALIGN_CENTER|wxALL, 5 );
-
-
-	bSizer14->Add( bSizer33, 1, wxEXPAND, 5 );
-
-	m_staticline25 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer14->Add( m_staticline25, 0, wxEXPAND, 5 );
-
-	m_button11 = new wxButton( this, wxID_ANY, wxT("Cl&ose"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer14->Add( m_button11, 0, wxALIGN_RIGHT|wxALL, 10 );
-
-
-	this->SetSizer( bSizer14 );
-	this->Layout();
-	bSizer14->Fit( this );
-
-	// Connect Events
-	m_cbOR1->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOR2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOR3->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOR4->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOREXT->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND1->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND3->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND4->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbANDEXT->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbTrans->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_tbLevel1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel1->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel2->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel3->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel4->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_button11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnClose ), NULL, this );
-}
-
-TriggerDialog_fb::~TriggerDialog_fb()
-{
-	// Disconnect Events
-	m_cbOR1->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOR2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOR3->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOR4->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbOREXT->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND1->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND3->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbAND4->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbANDEXT->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_cbTrans->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
-	m_tbLevel1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel1->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel2->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel3->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_tbLevel4->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
-	m_button11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnClose ), NULL, this );
-
-}
-
-AboutDialog_fb::AboutDialog_fb( 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->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 74, 90, 90, false, wxEmptyString ) );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer15;
-	bSizer15 = new wxBoxSizer( wxVERTICAL );
-
-	wxBoxSizer* bSizer17;
-	bSizer17 = new wxBoxSizer( wxVERTICAL );
-
-	m_staticText18 = new wxStaticText( this, wxID_ANY, wxT("DRS Oscilloscope"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticText18->Wrap( -1 );
-	m_staticText18->SetFont( wxFont( 20, 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_staticText18, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
-
-	m_stVersion = new wxStaticText( this, wxID_ANY, wxT("Version 0.0.0"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stVersion->Wrap( -1 );
-	m_stVersion->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_stVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-
-	m_stBuild = new wxStaticText( this, wxID_ANY, wxT("Build 0"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stBuild->Wrap( -1 );
-	m_stBuild->SetFont( wxFont( 16, 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_stBuild, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-	m_staticText20 = new wxStaticText( this, wxID_ANY, wxT("Stefan Ritt"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText20->Wrap( -1 );
-	m_staticText20->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_staticText20, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-	m_staticText21 = new wxStaticText( this, wxID_ANY, wxT("Paul Scherrer Institute"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	m_staticText21->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-	wxBoxSizer* bSizer38;
-	bSizer38 = new wxBoxSizer( wxHORIZONTAL );
-
-
-	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-
-	m_bitmap1 = new wxStaticBitmap( this, wxID_ANY, wxBitmap( drsosc_xpm ), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer38->Add( m_bitmap1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
-
-
-	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-	bSizer17->Add( bSizer38, 1, wxEXPAND, 5 );
-
-	m_staticText23 = new wxStaticText( this, wxID_ANY, wxT("For updates please visit"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText23->Wrap( -1 );
-	m_staticText23->SetFont( wxFont( 18, 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_staticText23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-
-	m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, wxT("http://www.psi.ch/drs"), wxT("http://www.psi.ch/drs"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink1->SetFont( wxFont( 18, 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_hyperlink1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-	m_button12 = new wxButton( this, wxID_OK, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_button12->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 74, 90, 90, false, wxEmptyString ) );
-
-	bSizer17->Add( m_button12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 15 );
-
-
-	bSizer15->Add( bSizer17, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-	this->SetSizer( bSizer15 );
-	this->Layout();
-	bSizer15->Fit( this );
-}
-
-AboutDialog_fb::~AboutDialog_fb()
-{
-}
-
-InfoDialog_fb::InfoDialog_fb( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-	wxBoxSizer* bSizer15;
-	bSizer15 = new wxBoxSizer( wxVERTICAL );
-
-	wxGridSizer* gSizer2;
-	gSizer2 = new wxGridSizer( 9, 2, 0, 0 );
-
-	m_staticText45 = new wxStaticText( this, wxID_ANY, wxT("Board type:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText45->Wrap( -1 );
-	gSizer2->Add( m_staticText45, 0, wxALL, 5 );
-
-	m_stBoardType = new wxStaticText( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stBoardType->Wrap( -1 );
-	gSizer2->Add( m_stBoardType, 0, wxALL, 5 );
-
-	m_staticText47 = new wxStaticText( this, wxID_ANY, wxT("DRS type:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText47->Wrap( -1 );
-	gSizer2->Add( m_staticText47, 0, wxALL, 5 );
-
-	m_stDRSType = new wxStaticText( this, wxID_ANY, wxT("DRS4"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stDRSType->Wrap( -1 );
-	gSizer2->Add( m_stDRSType, 0, wxALL, 5 );
-
-	m_staticText49 = new wxStaticText( this, wxID_ANY, wxT("Serial number:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText49->Wrap( -1 );
-	gSizer2->Add( m_staticText49, 0, wxALL, 5 );
-
-	m_stSerialNumber = new wxStaticText( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stSerialNumber->Wrap( -1 );
-	gSizer2->Add( m_stSerialNumber, 0, wxALL, 5 );
-
-	m_staticText51 = new wxStaticText( this, wxID_ANY, wxT("Firmware revision:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText51->Wrap( -1 );
-	gSizer2->Add( m_staticText51, 0, wxALL, 5 );
-
-	m_stFirmwareRevision = new wxStaticText( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stFirmwareRevision->Wrap( -1 );
-	gSizer2->Add( m_stFirmwareRevision, 0, wxALL, 5 );
-
-	m_staticText53 = new wxStaticText( this, wxID_ANY, wxT("Temperature:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText53->Wrap( -1 );
-	gSizer2->Add( m_staticText53, 0, wxALL, 5 );
-
-	m_stTemperature = new wxStaticText( this, wxID_ANY, wxT("0 C"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stTemperature->Wrap( -1 );
-	gSizer2->Add( m_stTemperature, 0, wxALL, 5 );
-
-	m_staticText55 = new wxStaticText( this, wxID_ANY, wxT("Input range:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText55->Wrap( -1 );
-	gSizer2->Add( m_staticText55, 0, wxALL, 5 );
-
-	m_stInputRange = new wxStaticText( this, wxID_ANY, wxT("-0.5V...0.5V"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stInputRange->Wrap( -1 );
-	gSizer2->Add( m_stInputRange, 0, wxALL, 5 );
-
-	m_staticText57 = new wxStaticText( this, wxID_ANY, wxT("Calibrated range:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText57->Wrap( -1 );
-	gSizer2->Add( m_staticText57, 0, wxALL, 5 );
-
-	m_stCalibratedRange = new wxStaticText( this, wxID_ANY, wxT("-0.5V...0.5V"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stCalibratedRange->Wrap( -1 );
-	gSizer2->Add( m_stCalibratedRange, 0, wxALL, 5 );
-
-	m_staticText59 = new wxStaticText( this, wxID_ANY, wxT("Calibrated frequency:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText59->Wrap( -1 );
-	gSizer2->Add( m_staticText59, 0, wxALL, 5 );
-
-	m_stCalibratedFrequency = new wxStaticText( this, wxID_ANY, wxT("5.000 GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stCalibratedFrequency->Wrap( -1 );
-	gSizer2->Add( m_stCalibratedFrequency, 0, wxALL, 5 );
-
-	m_staticText61 = new wxStaticText( this, wxID_ANY, wxT("Current frequency:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText61->Wrap( -1 );
-	gSizer2->Add( m_staticText61, 0, wxALL, 5 );
-
-	m_stFrequency = new wxStaticText( this, wxID_ANY, wxT("5.000 GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_stFrequency->Wrap( -1 );
-	gSizer2->Add( m_stFrequency, 0, wxALL, 5 );
-
-
-	bSizer15->Add( gSizer2, 1, wxEXPAND, 5 );
-
-	m_button12 = new wxButton( this, wxID_OK, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer15->Add( m_button12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 15 );
-
-
-	this->SetSizer( bSizer15 );
-	this->Layout();
-	bSizer15->Fit( this );
-}
-
-InfoDialog_fb::~InfoDialog_fb()
-{
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO *NOT* EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "DRSOsc.h"
+
+#include "down.xpm"
+#include "drsosc.xpm"
+#include "left.xpm"
+#include "pos.xpm"
+#include "right.xpm"
+#include "up.xpm"
+
+///////////////////////////////////////////////////////////////////////////
+
+DOFrame_fb::DOFrame_fb( 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 );
+
+	m_menubar1 = new wxMenuBar( 0 );
+	m_menu1 = new wxMenu();
+	wxMenuItem* m_menuSave;
+	m_menuSave = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("&Save...") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuSave );
+
+	wxMenuItem* m_menuPrint;
+	m_menuPrint = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("&Print") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuPrint );
+
+	m_menu1->AppendSeparator();
+
+	wxMenuItem* m_menuExit;
+	m_menuExit = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("E&xit") ) + wxT('\t') + wxT("Ctrl+X"), wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuExit );
+
+	m_menubar1->Append( m_menu1, wxT("&File") );
+
+	m_menu4 = new wxMenu();
+	wxMenuItem* m_menuCursorA;
+	m_menuCursorA = new wxMenuItem( m_menu4, ID_CURSORA, wxString( wxT("Cursor A") ) + wxT('\t') + wxT("Ctrl+A"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuCursorA );
+
+	wxMenuItem* m_menuCursorB;
+	m_menuCursorB = new wxMenuItem( m_menu4, ID_CURSORB, wxString( wxT("Cursor B") ) + wxT('\t') + wxT("Ctrl+B"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuCursorB );
+
+	wxMenuItem* m_menuItem13;
+	m_menuItem13 = new wxMenuItem( m_menu4, wxID_ANY, wxString( wxT("Snap Cursor") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItem13 );
+
+	m_menubar1->Append( m_menu4, wxT("C&ursor") );
+
+	m_menu3 = new wxMenu();
+	wxMenuItem* m_menuConfig;
+	m_menuConfig = new wxMenuItem( m_menu3, wxID_ANY, wxString( wxT("Config...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu3->Append( m_menuConfig );
+
+	wxMenuItem* m_menuMeasure;
+	m_menuMeasure = new wxMenuItem( m_menu3, wxID_ANY, wxString( wxT("Measure...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu3->Append( m_menuMeasure );
+
+	wxMenuItem* m_menuDisplay;
+	m_menuDisplay = new wxMenuItem( m_menu3, wxID_ANY, wxString( wxT("Display...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu3->Append( m_menuDisplay );
+
+	m_menubar1->Append( m_menu3, wxT("&Tools") );
+
+	m_menu2 = new wxMenu();
+	wxMenuItem* m_menuAbout;
+	m_menuAbout = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("About...") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menu2->Append( m_menuAbout );
+
+	m_menubar1->Append( m_menu2, wxT("&Help") );
+
+	this->SetMenuBar( m_menubar1 );
+
+	wxBoxSizer* bSizer1;
+	bSizer1 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_pnScreen = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN );
+	bSizer1->Add( m_pnScreen, 1, wxEXPAND, 5 );
+
+	m_pnControls = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_SUNKEN );
+	m_pnControls->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer2;
+	bSizer2 = new wxBoxSizer( wxVERTICAL );
+
+	bSizer2->SetMinSize( wxSize( 256,-1 ) );
+	wxStaticBoxSizer* sbSizer1;
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Trigger") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer4;
+	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_slTrgLevel = new wxSlider( sbSizer1->GetStaticBox(), ID_TR_LEVEL, -250, -500, 500, wxDefaultPosition, wxSize( 24,120 ), wxSL_VERTICAL|wxBORDER_STATIC );
+	m_slTrgLevel->SetToolTip( wxT("Set Trigger Level") );
+	m_slTrgLevel->SetMinSize( wxSize( 30,150 ) );
+
+	bSizer4->Add( m_slTrgLevel, 0, 0, 5 );
+
+	wxBoxSizer* bSizer5;
+	bSizer5 = new wxBoxSizer( wxVERTICAL );
+
+	wxBoxSizer* bSizer32;
+	bSizer32 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_btRun = new wxButton( sbSizer1->GetStaticBox(), ID_RUN, wxT("Stop"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_btRun->SetToolTip( wxT("Start/Stop Acquisition") );
+
+	bSizer32->Add( m_btRun, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_btSingle = new wxButton( sbSizer1->GetStaticBox(), ID_SINGLE, wxT("Single"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_btSingle->SetToolTip( wxT("Arm for Single Trigger") );
+
+	bSizer32->Add( m_btSingle, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	bSizer5->Add( bSizer32, 0, wxEXPAND, 5 );
+
+	wxStaticBoxSizer* sbSizer18;
+	sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( sbSizer1->GetStaticBox(), wxID_ANY, wxT("Type") ), wxHORIZONTAL );
+
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+	m_rbNormal = new wxRadioButton( sbSizer18->GetStaticBox(), ID_TR_NORMAL, wxT("Normal"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_rbNormal->SetValue( true );
+	m_rbNormal->SetToolTip( wxT("Set Normal Trigger Mode") );
+
+	bSizer7->Add( m_rbNormal, 0, 0, 5 );
+
+	m_rbAuto = new wxRadioButton( sbSizer18->GetStaticBox(), ID_TR_AUTO, wxT("Auto"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_rbAuto->SetToolTip( wxT("Set Auto Trigger Mode") );
+
+	bSizer7->Add( m_rbAuto, 0, 0, 5 );
+
+
+	sbSizer18->Add( bSizer7, 0, 0, 5 );
+
+	m_bpPolarity = new wxBitmapButton( sbSizer18->GetStaticBox(), ID_TR_POLARITY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+
+	m_bpPolarity->SetBitmap( wxBitmap( pos_xpm ) );
+	m_bpPolarity->SetToolTip( wxT("Set Trigger Polarity") );
+
+	sbSizer18->Add( m_bpPolarity, 0, wxALIGN_CENTER|wxRIGHT|wxLEFT, 2 );
+
+	m_btTrgCfg = new wxButton( sbSizer18->GetStaticBox(), ID_TRGCFG, wxT("CFG"), wxDefaultPosition, wxSize( 45,-1 ), 0 );
+	m_btTrgCfg->SetToolTip( wxT("Show advanced trigger configuration") );
+
+	sbSizer18->Add( m_btTrgCfg, 1, wxALIGN_CENTER, 5 );
+
+
+	bSizer5->Add( sbSizer18, 0, 0, 5 );
+
+	wxBoxSizer* bSizer31;
+	bSizer31 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_staticText59 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, wxT("Max"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText59->Wrap( -1 );
+	bSizer31->Add( m_staticText59, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
+
+	m_staticText60 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, wxT("Delay"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText60->Wrap( -1 );
+	bSizer31->Add( m_staticText60, 1, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
+
+	m_staticText61 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, wxT("Min"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText61->Wrap( -1 );
+	bSizer31->Add( m_staticText61, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+	bSizer5->Add( bSizer31, 0, wxEXPAND, 5 );
+
+	m_slTrgDelay = new wxSlider( sbSizer1->GetStaticBox(), ID_TR_DELAY, 100, 0, 100, wxDefaultPosition, wxSize( -1,30 ), wxSL_HORIZONTAL|wxBORDER_STATIC );
+	m_slTrgDelay->SetToolTip( wxT("Set Trigger Delay") );
+	m_slTrgDelay->SetMinSize( wxSize( -1,30 ) );
+
+	bSizer5->Add( m_slTrgDelay, 0, wxEXPAND, 5 );
+
+
+	bSizer4->Add( bSizer5, 1, wxEXPAND, 5 );
+
+
+	sbSizer1->Add( bSizer4, 1, wxEXPAND, 2 );
+
+	wxString m_rbSourceChoices[] = { wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("E"), wxT("X") };
+	int m_rbSourceNChoices = sizeof( m_rbSourceChoices ) / sizeof( wxString );
+	m_rbSource = new wxRadioBox( sbSizer1->GetStaticBox(), ID_TR_SOURCE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbSourceNChoices, m_rbSourceChoices, 1, wxRA_SPECIFY_ROWS );
+	m_rbSource->SetSelection( 0 );
+	m_rbSource->SetToolTip( wxT("Select channel to trigger on (E for external)") );
+
+	sbSizer1->Add( m_rbSource, 0, wxALIGN_CENTER, 0 );
+
+
+	bSizer2->Add( sbSizer1, 0, 0, 5 );
+
+	wxStaticBoxSizer* sbSizer2;
+	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Horizontal") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer20;
+	bSizer20 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_bpButton2 = new wxBitmapButton( sbSizer2->GetStaticBox(), ID_HSCALEDOWN, wxNullBitmap, wxDefaultPosition, wxSize( -1,32 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton2->SetBitmap( wxBitmap( left_xpm ) );
+	bSizer20->Add( m_bpButton2, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 10 );
+
+	m_stHScale = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("ns/div"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL );
+	m_stHScale->Wrap( -1 );
+	m_stHScale->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer20->Add( m_stHScale, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_bpButton3 = new wxBitmapButton( sbSizer2->GetStaticBox(), ID_HSCALEUP, wxNullBitmap, wxDefaultPosition, wxSize( -1,32 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton3->SetBitmap( wxBitmap( right_xpm ) );
+	bSizer20->Add( m_bpButton3, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 10 );
+
+
+	sbSizer2->Add( bSizer20, 0, wxEXPAND, 5 );
+
+	m_slHOffset = new wxSlider( sbSizer2->GetStaticBox(), ID_HOR_POS, 0, -1000, 1000, wxDefaultPosition, wxSize( -1,20 ), wxSL_HORIZONTAL|wxBORDER_STATIC );
+	m_slHOffset->SetToolTip( wxT("Set Horizontal Position") );
+	m_slHOffset->SetMinSize( wxSize( -1,30 ) );
+
+	sbSizer2->Add( m_slHOffset, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 3 );
+
+
+	bSizer2->Add( sbSizer2, 0, wxEXPAND, 5 );
+
+	wxStaticBoxSizer* sbSizer3;
+	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxT("Vertical") ), wxHORIZONTAL );
+
+	wxBoxSizer* bSizer9;
+	bSizer9 = new wxBoxSizer( wxVERTICAL );
+
+	m_btCh1 = new wxToggleButton( sbSizer3->GetStaticBox(), ID_CHON1, wxT("1"), wxDefaultPosition, wxSize( 30,27 ), 0 );
+	m_btCh1->SetValue( true );
+	m_btCh1->SetFont( wxFont( 12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_btCh1->SetToolTip( wxT("Enable Channel 1") );
+
+	bSizer9->Add( m_btCh1, 0, wxALIGN_CENTER, 5 );
+
+	m_slPos1 = new wxSlider( sbSizer3->GetStaticBox(), ID_POS1, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxBORDER_STATIC );
+	m_slPos1->SetBackgroundColour( wxColour( 255, 255, 0 ) );
+	m_slPos1->SetToolTip( wxT("Move Channel 1 Vertical Position") );
+	m_slPos1->SetMinSize( wxSize( -1,70 ) );
+	m_slPos1->SetMaxSize( wxSize( -1,70 ) );
+
+	bSizer9->Add( m_slPos1, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton4 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEUP1, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton4->SetBitmap( wxBitmap( up_xpm ) );
+	bSizer9->Add( m_bpButton4, 0, wxALIGN_CENTER_HORIZONTAL, 0 );
+
+	m_stScale1 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, wxT("500mV"), wxDefaultPosition, wxSize( -1,-1 ), wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL );
+	m_stScale1->Wrap( -1 );
+	m_stScale1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer9->Add( m_stScale1, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 0 );
+
+	m_bpButton5 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEDN1, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton5->SetBitmap( wxBitmap( down_xpm ) );
+	bSizer9->Add( m_bpButton5, 0, wxALIGN_CENTER_HORIZONTAL, 0 );
+
+
+	sbSizer3->Add( bSizer9, 1, wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer10;
+	bSizer10 = new wxBoxSizer( wxVERTICAL );
+
+	m_btCh2 = new wxToggleButton( sbSizer3->GetStaticBox(), ID_CHON2, wxT("2"), wxDefaultPosition, wxSize( 30,27 ), 0 );
+	m_btCh2->SetValue( true );
+	m_btCh2->SetFont( wxFont( 12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_btCh2->SetToolTip( wxT("Enable Channel 2") );
+
+	bSizer10->Add( m_btCh2, 0, wxALIGN_CENTER, 5 );
+
+	m_slPos2 = new wxSlider( sbSizer3->GetStaticBox(), ID_POS2, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxBORDER_STATIC );
+	m_slPos2->SetBackgroundColour( wxColour( 170, 170, 255 ) );
+	m_slPos2->SetToolTip( wxT("Move Channel 2 Vertical Position") );
+	m_slPos2->SetMinSize( wxSize( -1,70 ) );
+	m_slPos2->SetMaxSize( wxSize( -1,70 ) );
+
+	bSizer10->Add( m_slPos2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton6 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEUP2, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton6->SetBitmap( wxBitmap( up_xpm ) );
+	bSizer10->Add( m_bpButton6, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_stScale2 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, wxT("500mV"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL );
+	m_stScale2->Wrap( -1 );
+	m_stScale2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer10->Add( m_stScale2, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton7 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEDN2, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton7->SetBitmap( wxBitmap( down_xpm ) );
+	bSizer10->Add( m_bpButton7, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+	sbSizer3->Add( bSizer10, 1, wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer11;
+	bSizer11 = new wxBoxSizer( wxVERTICAL );
+
+	m_btCh3 = new wxToggleButton( sbSizer3->GetStaticBox(), ID_CHON3, wxT("3"), wxDefaultPosition, wxSize( 30,27 ), 0 );
+	m_btCh3->SetFont( wxFont( 12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_btCh3->SetToolTip( wxT("Enable Channel 3") );
+
+	bSizer11->Add( m_btCh3, 0, wxALIGN_CENTER, 5 );
+
+	m_slPos3 = new wxSlider( sbSizer3->GetStaticBox(), ID_POS3, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxBORDER_STATIC );
+	m_slPos3->SetBackgroundColour( wxColour( 255, 170, 170 ) );
+	m_slPos3->SetToolTip( wxT("Move Channel 3 Vertical Position") );
+	m_slPos3->SetMinSize( wxSize( -1,70 ) );
+	m_slPos3->SetMaxSize( wxSize( -1,70 ) );
+
+	bSizer11->Add( m_slPos3, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton8 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEUP3, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton8->SetBitmap( wxBitmap( up_xpm ) );
+	bSizer11->Add( m_bpButton8, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_stScale3 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, wxT("500mV"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL );
+	m_stScale3->Wrap( -1 );
+	m_stScale3->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer11->Add( m_stScale3, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton9 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEDN3, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton9->SetBitmap( wxBitmap( down_xpm ) );
+	bSizer11->Add( m_bpButton9, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+	sbSizer3->Add( bSizer11, 1, wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer13;
+	bSizer13 = new wxBoxSizer( wxVERTICAL );
+
+	m_btCh4 = new wxToggleButton( sbSizer3->GetStaticBox(), ID_CHON4, wxT("4"), wxDefaultPosition, wxSize( 30,27 ), 0 );
+	m_btCh4->SetFont( wxFont( 12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_btCh4->SetToolTip( wxT("Enable Channel 4") );
+
+	bSizer13->Add( m_btCh4, 0, wxALIGN_CENTER, 5 );
+
+	m_slPos4 = new wxSlider( sbSizer3->GetStaticBox(), ID_POS4, 0, -250, 250, wxDefaultPosition, wxSize( -1,70 ), wxSL_VERTICAL|wxBORDER_STATIC );
+	m_slPos4->SetBackgroundColour( wxColour( 170, 255, 170 ) );
+	m_slPos4->SetToolTip( wxT("Move Channel 4 Vertical Position") );
+	m_slPos4->SetMinSize( wxSize( -1,70 ) );
+	m_slPos4->SetMaxSize( wxSize( -1,70 ) );
+
+	bSizer13->Add( m_slPos4, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton10 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEUP4, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton10->SetBitmap( wxBitmap( up_xpm ) );
+	bSizer13->Add( m_bpButton10, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_stScale4 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, wxT("500mV"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL );
+	m_stScale4->Wrap( -1 );
+	m_stScale4->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer13->Add( m_stScale4, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_bpButton11 = new wxBitmapButton( sbSizer3->GetStaticBox(), ID_SCALEDN4, wxNullBitmap, wxDefaultPosition, wxSize( -1,22 ), wxBU_AUTODRAW|0 );
+
+	m_bpButton11->SetBitmap( wxBitmap( down_xpm ) );
+	bSizer13->Add( m_bpButton11, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+	sbSizer3->Add( bSizer13, 1, wxEXPAND, 5 );
+
+
+	bSizer2->Add( sbSizer3, 0, wxEXPAND, 5 );
+
+	wxStaticBoxSizer* sbSizer8;
+	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+	wxBoxSizer* bSizer131;
+	bSizer131 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_staticText76 = new wxStaticText( sbSizer8->GetStaticBox(), wxID_ANY, wxT("Cursor:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText76->Wrap( -1 );
+	bSizer131->Add( m_staticText76, 0, wxALIGN_CENTER, 5 );
+
+	m_toggleCursorA = new wxToggleButton( sbSizer8->GetStaticBox(), ID_CURSORA, wxT("&A"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+	m_toggleCursorA->SetToolTip( wxT("Activate Cursor A") );
+	m_toggleCursorA->SetMinSize( wxSize( 40,-1 ) );
+	m_toggleCursorA->SetMaxSize( wxSize( 40,-1 ) );
+
+	bSizer131->Add( m_toggleCursorA, 0, wxALIGN_CENTER, 5 );
+
+	m_toggleCursorB = new wxToggleButton( sbSizer8->GetStaticBox(), ID_CURSORB, wxT("&B"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+	m_toggleCursorB->SetToolTip( wxT("Activate Cursor B") );
+	m_toggleCursorB->SetMinSize( wxSize( 40,-1 ) );
+	m_toggleCursorB->SetMaxSize( wxSize( 40,-1 ) );
+
+	bSizer131->Add( m_toggleCursorB, 0, wxALIGN_CENTER, 5 );
+
+	m_checkBox8 = new wxCheckBox( sbSizer8->GetStaticBox(), wxID_ANY, wxT("Snap"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer131->Add( m_checkBox8, 1, wxALIGN_CENTER|wxLEFT, 5 );
+
+
+	sbSizer8->Add( bSizer131, 0, wxEXPAND, 5 );
+
+
+	bSizer2->Add( sbSizer8, 0, wxEXPAND, 5 );
+
+	wxStaticBoxSizer* sbSizer4;
+	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+	wxGridSizer* gSizer1;
+	gSizer1 = new wxGridSizer( 3, 2, 0, 0 );
+
+	m_btConfig = new wxButton( sbSizer4->GetStaticBox(), ID_CONFIG, wxT("&Config"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btConfig->SetToolTip( wxT("Bring up Configuration Dialog") );
+
+	gSizer1->Add( m_btConfig, 0, wxEXPAND, 5 );
+
+	m_btSave = new wxButton( sbSizer4->GetStaticBox(), ID_SAVE, wxT("&Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btSave->SetToolTip( wxT("Save Waveforms") );
+
+	gSizer1->Add( m_btSave, 0, wxEXPAND, 5 );
+
+	m_btMeasure = new wxButton( sbSizer4->GetStaticBox(), ID_MEASURE, wxT("&Measure"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btMeasure->SetToolTip( wxT("Bring up Measurement Dialog") );
+
+	gSizer1->Add( m_btMeasure, 0, wxEXPAND, 5 );
+
+	m_btDisplay = new wxButton( sbSizer4->GetStaticBox(), ID_MEASURE, wxT("&Display"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btDisplay->SetToolTip( wxT("Bring up Measurement Dialog") );
+
+	gSizer1->Add( m_btDisplay, 0, wxEXPAND, 5 );
+
+	m_btPrint = new wxButton( sbSizer4->GetStaticBox(), ID_PRINT, wxT("&Print"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btPrint->SetToolTip( wxT("Print Waveforms") );
+
+	gSizer1->Add( m_btPrint, 0, wxEXPAND, 5 );
+
+
+	sbSizer4->Add( gSizer1, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+	bSizer2->Add( sbSizer4, 0, wxEXPAND, 5 );
+
+	wxStaticBoxSizer* sbSizer9;
+	sbSizer9 = new wxStaticBoxSizer( new wxStaticBox( m_pnControls, wxID_ANY, wxEmptyString ), wxHORIZONTAL );
+
+	wxGridSizer* gSizer4;
+	gSizer4 = new wxGridSizer( 1, 2, 0, 0 );
+
+	m_btAbout = new wxButton( sbSizer9->GetStaticBox(), ID_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btAbout->SetToolTip( wxT("Display About Box") );
+
+	gSizer4->Add( m_btAbout, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+	m_btExit = new wxButton( sbSizer9->GetStaticBox(), ID_EXIT, wxT("E&xit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btExit->SetToolTip( wxT("Exit Program") );
+
+	gSizer4->Add( m_btExit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+	sbSizer9->Add( gSizer4, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+	bSizer2->Add( sbSizer9, 0, wxALIGN_CENTER|wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer3;
+	bSizer3 = new wxBoxSizer( wxHORIZONTAL );
+
+
+	bSizer2->Add( bSizer3, 1, wxEXPAND, 5 );
+
+
+	m_pnControls->SetSizer( bSizer2 );
+	m_pnControls->Layout();
+	bSizer2->Fit( m_pnControls );
+	bSizer1->Add( m_pnControls, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 0 );
+
+
+	this->SetSizer( bSizer1 );
+	this->Layout();
+
+	// Connect Events
+	m_menu1->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnSave ), this, m_menuSave->GetId());
+	m_menu1->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnPrint ), this, m_menuPrint->GetId());
+	m_menu1->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnExit ), this, m_menuExit->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnCursor ), this, m_menuCursorA->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnCursor ), this, m_menuCursorB->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnSnap ), this, m_menuItem13->GetId());
+	m_menu3->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnConfig ), this, m_menuConfig->GetId());
+	m_menu3->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnMeasure ), this, m_menuMeasure->GetId());
+	m_menu3->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnDisplay ), this, m_menuDisplay->GetId());
+	m_menu2->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DOFrame_fb::OnAbout ), this, m_menuAbout->GetId());
+	m_slTrgLevel->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slTrgLevel->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_btRun->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
+	m_btSingle->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
+	m_rbNormal->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_rbAuto->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_bpPolarity->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_btTrgCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_rbSource->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_bpButton2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
+	m_bpButton3->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slHOffset->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_btCh1->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos1->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_btCh2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos2->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton7->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_btCh3->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos3->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_btCh4->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos4->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_toggleCursorA->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
+	m_toggleCursorB->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
+	m_checkBox8->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSnap ), NULL, this );
+	m_btConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnConfig ), NULL, this );
+	m_btSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSave ), NULL, this );
+	m_btMeasure->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnMeasure ), NULL, this );
+	m_btDisplay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnDisplay ), NULL, this );
+	m_btPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnPrint ), NULL, this );
+	m_btAbout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnAbout ), NULL, this );
+	m_btExit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnExit ), NULL, this );
+}
+
+DOFrame_fb::~DOFrame_fb()
+{
+	// Disconnect Events
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgLevelChange ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slTrgLevel->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_btRun->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
+	m_btSingle->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
+	m_rbNormal->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_rbAuto->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_bpPolarity->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_btTrgCfg->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnTrigger ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_slTrgDelay->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnTrgDelayChange ), NULL, this );
+	m_rbSource->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DOFrame_fb::OnTrgButton ), NULL, this );
+	m_bpButton2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
+	m_bpButton3->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnHScaleChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnHOffsetChange ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slHOffset->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_btCh1->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos1->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_btCh2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos2->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton7->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_btCh3->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos3->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_btCh4->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnChnOn ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( DOFrame_fb::OnPosChange ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_slPos4->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DOFrame_fb::OnZero ), NULL, this );
+	m_bpButton10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_bpButton11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnScaleChange ), NULL, this );
+	m_toggleCursorA->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
+	m_toggleCursorB->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnCursor ), NULL, this );
+	m_checkBox8->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSnap ), NULL, this );
+	m_btConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnConfig ), NULL, this );
+	m_btSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnSave ), NULL, this );
+	m_btMeasure->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnMeasure ), NULL, this );
+	m_btDisplay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnDisplay ), NULL, this );
+	m_btPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnPrint ), NULL, this );
+	m_btAbout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnAbout ), NULL, this );
+	m_btExit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DOFrame_fb::OnExit ), NULL, this );
+
+}
+
+ConfigDialog_fb::ConfigDialog_fb( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer12;
+	bSizer12 = new wxBoxSizer( wxVERTICAL );
+
+	wxStaticBoxSizer* sbSizer5111;
+	sbSizer5111 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Board") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer37;
+	bSizer37 = new wxBoxSizer( wxHORIZONTAL );
+
+	wxArrayString m_cbBoardChoices;
+	m_cbBoard = new wxChoice( sbSizer5111->GetStaticBox(), ID_BSEL, wxDefaultPosition, wxDefaultSize, m_cbBoardChoices, 0 );
+	m_cbBoard->SetSelection( 0 );
+	bSizer37->Add( m_cbBoard, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+	m_btScan = new wxButton( sbSizer5111->GetStaticBox(), wxID_ANY, wxT("Rescan"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_btScan, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+	m_btInfo = new wxButton( sbSizer5111->GetStaticBox(), wxID_ANY, wxT("Info"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_btInfo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+	sbSizer5111->Add( bSizer37, 1, wxEXPAND, 5 );
+
+	m_cbMulti = new wxCheckBox( sbSizer5111->GetStaticBox(), ID_MULTI, wxT("Configure multi-board daisy-chain"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbMulti->Enable( false );
+
+	sbSizer5111->Add( m_cbMulti, 0, wxRIGHT|wxLEFT, 5 );
+
+
+	bSizer12->Add( sbSizer5111, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer511;
+	sbSizer511 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Channels") ), wxVERTICAL );
+
+	wxString m_rbChHalfChoices[] = { wxT("even channels"), wxT("odd channels"), wxT("combined") };
+	int m_rbChHalfNChoices = sizeof( m_rbChHalfChoices ) / sizeof( wxString );
+	m_rbChHalf = new wxRadioBox( sbSizer511->GetStaticBox(), ID_CH_HALF, wxT("2048-bin option"), wxDefaultPosition, wxDefaultSize, m_rbChHalfNChoices, m_rbChHalfChoices, 1, wxRA_SPECIFY_ROWS );
+	m_rbChHalf->SetSelection( 0 );
+	sbSizer511->Add( m_rbChHalf, 0, wxBOTTOM, 5 );
+
+	m_cbClkOn = new wxCheckBox( sbSizer511->GetStaticBox(), wxID_ANY, wxT("Connect reference clock to all channels"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer511->Add( m_cbClkOn, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
+
+	bSizer12->Add( sbSizer511, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer17;
+	sbSizer17 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Input Range") ), wxVERTICAL );
+
+	wxString m_rbRangeChoices[] = { wxT("-0.5V to +0.5V"), wxT("-0.05V to +0.95V"), wxT("0V to +1V") };
+	int m_rbRangeNChoices = sizeof( m_rbRangeChoices ) / sizeof( wxString );
+	m_rbRange = new wxRadioBox( sbSizer17->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbRangeNChoices, m_rbRangeChoices, 1, wxRA_SPECIFY_ROWS );
+	m_rbRange->SetSelection( 2 );
+	sbSizer17->Add( m_rbRange, 0, 0, 5 );
+
+
+	bSizer12->Add( sbSizer17, 0, wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer512;
+	sbSizer512 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Sampling Speed") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer1813;
+	bSizer1813 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_tbFreq = new wxTextCtrl( sbSizer512->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+	bSizer1813->Add( m_tbFreq, 0, wxALIGN_CENTER|wxRIGHT|wxLEFT, 5 );
+
+	m_staticText26 = new wxStaticText( sbSizer512->GetStaticBox(), wxID_ANY, wxT("GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText26->Wrap( -1 );
+	bSizer1813->Add( m_staticText26, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxTOP, 5 );
+
+	m_cbLocked = new wxCheckBox( sbSizer512->GetStaticBox(), wxID_ANY, wxT("Lock"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1813->Add( m_cbLocked, 0, wxALIGN_CENTER|wxLEFT, 10 );
+
+	m_staticText261 = new wxStaticText( sbSizer512->GetStaticBox(), wxID_ANY, wxT("Actual speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText261->Wrap( -1 );
+	bSizer1813->Add( m_staticText261, 0, wxALIGN_CENTER|wxLEFT, 40 );
+
+	m_stActFreq = new wxStaticText( sbSizer512->GetStaticBox(), wxID_ANY, wxT("0.000 GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stActFreq->Wrap( -1 );
+	bSizer1813->Add( m_stActFreq, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+
+	sbSizer512->Add( bSizer1813, 0, wxEXPAND, 5 );
+
+
+	bSizer12->Add( sbSizer512, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer5;
+	sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Voltage Calibration") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer18;
+	bSizer18 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_cbCalOn = new wxCheckBox( sbSizer5->GetStaticBox(), wxID_ANY, wxT("Voltage on"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer18->Add( m_cbCalOn, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+	m_teCal = new wxTextCtrl( sbSizer5->GetStaticBox(), wxID_ANY, wxT("0"), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+	bSizer18->Add( m_teCal, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+	m_slCal = new wxSlider( sbSizer5->GetStaticBox(), wxID_ANY, 0, -500, 500, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxBORDER_STATIC );
+	bSizer18->Add( m_slCal, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+	m_staticText10 = new wxStaticText( sbSizer5->GetStaticBox(), wxID_ANY, wxT("mV"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText10->Wrap( -1 );
+	bSizer18->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+	sbSizer5->Add( bSizer18, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+	m_cbCalibrated = new wxCheckBox( sbSizer5->GetStaticBox(), ID_DISP_CALIBRATED, wxT("Apply Primary Calibration (Cell)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbCalibrated->SetValue(true);
+	sbSizer5->Add( m_cbCalibrated, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+	m_cbCalibrated2 = new wxCheckBox( sbSizer5->GetStaticBox(), ID_DISP_CALIBRATED2, wxT("Apply Secondary Calibration (Readout)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbCalibrated2->SetValue(true);
+	sbSizer5->Add( m_cbCalibrated2, 0, wxRIGHT|wxLEFT, 5 );
+
+	m_cbSpikes = new wxCheckBox( sbSizer5->GetStaticBox(), wxID_ANY, wxT("Remove Spikes"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer5->Add( m_cbSpikes, 0, wxRIGHT|wxLEFT, 5 );
+
+	m_button13 = new wxButton( sbSizer5->GetStaticBox(), wxID_ANY, wxT("Execute Voltage Calibration"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer5->Add( m_button13, 0, wxALIGN_CENTER|wxALL, 5 );
+
+	m_gaugeCalVolt = new wxGauge( sbSizer5->GetStaticBox(), wxID_ANY, 100, wxDefaultPosition, wxSize( -1,15 ), wxGA_HORIZONTAL );
+	sbSizer5->Add( m_gaugeCalVolt, 1, wxEXPAND, 5 );
+
+
+	bSizer12->Add( sbSizer5, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer6;
+	sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Timing Calibration") ), wxVERTICAL );
+
+	m_cbRotated = new wxCheckBox( sbSizer6->GetStaticBox(), ID_DISP_ROTATED, wxT("Rotate waveforms relative to trigger"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbRotated->SetValue(true);
+	sbSizer6->Add( m_cbRotated, 0, wxRIGHT|wxLEFT, 5 );
+
+	m_cbTCalOn = new wxCheckBox( sbSizer6->GetStaticBox(), ID_DISP_TCALIBRATED, wxT("Apply Timing Calibration"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbTCalOn->SetValue(true);
+	sbSizer6->Add( m_cbTCalOn, 0, wxRIGHT|wxLEFT, 5 );
+
+	m_cbTrgCorr = new wxCheckBox( sbSizer6->GetStaticBox(), ID_DISP_TRGCORR, wxT("Correct horizontal trigger position"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbTrgCorr->SetValue(true);
+	sbSizer6->Add( m_cbTrgCorr, 0, wxRIGHT|wxLEFT, 5 );
+
+	m_cbExtRefclk = new wxCheckBox( sbSizer6->GetStaticBox(), ID_REFCLK, wxT("Use external reference clock"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer6->Add( m_cbExtRefclk, 0, wxRIGHT|wxLEFT, 5 );
+
+	m_button14 = new wxButton( sbSizer6->GetStaticBox(), wxID_ANY, wxT("Execute Timing Calibration"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer6->Add( m_button14, 0, wxALIGN_CENTER|wxALL, 5 );
+
+	m_gaugeCalTime = new wxGauge( sbSizer6->GetStaticBox(), wxID_ANY, 100, wxDefaultPosition, wxSize( -1,15 ), wxGA_HORIZONTAL );
+	sbSizer6->Add( m_gaugeCalTime, 1, wxEXPAND, 5 );
+
+
+	bSizer12->Add( sbSizer6, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	m_button10 = new wxButton( this, wxID_ANY, wxT("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer12->Add( m_button10, 0, wxALL|wxALIGN_RIGHT, 5 );
+
+
+	this->SetSizer( bSizer12 );
+	this->Layout();
+	bSizer12->Fit( this );
+
+	// Connect Events
+	m_cbBoard->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
+	m_btScan->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRescan ), NULL, this );
+	m_btInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnInfo ), NULL, this );
+	m_cbMulti->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
+	m_rbChHalf->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnChannelHalf ), NULL, this );
+	m_cbClkOn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClkOn ), NULL, this );
+	m_rbRange->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnInputRange ), NULL, this );
+	m_tbFreq->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnFreq ), NULL, this );
+	m_cbLocked->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnLock ), NULL, this );
+	m_cbCalOn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnCalOn ), NULL, this );
+	m_teCal->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnCalEnter ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_cbCalibrated->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbCalibrated2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbSpikes->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRemoveSpikes ), NULL, this );
+	m_button13->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalVolt ), NULL, this );
+	m_cbRotated->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbTCalOn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbTrgCorr->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbExtRefclk->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_button14->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalTime ), NULL, this );
+	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClose ), NULL, this );
+}
+
+ConfigDialog_fb::~ConfigDialog_fb()
+{
+	// Disconnect Events
+	m_cbBoard->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
+	m_btScan->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRescan ), NULL, this );
+	m_btInfo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnInfo ), NULL, this );
+	m_cbMulti->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnBoardSelect ), NULL, this );
+	m_rbChHalf->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnChannelHalf ), NULL, this );
+	m_cbClkOn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClkOn ), NULL, this );
+	m_rbRange->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( ConfigDialog_fb::OnInputRange ), NULL, this );
+	m_tbFreq->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnFreq ), NULL, this );
+	m_cbLocked->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnLock ), NULL, this );
+	m_cbCalOn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnCalOn ), NULL, this );
+	m_teCal->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ConfigDialog_fb::OnCalEnter ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_slCal->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( ConfigDialog_fb::OnCalSlider ), NULL, this );
+	m_cbCalibrated->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbCalibrated2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbSpikes->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnRemoveSpikes ), NULL, this );
+	m_button13->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalVolt ), NULL, this );
+	m_cbRotated->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbTCalOn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbTrgCorr->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_cbExtRefclk->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnDisplayWaveforms ), NULL, this );
+	m_button14->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnButtonCalTime ), NULL, this );
+	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDialog_fb::OnClose ), NULL, this );
+
+}
+
+DisplayDialog_fb::DisplayDialog_fb( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer12;
+	bSizer12 = new wxBoxSizer( wxVERTICAL );
+
+	wxStaticBoxSizer* sbSizer7;
+	sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Options") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer34;
+	bSizer34 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_checkBox7 = new wxCheckBox( sbSizer7->GetStaticBox(), wxID_ANY, wxT("Display Date/Time"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer34->Add( m_checkBox7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_checkBox71 = new wxCheckBox( sbSizer7->GetStaticBox(), wxID_ANY, wxT("Show Grid"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBox71->SetValue(true);
+	bSizer34->Add( m_checkBox71, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox88 = new wxCheckBox( sbSizer7->GetStaticBox(), wxID_ANY, wxT("Lines"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBox88->SetValue(true);
+	bSizer34->Add( m_checkBox88, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	sbSizer7->Add( bSizer34, 1, wxEXPAND, 5 );
+
+	m_checkBox73 = new wxCheckBox( sbSizer7->GetStaticBox(), wxID_ANY, wxT("Show hardware scalers"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer7->Add( m_checkBox73, 0, wxALL, 5 );
+
+
+	bSizer12->Add( sbSizer7, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer71;
+	sbSizer71 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Display Mode") ), wxVERTICAL );
+
+	m_rbShowSample = new wxRadioButton( sbSizer71->GetStaticBox(), ID_DISPSAMPLE, wxT("Sample"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_rbShowSample->SetValue( true );
+	sbSizer71->Add( m_rbShowSample, 0, wxALL, 5 );
+
+	wxBoxSizer* bSizer39;
+	bSizer39 = new wxBoxSizer( wxHORIZONTAL );
+
+	wxBoxSizer* bSizer40;
+	bSizer40 = new wxBoxSizer( wxVERTICAL );
+
+	m_rbShowAverage = new wxRadioButton( sbSizer71->GetStaticBox(), ID_DISPAVERAGE, wxT("Average"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_rbShowAverage->Enable( false );
+
+	bSizer40->Add( m_rbShowAverage, 0, wxALL, 5 );
+
+	m_rbShowPersist = new wxRadioButton( sbSizer71->GetStaticBox(), ID_DISPPERSIST, wxT("Persistance"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_rbShowPersist->Enable( false );
+
+	bSizer40->Add( m_rbShowPersist, 0, wxALL, 5 );
+
+
+	bSizer39->Add( bSizer40, 1, wxEXPAND, 5 );
+
+	m_staticText59 = new wxStaticText( sbSizer71->GetStaticBox(), wxID_ANY, wxT("Number of waveforms:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText59->Wrap( -1 );
+	bSizer39->Add( m_staticText59, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_cbNumber = new wxComboBox( sbSizer71->GetStaticBox(), ID_DISPNUMBER, wxT("16"), wxDefaultPosition, wxDefaultSize, 0, NULL, wxTE_PROCESS_ENTER );
+	m_cbNumber->Append( wxT("2") );
+	m_cbNumber->Append( wxT("4") );
+	m_cbNumber->Append( wxT("8") );
+	m_cbNumber->Append( wxT("16") );
+	m_cbNumber->Append( wxT("32") );
+	m_cbNumber->Append( wxT("64") );
+	m_cbNumber->Append( wxT("128") );
+	m_cbNumber->Append( wxT("256") );
+	m_cbNumber->Enable( false );
+
+	bSizer39->Add( m_cbNumber, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+	sbSizer71->Add( bSizer39, 1, wxEXPAND, 5 );
+
+
+	bSizer12->Add( sbSizer71, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	wxStaticBoxSizer* sbSizer711;
+	sbSizer711 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Math Display") ), wxVERTICAL );
+
+	wxBoxSizer* bSizer14;
+	bSizer14 = new wxBoxSizer( wxVERTICAL );
+
+	wxFlexGridSizer* gSizer2;
+	gSizer2 = new wxFlexGridSizer( 3, 5, 0, 0 );
+	gSizer2->SetFlexibleDirection( wxBOTH );
+	gSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+	m_staticText11 = new wxStaticText( sbSizer711->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	gSizer2->Add( m_staticText11, 0, wxALL, 5 );
+
+	m_staticText12 = new wxStaticText( sbSizer711->GetStaticBox(), wxID_ANY, wxT("CH1"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12->Wrap( -1 );
+	m_staticText12->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText12->SetBackgroundColour( wxColour( 255, 255, 0 ) );
+
+	gSizer2->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText13 = new wxStaticText( sbSizer711->GetStaticBox(), wxID_ANY, wxT("CH2"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13->Wrap( -1 );
+	m_staticText13->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText13->SetBackgroundColour( wxColour( 170, 170, 255 ) );
+
+	gSizer2->Add( m_staticText13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText14 = new wxStaticText( sbSizer711->GetStaticBox(), wxID_ANY, wxT("CH3"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText14->Wrap( -1 );
+	m_staticText14->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText14->SetBackgroundColour( wxColour( 255, 170, 170 ) );
+
+	gSizer2->Add( m_staticText14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText15 = new wxStaticText( sbSizer711->GetStaticBox(), wxID_ANY, wxT("CH4"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText15->Wrap( -1 );
+	m_staticText15->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText15->SetBackgroundColour( wxColour( 170, 255, 170 ) );
+
+	gSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText17 = new wxStaticText( sbSizer711->GetStaticBox(), wxID_ANY, wxT("Period Jitter"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText17->Wrap( -1 );
+	gSizer2->Add( m_staticText17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox13 = new wxCheckBox( sbSizer711->GetStaticBox(), ID_PJ1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox14 = new wxCheckBox( sbSizer711->GetStaticBox(), ID_PJ2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox15 = new wxCheckBox( sbSizer711->GetStaticBox(), ID_PJ3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox16 = new wxCheckBox( sbSizer711->GetStaticBox(), ID_PJ4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	bSizer14->Add( gSizer2, 0, 0, 5 );
+
+
+	sbSizer711->Add( bSizer14, 1, wxEXPAND, 5 );
+
+
+	bSizer12->Add( sbSizer711, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+	m_button10 = new wxButton( this, wxID_ANY, wxT("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer12->Add( m_button10, 0, wxALL|wxALIGN_RIGHT, 5 );
+
+
+	this->SetSizer( bSizer12 );
+	this->Layout();
+	bSizer12->Fit( this );
+
+	// Connect Events
+	m_checkBox7->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnDateTime ), NULL, this );
+	m_checkBox71->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnShowGrid ), NULL, this );
+	m_checkBox88->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnLines ), NULL, this );
+	m_checkBox73->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnScalers ), NULL, this );
+	m_rbShowSample->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_rbShowAverage->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_rbShowPersist->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_cbNumber->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_cbNumber->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_checkBox13->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_checkBox14->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_checkBox15->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_checkBox16->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnClose ), NULL, this );
+}
+
+DisplayDialog_fb::~DisplayDialog_fb()
+{
+	// Disconnect Events
+	m_checkBox7->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnDateTime ), NULL, this );
+	m_checkBox71->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnShowGrid ), NULL, this );
+	m_checkBox88->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnLines ), NULL, this );
+	m_checkBox73->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnScalers ), NULL, this );
+	m_rbShowSample->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_rbShowAverage->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_rbShowPersist->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_cbNumber->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_cbNumber->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DisplayDialog_fb::OnDisplayMode ), NULL, this );
+	m_checkBox13->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_checkBox14->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_checkBox15->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_checkBox16->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnButton ), NULL, this );
+	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DisplayDialog_fb::OnClose ), NULL, this );
+
+}
+
+MeasureDialog_fb::MeasureDialog_fb( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer14;
+	bSizer14 = new wxBoxSizer( wxVERTICAL );
+
+	wxFlexGridSizer* gSizer2;
+	gSizer2 = new wxFlexGridSizer( 17, 5, 0, 0 );
+	gSizer2->SetFlexibleDirection( wxBOTH );
+	gSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+	m_staticText11 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	gSizer2->Add( m_staticText11, 0, wxALL, 5 );
+
+	m_staticText12 = new wxStaticText( this, wxID_ANY, wxT("CH1"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12->Wrap( -1 );
+	m_staticText12->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText12->SetBackgroundColour( wxColour( 255, 255, 0 ) );
+
+	gSizer2->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText13 = new wxStaticText( this, wxID_ANY, wxT("CH2"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13->Wrap( -1 );
+	m_staticText13->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText13->SetBackgroundColour( wxColour( 170, 170, 255 ) );
+
+	gSizer2->Add( m_staticText13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText14 = new wxStaticText( this, wxID_ANY, wxT("CH3"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText14->Wrap( -1 );
+	m_staticText14->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText14->SetBackgroundColour( wxColour( 255, 170, 170 ) );
+
+	gSizer2->Add( m_staticText14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText15 = new wxStaticText( this, wxID_ANY, wxT("CH4"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText15->Wrap( -1 );
+	m_staticText15->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText15->SetBackgroundColour( wxColour( 170, 255, 170 ) );
+
+	gSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2 );
+
+	m_staticText80 = new wxStaticText( this, wxID_ANY, wxT("Amplitude"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText80->Wrap( -1 );
+	m_staticText80->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+
+	gSizer2->Add( m_staticText80, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticText81 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText81->Wrap( -1 );
+	gSizer2->Add( m_staticText81, 0, wxALL, 5 );
+
+	m_staticText82 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText82->Wrap( -1 );
+	gSizer2->Add( m_staticText82, 0, wxALL, 5 );
+
+	m_staticText83 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText83->Wrap( -1 );
+	gSizer2->Add( m_staticText83, 0, wxALL, 5 );
+
+	m_staticText84 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText84->Wrap( -1 );
+	gSizer2->Add( m_staticText84, 0, wxALL, 5 );
+
+	m_staticText16 = new wxStaticText( this, wxID_ANY, wxT("Level"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText16->Wrap( -1 );
+	gSizer2->Add( m_staticText16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox9 = new wxCheckBox( this, ID_LEVEL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox9, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox10 = new wxCheckBox( this, ID_LEVEL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox11 = new wxCheckBox( this, ID_LEVEL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox12 = new wxCheckBox( this, ID_LEVEL4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText17 = new wxStaticText( this, wxID_ANY, wxT("Peak-Peak Amplitude"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText17->Wrap( -1 );
+	gSizer2->Add( m_staticText17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox13 = new wxCheckBox( this, ID_PKPK1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox14 = new wxCheckBox( this, ID_PKPK2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox15 = new wxCheckBox( this, ID_PKPK3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox16 = new wxCheckBox( this, ID_PKPK4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText19 = new wxStaticText( this, wxID_ANY, wxT("RMS"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText19->Wrap( -1 );
+	gSizer2->Add( m_staticText19, 0, wxALL, 5 );
+
+	m_checkBox17 = new wxCheckBox( this, ID_RMS1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox17, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_checkBox18 = new wxCheckBox( this, ID_RMS2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox18, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_checkBox19 = new wxCheckBox( this, ID_RMS3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox19, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_checkBox20 = new wxCheckBox( this, ID_RMS4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox20, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_staticText90 = new wxStaticText( this, wxID_ANY, wxT("Vertical slice"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText90->Wrap( -1 );
+	gSizer2->Add( m_staticText90, 0, wxALL, 5 );
+
+	m_checkBox74 = new wxCheckBox( this, ID_VS1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox74, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox75 = new wxCheckBox( this, ID_VS2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox75, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox76 = new wxCheckBox( this, ID_VS3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox76, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox77 = new wxCheckBox( this, ID_VS4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox77, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText91 = new wxStaticText( this, wxID_ANY, wxT("Gated charge"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText91->Wrap( -1 );
+	gSizer2->Add( m_staticText91, 0, wxALL, 5 );
+
+	m_checkBox82 = new wxCheckBox( this, ID_CHRG1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox82, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox83 = new wxCheckBox( this, ID_CHRG2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox83, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox84 = new wxCheckBox( this, ID_CHRG3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox84, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox85 = new wxCheckBox( this, ID_CHRG4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox85, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	gSizer2->Add( m_staticline4, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+	m_staticline41 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	gSizer2->Add( m_staticline41, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_staticline42 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	gSizer2->Add( m_staticline42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_staticline43 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	gSizer2->Add( m_staticline43, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_staticline44 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	gSizer2->Add( m_staticline44, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+	m_staticText85 = new wxStaticText( this, wxID_ANY, wxT("Time"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText85->Wrap( -1 );
+	m_staticText85->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+
+	gSizer2->Add( m_staticText85, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticText86 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText86->Wrap( -1 );
+	gSizer2->Add( m_staticText86, 0, wxALL, 5 );
+
+	m_staticText87 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText87->Wrap( -1 );
+	gSizer2->Add( m_staticText87, 0, wxALL, 5 );
+
+	m_staticText88 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText88->Wrap( -1 );
+	gSizer2->Add( m_staticText88, 0, wxALL, 5 );
+
+	m_staticText89 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText89->Wrap( -1 );
+	gSizer2->Add( m_staticText89, 0, wxALL, 5 );
+
+	m_staticText20 = new wxStaticText( this, wxID_ANY, wxT("Frequency"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText20->Wrap( -1 );
+	gSizer2->Add( m_staticText20, 0, wxALL, 5 );
+
+	m_checkBox21 = new wxCheckBox( this, ID_FREQ1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox21, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox22 = new wxCheckBox( this, ID_FREQ2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox22, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox23 = new wxCheckBox( this, ID_FREQ3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox23, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox24 = new wxCheckBox( this, ID_FREQ4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox24, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText21 = new wxStaticText( this, wxID_ANY, wxT("Period"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21->Wrap( -1 );
+	gSizer2->Add( m_staticText21, 0, wxALL, 5 );
+
+	m_checkBox25 = new wxCheckBox( this, ID_PERIOD1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox25, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox26 = new wxCheckBox( this, ID_PERIOD2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox26, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox27 = new wxCheckBox( this, ID_PERIOD3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox27, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox28 = new wxCheckBox( this, ID_PERIOD4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox28, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText22 = new wxStaticText( this, wxID_ANY, wxT("Rise time"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText22->Wrap( -1 );
+	gSizer2->Add( m_staticText22, 0, wxALL, 5 );
+
+	m_checkBox29 = new wxCheckBox( this, ID_RISE1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox29, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox30 = new wxCheckBox( this, ID_RISE2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox30, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox31 = new wxCheckBox( this, ID_RISE3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox31, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox32 = new wxCheckBox( this, ID_RISE4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox32, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText23 = new wxStaticText( this, wxID_ANY, wxT("Fall time"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText23->Wrap( -1 );
+	gSizer2->Add( m_staticText23, 0, wxALL, 5 );
+
+	m_checkBox33 = new wxCheckBox( this, ID_FALL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox33, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox34 = new wxCheckBox( this, ID_FALL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox34, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox35 = new wxCheckBox( this, ID_FALL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox35, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox36 = new wxCheckBox( this, ID_FALL4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox36, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText221 = new wxStaticText( this, wxID_ANY, wxT("Positive width"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText221->Wrap( -1 );
+	gSizer2->Add( m_staticText221, 0, wxALL, 5 );
+
+	m_checkBox291 = new wxCheckBox( this, ID_POSWIDTH1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox291, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_checkBox2911 = new wxCheckBox( this, ID_POSWIDTH2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2911, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_checkBox2912 = new wxCheckBox( this, ID_POSWIDTH3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2912, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_checkBox2913 = new wxCheckBox( this, ID_POSWIDTH4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2913, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticText2211 = new wxStaticText( this, wxID_ANY, wxT("Negative width"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText2211->Wrap( -1 );
+	gSizer2->Add( m_staticText2211, 0, wxALL, 5 );
+
+	m_checkBox2914 = new wxCheckBox( this, ID_NEGWIDTH1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2914, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_checkBox2915 = new wxCheckBox( this, ID_NEGWIDTH2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2915, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_checkBox2916 = new wxCheckBox( this, ID_NEGWIDTH3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2916, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_checkBox2917 = new wxCheckBox( this, ID_NEGWIDTH4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox2917, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticText231 = new wxStaticText( this, wxID_ANY, wxT("CH(x+1)-CH(x) delay"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText231->Wrap( -1 );
+	gSizer2->Add( m_staticText231, 0, wxALL, 5 );
+
+	m_checkBox37 = new wxCheckBox( this, ID_CHNDELAY1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox37, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox38 = new wxCheckBox( this, ID_CHNDELAY2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox38, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox39 = new wxCheckBox( this, ID_CHNDELAY3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox39, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox40 = new wxCheckBox( this, ID_CHNDELAY4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox40, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText901 = new wxStaticText( this, wxID_ANY, wxT("Horizontal slice"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText901->Wrap( -1 );
+	gSizer2->Add( m_staticText901, 0, wxALL, 5 );
+
+	m_checkBox78 = new wxCheckBox( this, ID_HS1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox78, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox79 = new wxCheckBox( this, ID_HS2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox79, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox80 = new wxCheckBox( this, ID_HS3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox80, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_checkBox81 = new wxCheckBox( this, ID_HS4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_checkBox81, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	bSizer14->Add( gSizer2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer14->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer35;
+	bSizer35 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_cbStat = new wxCheckBox( this, wxID_ANY, wxT("Display Statistics"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbStat->SetValue(true);
+	bSizer35->Add( m_cbStat, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+	m_cbHist = new wxCheckBox( this, wxID_ANY, wxT("Display Histograms"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer35->Add( m_cbHist, 1, wxALL|wxEXPAND, 5 );
+
+
+	bSizer14->Add( bSizer35, 1, wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_staticText27 = new wxStaticText( this, wxID_ANY, wxT("Accumulate"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText27->Wrap( -1 );
+	bSizer25->Add( m_staticText27, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+	m_cbNAverage = new wxComboBox( this, wxID_ANY, wxT("1000"), wxDefaultPosition, wxSize( 100,-1 ), 0, NULL, wxTE_PROCESS_ENTER );
+	m_cbNAverage->Append( wxT("10") );
+	m_cbNAverage->Append( wxT("50") );
+	m_cbNAverage->Append( wxT("100") );
+	m_cbNAverage->Append( wxT("500") );
+	m_cbNAverage->Append( wxT("1000") );
+	m_cbNAverage->Append( wxT("5000") );
+	m_cbNAverage->Append( wxT("10000") );
+	m_cbNAverage->Append( wxT("50000") );
+	m_cbNAverage->Append( wxT("1000000") );
+	bSizer25->Add( m_cbNAverage, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText271 = new wxStaticText( this, wxID_ANY, wxT("measurements"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText271->Wrap( -1 );
+	bSizer25->Add( m_staticText271, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+	bSizer14->Add( bSizer25, 0, wxEXPAND, 5 );
+
+	m_button15 = new wxButton( this, wxID_ANY, wxT("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer14->Add( m_button15, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer14->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
+
+	m_cbIndicator = new wxCheckBox( this, wxID_ANY, wxT("Display Indicators"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbIndicator->SetValue(true);
+	bSizer14->Add( m_cbIndicator, 0, wxALL, 5 );
+
+	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer14->Add( m_staticline21, 0, wxEXPAND | wxALL, 5 );
+
+	m_button11 = new wxButton( this, wxID_ANY, wxT("Cl&ose"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer14->Add( m_button11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+	this->SetSizer( bSizer14 );
+	this->Layout();
+	bSizer14->Fit( this );
+
+	// Connect Events
+	m_checkBox9->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox10->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox11->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox12->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox13->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox14->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox15->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox16->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox17->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox18->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox19->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox20->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox74->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox75->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox76->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox77->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox82->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox83->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox84->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox85->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox21->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox22->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox23->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox24->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox25->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox26->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox27->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox28->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox29->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox30->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox31->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox32->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox33->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox34->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox35->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox36->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox291->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2911->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2912->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2913->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2914->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2915->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2916->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2917->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox37->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox38->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox39->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox40->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox78->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox79->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox80->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox81->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_cbStat->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStat ), NULL, this );
+	m_cbHist->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnHist ), NULL, this );
+	m_cbNAverage->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
+	m_cbNAverage->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
+	m_button15->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStatReset ), NULL, this );
+	m_cbIndicator->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnIndicator ), NULL, this );
+	m_button11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnClose ), NULL, this );
+}
+
+MeasureDialog_fb::~MeasureDialog_fb()
+{
+	// Disconnect Events
+	m_checkBox9->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox10->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox11->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox12->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox13->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox14->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox15->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox16->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox17->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox18->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox19->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox20->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox74->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox75->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox76->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox77->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox82->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox83->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox84->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox85->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox21->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox22->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox23->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox24->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox25->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox26->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox27->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox28->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox29->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox30->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox31->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox32->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox33->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox34->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox35->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox36->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox291->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2911->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2912->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2913->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2914->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2915->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2916->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox2917->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox37->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox38->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox39->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox40->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox78->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox79->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox80->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_checkBox81->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnButton ), NULL, this );
+	m_cbStat->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStat ), NULL, this );
+	m_cbHist->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnHist ), NULL, this );
+	m_cbNAverage->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
+	m_cbNAverage->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MeasureDialog_fb::OnStatNAverage ), NULL, this );
+	m_button15->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnStatReset ), NULL, this );
+	m_cbIndicator->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnIndicator ), NULL, this );
+	m_button11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MeasureDialog_fb::OnClose ), NULL, this );
+
+}
+
+TriggerDialog_fb::TriggerDialog_fb( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer14;
+	bSizer14 = new wxBoxSizer( wxVERTICAL );
+
+	wxBoxSizer* bSizer35;
+	bSizer35 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_staticText12 = new wxStaticText( this, wxID_ANY, wxT("CH1"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText12->Wrap( -1 );
+	m_staticText12->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText12->SetBackgroundColour( wxColour( 255, 255, 0 ) );
+
+	bSizer35->Add( m_staticText12, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
+
+	m_staticText13 = new wxStaticText( this, wxID_ANY, wxT("CH2"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText13->Wrap( -1 );
+	m_staticText13->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText13->SetBackgroundColour( wxColour( 170, 170, 255 ) );
+
+	bSizer35->Add( m_staticText13, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
+
+	m_staticText14 = new wxStaticText( this, wxID_ANY, wxT("CH3"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText14->Wrap( -1 );
+	m_staticText14->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText14->SetBackgroundColour( wxColour( 255, 170, 170 ) );
+
+	bSizer35->Add( m_staticText14, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
+
+	m_staticText15 = new wxStaticText( this, wxID_ANY, wxT("CH4"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText15->Wrap( -1 );
+	m_staticText15->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText15->SetBackgroundColour( wxColour( 170, 255, 170 ) );
+
+	bSizer35->Add( m_staticText15, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
+
+	m_staticText16 = new wxStaticText( this, wxID_ANY, wxT("EXT"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText16->Wrap( -1 );
+	m_staticText16->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+	bSizer35->Add( m_staticText16, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 4 );
+
+
+	bSizer14->Add( bSizer35, 1, wxBOTTOM|wxEXPAND, 5 );
+
+	m_staticline11 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer14->Add( m_staticline11, 0, wxEXPAND, 5 );
+
+	m_staticText771 = new wxStaticText( this, wxID_ANY, wxT("Trigger logic"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText771->Wrap( -1 );
+	bSizer14->Add( m_staticText771, 0, wxALIGN_CENTER|wxALL, 5 );
+
+	wxBoxSizer* bSizer36;
+	bSizer36 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_cbOR1 = new wxCheckBox( this, ID_OR1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer36->Add( m_cbOR1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText17 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText17->Wrap( -1 );
+	bSizer36->Add( m_staticText17, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbOR2 = new wxCheckBox( this, ID_OR2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer36->Add( m_cbOR2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText171 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText171->Wrap( -1 );
+	bSizer36->Add( m_staticText171, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbOR3 = new wxCheckBox( this, ID_OR3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer36->Add( m_cbOR3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText172 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText172->Wrap( -1 );
+	bSizer36->Add( m_staticText172, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbOR4 = new wxCheckBox( this, ID_OR4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer36->Add( m_cbOR4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText173 = new wxStaticText( this, wxID_ANY, wxT("OR"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText173->Wrap( -1 );
+	bSizer36->Add( m_staticText173, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbOREXT = new wxCheckBox( this, ID_OREXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer36->Add( m_cbOREXT, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	bSizer14->Add( bSizer36, 1, wxEXPAND|wxRIGHT|wxLEFT, 16 );
+
+	m_staticText84 = new wxStaticText( this, wxID_ANY, wxT("- OR -"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText84->Wrap( -1 );
+	bSizer14->Add( m_staticText84, 0, wxALL|wxEXPAND, 5 );
+
+	wxBoxSizer* bSizer37;
+	bSizer37 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_cbAND1 = new wxCheckBox( this, ID_AND1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_cbAND1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText18 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText18->Wrap( -1 );
+	bSizer37->Add( m_staticText18, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbAND2 = new wxCheckBox( this, ID_AND2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_cbAND2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText181 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText181->Wrap( -1 );
+	bSizer37->Add( m_staticText181, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbAND3 = new wxCheckBox( this, ID_AND3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_cbAND3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText182 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText182->Wrap( -1 );
+	bSizer37->Add( m_staticText182, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbAND4 = new wxCheckBox( this, ID_AND4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_cbAND4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticText183 = new wxStaticText( this, wxID_ANY, wxT("AND"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL );
+	m_staticText183->Wrap( -1 );
+	bSizer37->Add( m_staticText183, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+	m_cbANDEXT = new wxCheckBox( this, ID_ANDEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer37->Add( m_cbANDEXT, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	bSizer14->Add( bSizer37, 1, wxEXPAND|wxRIGHT|wxLEFT, 16 );
+
+	m_cbTrans = new wxCheckBox( this, ID_TRANS, wxT("Enable Transparent Trigger"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer14->Add( m_cbTrans, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer14->Add( m_staticline10, 0, wxEXPAND, 5 );
+
+	m_staticText77 = new wxStaticText( this, wxID_ANY, wxT("Trigger level"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText77->Wrap( -1 );
+	bSizer14->Add( m_staticText77, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+	wxBoxSizer* bSizer33;
+	bSizer33 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_tbLevel1 = new wxTextCtrl( this, ID_LEVEL1, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+	bSizer33->Add( m_tbLevel1, 1, wxALL, 5 );
+
+	m_tbLevel2 = new wxTextCtrl( this, ID_LEVEL2, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+	bSizer33->Add( m_tbLevel2, 1, wxALL, 5 );
+
+	m_tbLevel3 = new wxTextCtrl( this, ID_LEVEL3, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+	bSizer33->Add( m_tbLevel3, 1, wxALL, 5 );
+
+	m_tbLevel4 = new wxTextCtrl( this, ID_LEVEL4, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+	bSizer33->Add( m_tbLevel4, 1, wxALL, 5 );
+
+	m_staticText78 = new wxStaticText( this, wxID_ANY, wxT("Volt"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText78->Wrap( -1 );
+	bSizer33->Add( m_staticText78, 1, wxALIGN_CENTER|wxALL, 5 );
+
+
+	bSizer14->Add( bSizer33, 1, wxEXPAND, 5 );
+
+	m_staticline25 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer14->Add( m_staticline25, 0, wxEXPAND, 5 );
+
+	m_button11 = new wxButton( this, wxID_ANY, wxT("Cl&ose"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer14->Add( m_button11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+	this->SetSizer( bSizer14 );
+	this->Layout();
+	bSizer14->Fit( this );
+
+	// Connect Events
+	m_cbOR1->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOR2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOR3->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOR4->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOREXT->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND1->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND3->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND4->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbANDEXT->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbTrans->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_tbLevel1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel1->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel2->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel3->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel4->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_button11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnClose ), NULL, this );
+}
+
+TriggerDialog_fb::~TriggerDialog_fb()
+{
+	// Disconnect Events
+	m_cbOR1->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOR2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOR3->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOR4->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbOREXT->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND1->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND3->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbAND4->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbANDEXT->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_cbTrans->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnButton ), NULL, this );
+	m_tbLevel1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel1->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel2->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel3->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_tbLevel4->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TriggerDialog_fb::OnTriggerLevel ), NULL, this );
+	m_button11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TriggerDialog_fb::OnClose ), NULL, this );
+
+}
+
+AboutDialog_fb::AboutDialog_fb( 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->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer15;
+	bSizer15 = new wxBoxSizer( wxVERTICAL );
+
+	wxBoxSizer* bSizer17;
+	bSizer17 = new wxBoxSizer( wxVERTICAL );
+
+	m_staticText18 = new wxStaticText( this, wxID_ANY, wxT("DRS Oscilloscope"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticText18->Wrap( -1 );
+	m_staticText18->SetFont( wxFont( 20, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_staticText18, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
+
+	m_stVersion = new wxStaticText( this, wxID_ANY, wxT("Version 0.0.0"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stVersion->Wrap( -1 );
+	m_stVersion->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_stVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+	m_stBuild = new wxStaticText( this, wxID_ANY, wxT("Build 0"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stBuild->Wrap( -1 );
+	m_stBuild->SetFont( wxFont( 16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_stBuild, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+	m_staticText20 = new wxStaticText( this, wxID_ANY, wxT("Stefan Ritt"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText20->Wrap( -1 );
+	m_staticText20->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_staticText20, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+	m_staticText21 = new wxStaticText( this, wxID_ANY, wxT("Paul Scherrer Institute"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21->Wrap( -1 );
+	m_staticText21->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+	wxBoxSizer* bSizer38;
+	bSizer38 = new wxBoxSizer( wxHORIZONTAL );
+
+
+	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+	m_bitmap1 = new wxStaticBitmap( this, wxID_ANY, wxBitmap( drsosc_xpm ), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer38->Add( m_bitmap1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
+
+
+	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+	bSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+	bSizer17->Add( bSizer38, 1, wxEXPAND, 5 );
+
+	m_staticText23 = new wxStaticText( this, wxID_ANY, wxT("For updates please visit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText23->Wrap( -1 );
+	m_staticText23->SetFont( wxFont( 18, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_staticText23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+	m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, wxT("http://www.psi.ch/drs"), wxT("http://www.psi.ch/drs"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink1->SetFont( wxFont( 18, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_hyperlink1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+	m_button12 = new wxButton( this, wxID_OK, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_button12->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+
+	bSizer17->Add( m_button12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 15 );
+
+
+	bSizer15->Add( bSizer17, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+	this->SetSizer( bSizer15 );
+	this->Layout();
+	bSizer15->Fit( this );
+}
+
+AboutDialog_fb::~AboutDialog_fb()
+{
+}
+
+InfoDialog_fb::InfoDialog_fb( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer15;
+	bSizer15 = new wxBoxSizer( wxVERTICAL );
+
+	wxGridSizer* gSizer2;
+	gSizer2 = new wxGridSizer( 9, 2, 0, 0 );
+
+	m_staticText45 = new wxStaticText( this, wxID_ANY, wxT("Board type:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText45->Wrap( -1 );
+	gSizer2->Add( m_staticText45, 0, wxALL, 5 );
+
+	m_stBoardType = new wxStaticText( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stBoardType->Wrap( -1 );
+	gSizer2->Add( m_stBoardType, 0, wxALL, 5 );
+
+	m_staticText47 = new wxStaticText( this, wxID_ANY, wxT("DRS type:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText47->Wrap( -1 );
+	gSizer2->Add( m_staticText47, 0, wxALL, 5 );
+
+	m_stDRSType = new wxStaticText( this, wxID_ANY, wxT("DRS4"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stDRSType->Wrap( -1 );
+	gSizer2->Add( m_stDRSType, 0, wxALL, 5 );
+
+	m_staticText49 = new wxStaticText( this, wxID_ANY, wxT("Serial number:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText49->Wrap( -1 );
+	gSizer2->Add( m_staticText49, 0, wxALL, 5 );
+
+	m_stSerialNumber = new wxStaticText( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stSerialNumber->Wrap( -1 );
+	gSizer2->Add( m_stSerialNumber, 0, wxALL, 5 );
+
+	m_staticText51 = new wxStaticText( this, wxID_ANY, wxT("Firmware revision:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText51->Wrap( -1 );
+	gSizer2->Add( m_staticText51, 0, wxALL, 5 );
+
+	m_stFirmwareRevision = new wxStaticText( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stFirmwareRevision->Wrap( -1 );
+	gSizer2->Add( m_stFirmwareRevision, 0, wxALL, 5 );
+
+	m_staticText53 = new wxStaticText( this, wxID_ANY, wxT("Temperature:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText53->Wrap( -1 );
+	gSizer2->Add( m_staticText53, 0, wxALL, 5 );
+
+	m_stTemperature = new wxStaticText( this, wxID_ANY, wxT("0 C"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stTemperature->Wrap( -1 );
+	gSizer2->Add( m_stTemperature, 0, wxALL, 5 );
+
+	m_staticText55 = new wxStaticText( this, wxID_ANY, wxT("Input range:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText55->Wrap( -1 );
+	gSizer2->Add( m_staticText55, 0, wxALL, 5 );
+
+	m_stInputRange = new wxStaticText( this, wxID_ANY, wxT("-0.5V...0.5V"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stInputRange->Wrap( -1 );
+	gSizer2->Add( m_stInputRange, 0, wxALL, 5 );
+
+	m_staticText57 = new wxStaticText( this, wxID_ANY, wxT("Calibrated range:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText57->Wrap( -1 );
+	gSizer2->Add( m_staticText57, 0, wxALL, 5 );
+
+	m_stCalibratedRange = new wxStaticText( this, wxID_ANY, wxT("-0.5V...0.5V"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stCalibratedRange->Wrap( -1 );
+	gSizer2->Add( m_stCalibratedRange, 0, wxALL, 5 );
+
+	m_staticText59 = new wxStaticText( this, wxID_ANY, wxT("Calibrated frequency:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText59->Wrap( -1 );
+	gSizer2->Add( m_staticText59, 0, wxALL, 5 );
+
+	m_stCalibratedFrequency = new wxStaticText( this, wxID_ANY, wxT("5.000 GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stCalibratedFrequency->Wrap( -1 );
+	gSizer2->Add( m_stCalibratedFrequency, 0, wxALL, 5 );
+
+	m_staticText61 = new wxStaticText( this, wxID_ANY, wxT("Current frequency:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText61->Wrap( -1 );
+	gSizer2->Add( m_staticText61, 0, wxALL, 5 );
+
+	m_stFrequency = new wxStaticText( this, wxID_ANY, wxT("5.000 GSPS"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_stFrequency->Wrap( -1 );
+	gSizer2->Add( m_stFrequency, 0, wxALL, 5 );
+
+
+	bSizer15->Add( gSizer2, 1, wxEXPAND, 5 );
+
+	m_button12 = new wxButton( this, wxID_OK, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer15->Add( m_button12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 15 );
+
+
+	this->SetSizer( bSizer15 );
+	this->Layout();
+	bSizer15->Fit( this );
+}
+
+InfoDialog_fb::~InfoDialog_fb()
+{
+}
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/DRSOsc.h
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/DRSOsc.h
@@ -1,604 +1,608 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 27 2012)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DRSOSC_H__
-#define __DRSOSC_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/string.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/menu.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/panel.h>
-#include <wx/slider.h>
-#include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/radiobut.h>
-#include <wx/bmpbuttn.h>
-#include <wx/statbox.h>
-#include <wx/stattext.h>
-#include <wx/radiobox.h>
-#include <wx/tglbtn.h>
-#include <wx/checkbox.h>
-#include <wx/frame.h>
-#include <wx/choice.h>
-#include <wx/textctrl.h>
-#include <wx/gauge.h>
-#include <wx/dialog.h>
-#include <wx/combobox.h>
-#include <wx/statline.h>
-#include <wx/statbmp.h>
-#include <wx/hyperlink.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-#define ID_CURSORA 1000
-#define ID_CURSORB 1001
-#define ID_TR_LEVEL 1002
-#define ID_RUN 1003
-#define ID_SINGLE 1004
-#define ID_TR_NORMAL 1005
-#define ID_TR_AUTO 1006
-#define ID_TR_POLARITY 1007
-#define ID_TRGCFG 1008
-#define ID_TR_DELAY 1009
-#define ID_TR_SOURCE 1010
-#define ID_HSCALEDOWN 1011
-#define ID_HSCALEUP 1012
-#define ID_HOR_POS 1013
-#define ID_CHON1 1014
-#define ID_POS1 1015
-#define ID_SCALEUP1 1016
-#define ID_SCALEDN1 1017
-#define ID_CHON2 1018
-#define ID_POS2 1019
-#define ID_SCALEUP2 1020
-#define ID_SCALEDN2 1021
-#define ID_CHON3 1022
-#define ID_POS3 1023
-#define ID_SCALEUP3 1024
-#define ID_SCALEDN3 1025
-#define ID_CHON4 1026
-#define ID_POS4 1027
-#define ID_SCALEUP4 1028
-#define ID_SCALEDN4 1029
-#define ID_CONFIG 1030
-#define ID_SAVE 1031
-#define ID_MEASURE 1032
-#define ID_PRINT 1033
-#define ID_ABOUT 1034
-#define ID_EXIT 1035
-#define ID_BSEL 1036
-#define ID_MULTI 1037
-#define ID_CH_HALF 1038
-#define ID_DISP_CALIBRATED 1039
-#define ID_DISP_CALIBRATED2 1040
-#define ID_DISP_ROTATED 1041
-#define ID_DISP_TCALIBRATED 1042
-#define ID_DISP_TRGCORR 1043
-#define ID_REFCLK 1044
-#define ID_DISPSAMPLE 1045
-#define ID_DISPAVERAGE 1046
-#define ID_DISPPERSIST 1047
-#define ID_DISPNUMBER 1048
-#define ID_PJ1 1049
-#define ID_PJ2 1050
-#define ID_PJ3 1051
-#define ID_PJ4 1052
-#define ID_LEVEL1 1053
-#define ID_LEVEL2 1054
-#define ID_LEVEL3 1055
-#define ID_LEVEL4 1056
-#define ID_PKPK1 1057
-#define ID_PKPK2 1058
-#define ID_PKPK3 1059
-#define ID_PKPK4 1060
-#define ID_RMS1 1061
-#define ID_RMS2 1062
-#define ID_RMS3 1063
-#define ID_RMS4 1064
-#define ID_VS1 1065
-#define ID_VS2 1066
-#define ID_VS3 1067
-#define ID_VS4 1068
-#define ID_CHRG1 1069
-#define ID_CHRG2 1070
-#define ID_CHRG3 1071
-#define ID_CHRG4 1072
-#define ID_FREQ1 1073
-#define ID_FREQ2 1074
-#define ID_FREQ3 1075
-#define ID_FREQ4 1076
-#define ID_PERIOD1 1077
-#define ID_PERIOD2 1078
-#define ID_PERIOD3 1079
-#define ID_PERIOD4 1080
-#define ID_RISE1 1081
-#define ID_RISE2 1082
-#define ID_RISE3 1083
-#define ID_RISE4 1084
-#define ID_FALL1 1085
-#define ID_FALL2 1086
-#define ID_FALL3 1087
-#define ID_FALL4 1088
-#define ID_POSWIDTH1 1089
-#define ID_POSWIDTH2 1090
-#define ID_POSWIDTH3 1091
-#define ID_POSWIDTH4 1092
-#define ID_NEGWIDTH1 1093
-#define ID_NEGWIDTH2 1094
-#define ID_NEGWIDTH3 1095
-#define ID_NEGWIDTH4 1096
-#define ID_CHNDELAY1 1097
-#define ID_CHNDELAY2 1098
-#define ID_CHNDELAY3 1099
-#define ID_CHNDELAY4 1100
-#define ID_HS1 1101
-#define ID_HS2 1102
-#define ID_HS3 1103
-#define ID_HS4 1104
-#define ID_OR1 1105
-#define ID_OR2 1106
-#define ID_OR3 1107
-#define ID_OR4 1108
-#define ID_OREXT 1109
-#define ID_AND1 1110
-#define ID_AND2 1111
-#define ID_AND3 1112
-#define ID_AND4 1113
-#define ID_ANDEXT 1114
-#define ID_TRANS 1115
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DOFrame_fb
-///////////////////////////////////////////////////////////////////////////////
-class DOFrame_fb : public wxFrame
-{
-	private:
-
-	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menu1;
-		wxMenu* m_menu4;
-		wxMenu* m_menu3;
-		wxMenu* m_menu2;
-		wxPanel* m_pnScreen;
-		wxPanel* m_pnControls;
-		wxSlider* m_slTrgLevel;
-		wxButton* m_btRun;
-		wxButton* m_btSingle;
-		wxRadioButton* m_rbNormal;
-		wxRadioButton* m_rbAuto;
-		wxBitmapButton* m_bpPolarity;
-		wxButton* m_btTrgCfg;
-		wxStaticText* m_staticText59;
-		wxStaticText* m_staticText60;
-		wxStaticText* m_staticText61;
-		wxSlider* m_slTrgDelay;
-		wxRadioBox* m_rbSource;
-		wxBitmapButton* m_bpButton2;
-		wxStaticText* m_stHScale;
-		wxBitmapButton* m_bpButton3;
-		wxSlider* m_slHOffset;
-		wxToggleButton* m_btCh1;
-		wxSlider* m_slPos1;
-		wxBitmapButton* m_bpButton4;
-		wxStaticText* m_stScale1;
-		wxBitmapButton* m_bpButton5;
-		wxToggleButton* m_btCh2;
-		wxSlider* m_slPos2;
-		wxBitmapButton* m_bpButton6;
-		wxStaticText* m_stScale2;
-		wxBitmapButton* m_bpButton7;
-		wxToggleButton* m_btCh3;
-		wxSlider* m_slPos3;
-		wxBitmapButton* m_bpButton8;
-		wxStaticText* m_stScale3;
-		wxBitmapButton* m_bpButton9;
-		wxToggleButton* m_btCh4;
-		wxSlider* m_slPos4;
-		wxBitmapButton* m_bpButton10;
-		wxStaticText* m_stScale4;
-		wxBitmapButton* m_bpButton11;
-		wxStaticText* m_staticText76;
-		wxToggleButton* m_toggleCursorA;
-		wxToggleButton* m_toggleCursorB;
-		wxCheckBox* m_checkBox8;
-		wxButton* m_btConfig;
-		wxButton* m_btSave;
-		wxButton* m_btMeasure;
-		wxButton* m_btDisplay;
-		wxButton* m_btPrint;
-		wxButton* m_btAbout;
-		wxButton* m_btExit;
-
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnSave( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPrint( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCursor( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSnap( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMeasure( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDisplay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbout( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTrgLevelChange( wxScrollEvent& event ) { event.Skip(); }
-		virtual void OnZero( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnTrigger( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTrgButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTrgDelayChange( wxScrollEvent& event ) { event.Skip(); }
-		virtual void OnHScaleChange( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHOffsetChange( wxScrollEvent& event ) { event.Skip(); }
-		virtual void OnChnOn( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPosChange( wxScrollEvent& event ) { event.Skip(); }
-		virtual void OnScaleChange( wxCommandEvent& event ) { event.Skip(); }
-
-
-	public:
-
-		DOFrame_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("DRS Oscilloscope"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1024,768 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-
-		~DOFrame_fb();
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class ConfigDialog_fb
-///////////////////////////////////////////////////////////////////////////////
-class ConfigDialog_fb : public wxDialog
-{
-	private:
-
-	protected:
-		wxChoice* m_cbBoard;
-		wxButton* m_btScan;
-		wxButton* m_btInfo;
-		wxCheckBox* m_cbMulti;
-		wxRadioBox* m_rbChHalf;
-		wxCheckBox* m_cbClkOn;
-		wxRadioBox* m_rbRange;
-		wxTextCtrl* m_tbFreq;
-		wxStaticText* m_staticText26;
-		wxCheckBox* m_cbLocked;
-		wxStaticText* m_staticText261;
-		wxStaticText* m_stActFreq;
-		wxCheckBox* m_cbCalOn;
-		wxTextCtrl* m_teCal;
-		wxSlider* m_slCal;
-		wxStaticText* m_staticText10;
-		wxCheckBox* m_cbCalibrated;
-		wxCheckBox* m_cbCalibrated2;
-		wxCheckBox* m_cbSpikes;
-		wxButton* m_button13;
-		wxGauge* m_gaugeCalVolt;
-		wxCheckBox* m_cbRotated;
-		wxCheckBox* m_cbTCalOn;
-		wxCheckBox* m_cbTrgCorr;
-		wxCheckBox* m_cbExtRefclk;
-		wxButton* m_button14;
-		wxGauge* m_gaugeCalTime;
-		wxButton* m_button10;
-
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnBoardSelect( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRescan( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChannelHalf( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnClkOn( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnInputRange( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnFreq( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLock( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCalOn( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCalEnter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCalSlider( wxScrollEvent& event ) { event.Skip(); }
-		virtual void OnDisplayWaveforms( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveSpikes( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonCalVolt( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonCalTime( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
-
-
-	public:
-
-		ConfigDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~ConfigDialog_fb();
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DisplayDialog_fb
-///////////////////////////////////////////////////////////////////////////////
-class DisplayDialog_fb : public wxDialog
-{
-	private:
-
-	protected:
-		wxCheckBox* m_checkBox7;
-		wxCheckBox* m_checkBox71;
-		wxCheckBox* m_checkBox88;
-		wxCheckBox* m_checkBox73;
-		wxRadioButton* m_rbShowSample;
-		wxRadioButton* m_rbShowAverage;
-		wxRadioButton* m_rbShowPersist;
-		wxStaticText* m_staticText59;
-		wxComboBox* m_cbNumber;
-		wxStaticText* m_staticText11;
-		wxStaticText* m_staticText12;
-		wxStaticText* m_staticText13;
-		wxStaticText* m_staticText14;
-		wxStaticText* m_staticText15;
-		wxStaticText* m_staticText17;
-		wxCheckBox* m_checkBox13;
-		wxCheckBox* m_checkBox14;
-		wxCheckBox* m_checkBox15;
-		wxCheckBox* m_checkBox16;
-		wxButton* m_button10;
-
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnDateTime( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowGrid( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLines( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnScalers( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDisplayMode( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
-
-
-	public:
-
-		DisplayDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Display"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~DisplayDialog_fb();
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class MeasureDialog_fb
-///////////////////////////////////////////////////////////////////////////////
-class MeasureDialog_fb : public wxDialog
-{
-	private:
-
-	protected:
-		wxStaticText* m_staticText11;
-		wxStaticText* m_staticText12;
-		wxStaticText* m_staticText13;
-		wxStaticText* m_staticText14;
-		wxStaticText* m_staticText15;
-		wxStaticText* m_staticText80;
-		wxStaticText* m_staticText81;
-		wxStaticText* m_staticText82;
-		wxStaticText* m_staticText83;
-		wxStaticText* m_staticText84;
-		wxStaticText* m_staticText16;
-		wxCheckBox* m_checkBox9;
-		wxCheckBox* m_checkBox10;
-		wxCheckBox* m_checkBox11;
-		wxCheckBox* m_checkBox12;
-		wxStaticText* m_staticText17;
-		wxCheckBox* m_checkBox13;
-		wxCheckBox* m_checkBox14;
-		wxCheckBox* m_checkBox15;
-		wxCheckBox* m_checkBox16;
-		wxStaticText* m_staticText19;
-		wxCheckBox* m_checkBox17;
-		wxCheckBox* m_checkBox18;
-		wxCheckBox* m_checkBox19;
-		wxCheckBox* m_checkBox20;
-		wxStaticText* m_staticText90;
-		wxCheckBox* m_checkBox74;
-		wxCheckBox* m_checkBox75;
-		wxCheckBox* m_checkBox76;
-		wxCheckBox* m_checkBox77;
-		wxStaticText* m_staticText91;
-		wxCheckBox* m_checkBox82;
-		wxCheckBox* m_checkBox83;
-		wxCheckBox* m_checkBox84;
-		wxCheckBox* m_checkBox85;
-		wxStaticLine* m_staticline4;
-		wxStaticLine* m_staticline41;
-		wxStaticLine* m_staticline42;
-		wxStaticLine* m_staticline43;
-		wxStaticLine* m_staticline44;
-		wxStaticText* m_staticText85;
-		wxStaticText* m_staticText86;
-		wxStaticText* m_staticText87;
-		wxStaticText* m_staticText88;
-		wxStaticText* m_staticText89;
-		wxStaticText* m_staticText20;
-		wxCheckBox* m_checkBox21;
-		wxCheckBox* m_checkBox22;
-		wxCheckBox* m_checkBox23;
-		wxCheckBox* m_checkBox24;
-		wxStaticText* m_staticText21;
-		wxCheckBox* m_checkBox25;
-		wxCheckBox* m_checkBox26;
-		wxCheckBox* m_checkBox27;
-		wxCheckBox* m_checkBox28;
-		wxStaticText* m_staticText22;
-		wxCheckBox* m_checkBox29;
-		wxCheckBox* m_checkBox30;
-		wxCheckBox* m_checkBox31;
-		wxCheckBox* m_checkBox32;
-		wxStaticText* m_staticText23;
-		wxCheckBox* m_checkBox33;
-		wxCheckBox* m_checkBox34;
-		wxCheckBox* m_checkBox35;
-		wxCheckBox* m_checkBox36;
-		wxStaticText* m_staticText221;
-		wxCheckBox* m_checkBox291;
-		wxCheckBox* m_checkBox2911;
-		wxCheckBox* m_checkBox2912;
-		wxCheckBox* m_checkBox2913;
-		wxStaticText* m_staticText2211;
-		wxCheckBox* m_checkBox2914;
-		wxCheckBox* m_checkBox2915;
-		wxCheckBox* m_checkBox2916;
-		wxCheckBox* m_checkBox2917;
-		wxStaticText* m_staticText231;
-		wxCheckBox* m_checkBox37;
-		wxCheckBox* m_checkBox38;
-		wxCheckBox* m_checkBox39;
-		wxCheckBox* m_checkBox40;
-		wxStaticText* m_staticText901;
-		wxCheckBox* m_checkBox78;
-		wxCheckBox* m_checkBox79;
-		wxCheckBox* m_checkBox80;
-		wxCheckBox* m_checkBox81;
-		wxStaticLine* m_staticline1;
-		wxCheckBox* m_cbStat;
-		wxCheckBox* m_cbHist;
-		wxStaticText* m_staticText27;
-		wxComboBox* m_cbNAverage;
-		wxStaticText* m_staticText271;
-		wxButton* m_button15;
-		wxStaticLine* m_staticline2;
-		wxCheckBox* m_cbIndicator;
-		wxStaticLine* m_staticline21;
-		wxButton* m_button11;
-
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStat( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHist( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStatNAverage( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStatReset( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnIndicator( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
-
-
-	public:
-
-		MeasureDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Select Measurements"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~MeasureDialog_fb();
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class TriggerDialog_fb
-///////////////////////////////////////////////////////////////////////////////
-class TriggerDialog_fb : public wxDialog
-{
-	private:
-
-	protected:
-		wxStaticText* m_staticText12;
-		wxStaticText* m_staticText13;
-		wxStaticText* m_staticText14;
-		wxStaticText* m_staticText15;
-		wxStaticText* m_staticText16;
-		wxStaticLine* m_staticline11;
-		wxStaticText* m_staticText771;
-		wxCheckBox* m_cbOR1;
-		wxStaticText* m_staticText17;
-		wxCheckBox* m_cbOR2;
-		wxStaticText* m_staticText171;
-		wxCheckBox* m_cbOR3;
-		wxStaticText* m_staticText172;
-		wxCheckBox* m_cbOR4;
-		wxStaticText* m_staticText173;
-		wxCheckBox* m_cbOREXT;
-		wxStaticText* m_staticText84;
-		wxCheckBox* m_cbAND1;
-		wxStaticText* m_staticText18;
-		wxCheckBox* m_cbAND2;
-		wxStaticText* m_staticText181;
-		wxCheckBox* m_cbAND3;
-		wxStaticText* m_staticText182;
-		wxCheckBox* m_cbAND4;
-		wxStaticText* m_staticText183;
-		wxCheckBox* m_cbANDEXT;
-		wxCheckBox* m_cbTrans;
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticText77;
-		wxTextCtrl* m_tbLevel1;
-		wxTextCtrl* m_tbLevel2;
-		wxTextCtrl* m_tbLevel3;
-		wxTextCtrl* m_tbLevel4;
-		wxStaticText* m_staticText78;
-		wxStaticLine* m_staticline25;
-		wxButton* m_button11;
-
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTriggerLevel( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
-
-
-	public:
-
-		TriggerDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Configure Trigger"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-		~TriggerDialog_fb();
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class AboutDialog_fb
-///////////////////////////////////////////////////////////////////////////////
-class AboutDialog_fb : public wxDialog
-{
-	private:
-
-	protected:
-		wxStaticText* m_staticText18;
-		wxStaticText* m_stVersion;
-		wxStaticText* m_stBuild;
-		wxStaticText* m_staticText20;
-		wxStaticText* m_staticText21;
-		wxStaticBitmap* m_bitmap1;
-		wxStaticText* m_staticText23;
-		wxHyperlinkCtrl* m_hyperlink1;
-		wxButton* m_button12;
-
-	public:
-
-		AboutDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~AboutDialog_fb();
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class InfoDialog_fb
-///////////////////////////////////////////////////////////////////////////////
-class InfoDialog_fb : public wxDialog
-{
-	private:
-
-	protected:
-		wxStaticText* m_staticText45;
-		wxStaticText* m_stBoardType;
-		wxStaticText* m_staticText47;
-		wxStaticText* m_stDRSType;
-		wxStaticText* m_staticText49;
-		wxStaticText* m_stSerialNumber;
-		wxStaticText* m_staticText51;
-		wxStaticText* m_stFirmwareRevision;
-		wxStaticText* m_staticText53;
-		wxStaticText* m_stTemperature;
-		wxStaticText* m_staticText55;
-		wxStaticText* m_stInputRange;
-		wxStaticText* m_staticText57;
-		wxStaticText* m_stCalibratedRange;
-		wxStaticText* m_staticText59;
-		wxStaticText* m_stCalibratedFrequency;
-		wxStaticText* m_staticText61;
-		wxStaticText* m_stFrequency;
-		wxButton* m_button12;
-
-	public:
-
-		InfoDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Info"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~InfoDialog_fb();
-
-};
-
-#endif //__DRSOSC_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO *NOT* EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/menu.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/panel.h>
+#include <wx/slider.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/radiobut.h>
+#include <wx/bmpbuttn.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/radiobox.h>
+#include <wx/tglbtn.h>
+#include <wx/checkbox.h>
+#include <wx/frame.h>
+#include <wx/choice.h>
+#include <wx/textctrl.h>
+#include <wx/gauge.h>
+#include <wx/dialog.h>
+#include <wx/combobox.h>
+#include <wx/statline.h>
+#include <wx/statbmp.h>
+#include <wx/hyperlink.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+#define ID_CURSORA 1000
+#define ID_CURSORB 1001
+#define ID_TR_LEVEL 1002
+#define ID_RUN 1003
+#define ID_SINGLE 1004
+#define ID_TR_NORMAL 1005
+#define ID_TR_AUTO 1006
+#define ID_TR_POLARITY 1007
+#define ID_TRGCFG 1008
+#define ID_TR_DELAY 1009
+#define ID_TR_SOURCE 1010
+#define ID_HSCALEDOWN 1011
+#define ID_HSCALEUP 1012
+#define ID_HOR_POS 1013
+#define ID_CHON1 1014
+#define ID_POS1 1015
+#define ID_SCALEUP1 1016
+#define ID_SCALEDN1 1017
+#define ID_CHON2 1018
+#define ID_POS2 1019
+#define ID_SCALEUP2 1020
+#define ID_SCALEDN2 1021
+#define ID_CHON3 1022
+#define ID_POS3 1023
+#define ID_SCALEUP3 1024
+#define ID_SCALEDN3 1025
+#define ID_CHON4 1026
+#define ID_POS4 1027
+#define ID_SCALEUP4 1028
+#define ID_SCALEDN4 1029
+#define ID_CONFIG 1030
+#define ID_SAVE 1031
+#define ID_MEASURE 1032
+#define ID_PRINT 1033
+#define ID_ABOUT 1034
+#define ID_EXIT 1035
+#define ID_BSEL 1036
+#define ID_MULTI 1037
+#define ID_CH_HALF 1038
+#define ID_DISP_CALIBRATED 1039
+#define ID_DISP_CALIBRATED2 1040
+#define ID_DISP_ROTATED 1041
+#define ID_DISP_TCALIBRATED 1042
+#define ID_DISP_TRGCORR 1043
+#define ID_REFCLK 1044
+#define ID_DISPSAMPLE 1045
+#define ID_DISPAVERAGE 1046
+#define ID_DISPPERSIST 1047
+#define ID_DISPNUMBER 1048
+#define ID_PJ1 1049
+#define ID_PJ2 1050
+#define ID_PJ3 1051
+#define ID_PJ4 1052
+#define ID_LEVEL1 1053
+#define ID_LEVEL2 1054
+#define ID_LEVEL3 1055
+#define ID_LEVEL4 1056
+#define ID_PKPK1 1057
+#define ID_PKPK2 1058
+#define ID_PKPK3 1059
+#define ID_PKPK4 1060
+#define ID_RMS1 1061
+#define ID_RMS2 1062
+#define ID_RMS3 1063
+#define ID_RMS4 1064
+#define ID_VS1 1065
+#define ID_VS2 1066
+#define ID_VS3 1067
+#define ID_VS4 1068
+#define ID_CHRG1 1069
+#define ID_CHRG2 1070
+#define ID_CHRG3 1071
+#define ID_CHRG4 1072
+#define ID_FREQ1 1073
+#define ID_FREQ2 1074
+#define ID_FREQ3 1075
+#define ID_FREQ4 1076
+#define ID_PERIOD1 1077
+#define ID_PERIOD2 1078
+#define ID_PERIOD3 1079
+#define ID_PERIOD4 1080
+#define ID_RISE1 1081
+#define ID_RISE2 1082
+#define ID_RISE3 1083
+#define ID_RISE4 1084
+#define ID_FALL1 1085
+#define ID_FALL2 1086
+#define ID_FALL3 1087
+#define ID_FALL4 1088
+#define ID_POSWIDTH1 1089
+#define ID_POSWIDTH2 1090
+#define ID_POSWIDTH3 1091
+#define ID_POSWIDTH4 1092
+#define ID_NEGWIDTH1 1093
+#define ID_NEGWIDTH2 1094
+#define ID_NEGWIDTH3 1095
+#define ID_NEGWIDTH4 1096
+#define ID_CHNDELAY1 1097
+#define ID_CHNDELAY2 1098
+#define ID_CHNDELAY3 1099
+#define ID_CHNDELAY4 1100
+#define ID_HS1 1101
+#define ID_HS2 1102
+#define ID_HS3 1103
+#define ID_HS4 1104
+#define ID_OR1 1105
+#define ID_OR2 1106
+#define ID_OR3 1107
+#define ID_OR4 1108
+#define ID_OREXT 1109
+#define ID_AND1 1110
+#define ID_AND2 1111
+#define ID_AND3 1112
+#define ID_AND4 1113
+#define ID_ANDEXT 1114
+#define ID_TRANS 1115
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DOFrame_fb
+///////////////////////////////////////////////////////////////////////////////
+class DOFrame_fb : public wxFrame
+{
+	private:
+
+	protected:
+		wxMenuBar* m_menubar1;
+		wxMenu* m_menu1;
+		wxMenu* m_menu4;
+		wxMenu* m_menu3;
+		wxMenu* m_menu2;
+		wxPanel* m_pnScreen;
+		wxPanel* m_pnControls;
+		wxSlider* m_slTrgLevel;
+		wxButton* m_btRun;
+		wxButton* m_btSingle;
+		wxRadioButton* m_rbNormal;
+		wxRadioButton* m_rbAuto;
+		wxBitmapButton* m_bpPolarity;
+		wxButton* m_btTrgCfg;
+		wxStaticText* m_staticText59;
+		wxStaticText* m_staticText60;
+		wxStaticText* m_staticText61;
+		wxSlider* m_slTrgDelay;
+		wxRadioBox* m_rbSource;
+		wxBitmapButton* m_bpButton2;
+		wxStaticText* m_stHScale;
+		wxBitmapButton* m_bpButton3;
+		wxSlider* m_slHOffset;
+		wxToggleButton* m_btCh1;
+		wxSlider* m_slPos1;
+		wxBitmapButton* m_bpButton4;
+		wxStaticText* m_stScale1;
+		wxBitmapButton* m_bpButton5;
+		wxToggleButton* m_btCh2;
+		wxSlider* m_slPos2;
+		wxBitmapButton* m_bpButton6;
+		wxStaticText* m_stScale2;
+		wxBitmapButton* m_bpButton7;
+		wxToggleButton* m_btCh3;
+		wxSlider* m_slPos3;
+		wxBitmapButton* m_bpButton8;
+		wxStaticText* m_stScale3;
+		wxBitmapButton* m_bpButton9;
+		wxToggleButton* m_btCh4;
+		wxSlider* m_slPos4;
+		wxBitmapButton* m_bpButton10;
+		wxStaticText* m_stScale4;
+		wxBitmapButton* m_bpButton11;
+		wxStaticText* m_staticText76;
+		wxToggleButton* m_toggleCursorA;
+		wxToggleButton* m_toggleCursorB;
+		wxCheckBox* m_checkBox8;
+		wxButton* m_btConfig;
+		wxButton* m_btSave;
+		wxButton* m_btMeasure;
+		wxButton* m_btDisplay;
+		wxButton* m_btPrint;
+		wxButton* m_btAbout;
+		wxButton* m_btExit;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnSave( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrint( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCursor( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSnap( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfig( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMeasure( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDisplay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAbout( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTrgLevelChange( wxScrollEvent& event ) { event.Skip(); }
+		virtual void OnZero( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnTrigger( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTrgButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTrgDelayChange( wxScrollEvent& event ) { event.Skip(); }
+		virtual void OnHScaleChange( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHOffsetChange( wxScrollEvent& event ) { event.Skip(); }
+		virtual void OnChnOn( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPosChange( wxScrollEvent& event ) { event.Skip(); }
+		virtual void OnScaleChange( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		DOFrame_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("DRS Oscilloscope"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1024,768 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+		~DOFrame_fb();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class ConfigDialog_fb
+///////////////////////////////////////////////////////////////////////////////
+class ConfigDialog_fb : public wxDialog
+{
+	private:
+
+	protected:
+		wxChoice* m_cbBoard;
+		wxButton* m_btScan;
+		wxButton* m_btInfo;
+		wxCheckBox* m_cbMulti;
+		wxRadioBox* m_rbChHalf;
+		wxCheckBox* m_cbClkOn;
+		wxRadioBox* m_rbRange;
+		wxTextCtrl* m_tbFreq;
+		wxStaticText* m_staticText26;
+		wxCheckBox* m_cbLocked;
+		wxStaticText* m_staticText261;
+		wxStaticText* m_stActFreq;
+		wxCheckBox* m_cbCalOn;
+		wxTextCtrl* m_teCal;
+		wxSlider* m_slCal;
+		wxStaticText* m_staticText10;
+		wxCheckBox* m_cbCalibrated;
+		wxCheckBox* m_cbCalibrated2;
+		wxCheckBox* m_cbSpikes;
+		wxButton* m_button13;
+		wxGauge* m_gaugeCalVolt;
+		wxCheckBox* m_cbRotated;
+		wxCheckBox* m_cbTCalOn;
+		wxCheckBox* m_cbTrgCorr;
+		wxCheckBox* m_cbExtRefclk;
+		wxButton* m_button14;
+		wxGauge* m_gaugeCalTime;
+		wxButton* m_button10;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnBoardSelect( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRescan( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChannelHalf( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClkOn( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInputRange( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnFreq( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLock( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCalOn( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCalEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCalSlider( wxScrollEvent& event ) { event.Skip(); }
+		virtual void OnDisplayWaveforms( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemoveSpikes( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCalVolt( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCalTime( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		ConfigDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+		~ConfigDialog_fb();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DisplayDialog_fb
+///////////////////////////////////////////////////////////////////////////////
+class DisplayDialog_fb : public wxDialog
+{
+	private:
+
+	protected:
+		wxCheckBox* m_checkBox7;
+		wxCheckBox* m_checkBox71;
+		wxCheckBox* m_checkBox88;
+		wxCheckBox* m_checkBox73;
+		wxRadioButton* m_rbShowSample;
+		wxRadioButton* m_rbShowAverage;
+		wxRadioButton* m_rbShowPersist;
+		wxStaticText* m_staticText59;
+		wxComboBox* m_cbNumber;
+		wxStaticText* m_staticText11;
+		wxStaticText* m_staticText12;
+		wxStaticText* m_staticText13;
+		wxStaticText* m_staticText14;
+		wxStaticText* m_staticText15;
+		wxStaticText* m_staticText17;
+		wxCheckBox* m_checkBox13;
+		wxCheckBox* m_checkBox14;
+		wxCheckBox* m_checkBox15;
+		wxCheckBox* m_checkBox16;
+		wxButton* m_button10;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnDateTime( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowGrid( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLines( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnScalers( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDisplayMode( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		DisplayDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Display"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+		~DisplayDialog_fb();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class MeasureDialog_fb
+///////////////////////////////////////////////////////////////////////////////
+class MeasureDialog_fb : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_staticText11;
+		wxStaticText* m_staticText12;
+		wxStaticText* m_staticText13;
+		wxStaticText* m_staticText14;
+		wxStaticText* m_staticText15;
+		wxStaticText* m_staticText80;
+		wxStaticText* m_staticText81;
+		wxStaticText* m_staticText82;
+		wxStaticText* m_staticText83;
+		wxStaticText* m_staticText84;
+		wxStaticText* m_staticText16;
+		wxCheckBox* m_checkBox9;
+		wxCheckBox* m_checkBox10;
+		wxCheckBox* m_checkBox11;
+		wxCheckBox* m_checkBox12;
+		wxStaticText* m_staticText17;
+		wxCheckBox* m_checkBox13;
+		wxCheckBox* m_checkBox14;
+		wxCheckBox* m_checkBox15;
+		wxCheckBox* m_checkBox16;
+		wxStaticText* m_staticText19;
+		wxCheckBox* m_checkBox17;
+		wxCheckBox* m_checkBox18;
+		wxCheckBox* m_checkBox19;
+		wxCheckBox* m_checkBox20;
+		wxStaticText* m_staticText90;
+		wxCheckBox* m_checkBox74;
+		wxCheckBox* m_checkBox75;
+		wxCheckBox* m_checkBox76;
+		wxCheckBox* m_checkBox77;
+		wxStaticText* m_staticText91;
+		wxCheckBox* m_checkBox82;
+		wxCheckBox* m_checkBox83;
+		wxCheckBox* m_checkBox84;
+		wxCheckBox* m_checkBox85;
+		wxStaticLine* m_staticline4;
+		wxStaticLine* m_staticline41;
+		wxStaticLine* m_staticline42;
+		wxStaticLine* m_staticline43;
+		wxStaticLine* m_staticline44;
+		wxStaticText* m_staticText85;
+		wxStaticText* m_staticText86;
+		wxStaticText* m_staticText87;
+		wxStaticText* m_staticText88;
+		wxStaticText* m_staticText89;
+		wxStaticText* m_staticText20;
+		wxCheckBox* m_checkBox21;
+		wxCheckBox* m_checkBox22;
+		wxCheckBox* m_checkBox23;
+		wxCheckBox* m_checkBox24;
+		wxStaticText* m_staticText21;
+		wxCheckBox* m_checkBox25;
+		wxCheckBox* m_checkBox26;
+		wxCheckBox* m_checkBox27;
+		wxCheckBox* m_checkBox28;
+		wxStaticText* m_staticText22;
+		wxCheckBox* m_checkBox29;
+		wxCheckBox* m_checkBox30;
+		wxCheckBox* m_checkBox31;
+		wxCheckBox* m_checkBox32;
+		wxStaticText* m_staticText23;
+		wxCheckBox* m_checkBox33;
+		wxCheckBox* m_checkBox34;
+		wxCheckBox* m_checkBox35;
+		wxCheckBox* m_checkBox36;
+		wxStaticText* m_staticText221;
+		wxCheckBox* m_checkBox291;
+		wxCheckBox* m_checkBox2911;
+		wxCheckBox* m_checkBox2912;
+		wxCheckBox* m_checkBox2913;
+		wxStaticText* m_staticText2211;
+		wxCheckBox* m_checkBox2914;
+		wxCheckBox* m_checkBox2915;
+		wxCheckBox* m_checkBox2916;
+		wxCheckBox* m_checkBox2917;
+		wxStaticText* m_staticText231;
+		wxCheckBox* m_checkBox37;
+		wxCheckBox* m_checkBox38;
+		wxCheckBox* m_checkBox39;
+		wxCheckBox* m_checkBox40;
+		wxStaticText* m_staticText901;
+		wxCheckBox* m_checkBox78;
+		wxCheckBox* m_checkBox79;
+		wxCheckBox* m_checkBox80;
+		wxCheckBox* m_checkBox81;
+		wxStaticLine* m_staticline1;
+		wxCheckBox* m_cbStat;
+		wxCheckBox* m_cbHist;
+		wxStaticText* m_staticText27;
+		wxComboBox* m_cbNAverage;
+		wxStaticText* m_staticText271;
+		wxButton* m_button15;
+		wxStaticLine* m_staticline2;
+		wxCheckBox* m_cbIndicator;
+		wxStaticLine* m_staticline21;
+		wxButton* m_button11;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnStat( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHist( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnStatNAverage( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnStatReset( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnIndicator( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		MeasureDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Select Measurements"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+		~MeasureDialog_fb();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class TriggerDialog_fb
+///////////////////////////////////////////////////////////////////////////////
+class TriggerDialog_fb : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_staticText12;
+		wxStaticText* m_staticText13;
+		wxStaticText* m_staticText14;
+		wxStaticText* m_staticText15;
+		wxStaticText* m_staticText16;
+		wxStaticLine* m_staticline11;
+		wxStaticText* m_staticText771;
+		wxCheckBox* m_cbOR1;
+		wxStaticText* m_staticText17;
+		wxCheckBox* m_cbOR2;
+		wxStaticText* m_staticText171;
+		wxCheckBox* m_cbOR3;
+		wxStaticText* m_staticText172;
+		wxCheckBox* m_cbOR4;
+		wxStaticText* m_staticText173;
+		wxCheckBox* m_cbOREXT;
+		wxStaticText* m_staticText84;
+		wxCheckBox* m_cbAND1;
+		wxStaticText* m_staticText18;
+		wxCheckBox* m_cbAND2;
+		wxStaticText* m_staticText181;
+		wxCheckBox* m_cbAND3;
+		wxStaticText* m_staticText182;
+		wxCheckBox* m_cbAND4;
+		wxStaticText* m_staticText183;
+		wxCheckBox* m_cbANDEXT;
+		wxCheckBox* m_cbTrans;
+		wxStaticLine* m_staticline10;
+		wxStaticText* m_staticText77;
+		wxTextCtrl* m_tbLevel1;
+		wxTextCtrl* m_tbLevel2;
+		wxTextCtrl* m_tbLevel3;
+		wxTextCtrl* m_tbLevel4;
+		wxStaticText* m_staticText78;
+		wxStaticLine* m_staticline25;
+		wxButton* m_button11;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTriggerLevel( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		TriggerDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Configure Trigger"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+		~TriggerDialog_fb();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class AboutDialog_fb
+///////////////////////////////////////////////////////////////////////////////
+class AboutDialog_fb : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_staticText18;
+		wxStaticText* m_stVersion;
+		wxStaticText* m_stBuild;
+		wxStaticText* m_staticText20;
+		wxStaticText* m_staticText21;
+		wxStaticBitmap* m_bitmap1;
+		wxStaticText* m_staticText23;
+		wxHyperlinkCtrl* m_hyperlink1;
+		wxButton* m_button12;
+
+	public:
+
+		AboutDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+		~AboutDialog_fb();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class InfoDialog_fb
+///////////////////////////////////////////////////////////////////////////////
+class InfoDialog_fb : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_staticText45;
+		wxStaticText* m_stBoardType;
+		wxStaticText* m_staticText47;
+		wxStaticText* m_stDRSType;
+		wxStaticText* m_staticText49;
+		wxStaticText* m_stSerialNumber;
+		wxStaticText* m_staticText51;
+		wxStaticText* m_stFirmwareRevision;
+		wxStaticText* m_staticText53;
+		wxStaticText* m_stTemperature;
+		wxStaticText* m_staticText55;
+		wxStaticText* m_stInputRange;
+		wxStaticText* m_staticText57;
+		wxStaticText* m_stCalibratedRange;
+		wxStaticText* m_staticText59;
+		wxStaticText* m_stCalibratedFrequency;
+		wxStaticText* m_staticText61;
+		wxStaticText* m_stFrequency;
+		wxButton* m_button12;
+
+	public:
+
+		InfoDialog_fb( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Info"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+		~InfoDialog_fb();
+
+};
+
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/down.xpm
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/down.xpm
@@ -1,27 +1,39 @@
 /* XPM */
-static const char *down_xpm[]={
-"28 20 4 1",
-". c None",
-"a c #808080",
-"b c #c0c0c0",
-"# c #ffffff",
-"............................",
-"............................",
-"............................",
-".#########################a.",
-".#bbbbbbbbbbbbbbbbbbbbbbbba.",
-"..bbbbbbbbbbbbbbbbbbbbbbbba.",
-"...bbbbbbbbbbbbbbbbbbbbbbaa.",
-"....bbbbbbbbbbbbbbbbbbbbaa..",
-".....bbbbbbbbbbbbbbbbbbaa...",
-"......bbbbbbbbbbbbbbbbaa....",
-".......bbbbbbbbbbbbbbaa.....",
-"........bbbbbbbbbbbbaa......",
-".........bbbbbbbbbbaa.......",
-"..........bbbbbbbbaa........",
-"...........bbbbbbaa.........",
-"............bbbbaa..........",
-".............bbaa...........",
-"..............aa............",
-"............................",
-"............................"};
+static char * down_xpm[] = {
+"24 17 19 1",
+" 	c None",
+".	c #F7F7F7",
+"+	c #DBDBDB",
+"@	c #DCDCDC",
+"#	c #DDDDDD",
+"$	c #9F9F9F",
+"%	c #BFBFBF",
+"&	c #C0C0C0",
+"*	c #949494",
+"=	c #A1A1A1",
+"-	c #828282",
+";	c #BEBEBE",
+">	c #A3A3A3",
+",	c #808080",
+"'	c #7E7E7E",
+")	c #7F7F7F",
+"!	c #9E9E9E",
+"~	c #9D9D9D",
+"{	c #818181",
+"                        ",
+"                        ",
+"                        ",
+" .+@@@@@@@@@@@@@@@@@@#$ ",
+"  %%%%%%%%%%%%%%%%%%%&* ",
+"   &&&&&&&&&&&&&&&&&%=- ",
+"    &&&&&&&&&&&&&&&;>,  ",
+"     &&&&&&&&&&&&&;>'   ",
+"      &&&&&&&&&&&&=)    ",
+"       &&&&&&&&&&!,     ",
+"        &&&&&&&&~-      ",
+"         &&&&&%${       ",
+"          &&&;=)        ",
+"           &;='         ",
+"            ~)          ",
+"                        ",
+"                        "};
--- /dev/null
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/drsosc.cfg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- created by MXML on Wed Mar 30 13:13:21 2022 -->
+<DRSOsc>
+  <MultiBoard>0</MultiBoard>
+  <SplitMode>0</SplitMode>
+  <TranspTrig>0</TranspTrig>
+</DRSOsc>
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/drsosc.fbp
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/drsosc.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="11" />
+    <FileVersion major="1" minor="16" />
     <object class="Project" expanded="1">
         <property name="class_decoration">; </property>
         <property name="code_generation">C++</property>
@@ -14,17 +14,22 @@
         <property name="file">DRSOsc</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
+        <property name="indent_with_spaces"></property>
         <property name="internationalize">0</property>
         <property name="name">DRSOsc</property>
         <property name="namespace"></property>
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
-        <object class="Frame" expanded="0">
+        <object class="Frame" expanded="1">
             <property name="aui_managed">0</property>
             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
             <property name="bg"></property>
@@ -47,46 +52,12 @@
             <property name="subclass"></property>
             <property name="title">DRS Oscilloscope</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style">wxTAB_TRAVERSAL</property>
             <property name="xrc_skip_sizer">1</property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="0">
+            <object class="wxMenuBar" expanded="1">
                 <property name="bg"></property>
                 <property name="context_help"></property>
                 <property name="context_menu">1</property>
@@ -95,7 +66,6 @@
                 <property name="font"></property>
                 <property name="hidden">0</property>
                 <property name="id">wxID_ANY</property>
-                <property name="label">MyMenuBar</property>
                 <property name="maximum_size"></property>
                 <property name="minimum_size"></property>
                 <property name="name">m_menubar1</property>
@@ -108,29 +78,6 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style"></property>
-                <event name="OnChar"></event>
-                <event name="OnEnterWindow"></event>
-                <event name="OnEraseBackground"></event>
-                <event name="OnKeyDown"></event>
-                <event name="OnKeyUp"></event>
-                <event name="OnKillFocus"></event>
-                <event name="OnLeaveWindow"></event>
-                <event name="OnLeftDClick"></event>
-                <event name="OnLeftDown"></event>
-                <event name="OnLeftUp"></event>
-                <event name="OnMiddleDClick"></event>
-                <event name="OnMiddleDown"></event>
-                <event name="OnMiddleUp"></event>
-                <event name="OnMotion"></event>
-                <event name="OnMouseEvents"></event>
-                <event name="OnMouseWheel"></event>
-                <event name="OnPaint"></event>
-                <event name="OnRightDClick"></event>
-                <event name="OnRightDown"></event>
-                <event name="OnRightUp"></event>
-                <event name="OnSetFocus"></event>
-                <event name="OnSize"></event>
-                <event name="OnUpdateUI"></event>
                 <object class="wxMenu" expanded="0">
                     <property name="label">&amp;File</property>
                     <property name="name">m_menu1</property>
@@ -148,7 +95,6 @@
                         <property name="shortcut">Ctrl+S</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnSave</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
@@ -163,7 +109,6 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnPrint</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="0">
                         <property name="name">m_separator1</property>
@@ -182,7 +127,6 @@
                         <property name="shortcut">Ctrl+X</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnExit</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="wxMenu" expanded="0">
@@ -202,7 +146,6 @@
                         <property name="shortcut">Ctrl+A</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnCursor</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
@@ -217,7 +160,6 @@
                         <property name="shortcut">Ctrl+B</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnCursor</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
@@ -232,7 +174,6 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnSnap</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="wxMenu" expanded="0">
@@ -252,7 +193,6 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnConfig</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
@@ -267,7 +207,6 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnMeasure</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
@@ -282,7 +221,6 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnDisplay</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="wxMenu" expanded="0">
@@ -302,11 +240,10 @@
                         <property name="shortcut">F1</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnAbout</event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
             </object>
-            <object class="wxBoxSizer" expanded="0">
+            <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer1</property>
                 <property name="orient">wxHORIZONTAL</property>
@@ -365,37 +302,14 @@
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
-                        <property name="window_style">wxSUNKEN_BORDER</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
+                        <property name="window_style">wxBORDER_SUNKEN</property>
                     </object>
                 </object>
-                <object class="sizeritem" expanded="0">
+                <object class="sizeritem" expanded="1">
                     <property name="border">0</property>
                     <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
                     <property name="proportion">0</property>
-                    <object class="wxPanel" expanded="0">
+                    <object class="wxPanel" expanded="1">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -445,32 +359,9 @@
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
-                        <property name="window_style">wxSUNKEN_BORDER|wxTAB_TRAVERSAL</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
+                        <property name="window_style">wxTAB_TRAVERSAL|wxBORDER_SUNKEN</property>
                         <object class="wxBoxSizer" expanded="0">
-                            <property name="minimum_size"></property>
+                            <property name="minimum_size">256,-1</property>
                             <property name="name">bSizer2</property>
                             <property name="orient">wxVERTICAL</property>
                             <property name="permission">none</property>
@@ -484,8 +375,8 @@
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer1</property>
                                     <property name="orient">wxVERTICAL</property>
+                                    <property name="parent">1</property>
                                     <property name="permission">none</property>
-                                    <event name="OnUpdateUI"></event>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">2</property>
                                         <property name="flag">wxEXPAND</property>
@@ -534,7 +425,7 @@
                                                     <property name="minValue">-500</property>
                                                     <property name="min_size"></property>
                                                     <property name="minimize_button">0</property>
-                                                    <property name="minimum_size"></property>
+                                                    <property name="minimum_size">30,150</property>
                                                     <property name="moveable">1</property>
                                                     <property name="name">m_slTrgLevel</property>
                                                     <property name="pane_border">1</property>
@@ -545,7 +436,7 @@
                                                     <property name="pos"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
-                                                    <property name="size">20,120</property>
+                                                    <property name="size">24,120</property>
                                                     <property name="style">wxSL_VERTICAL</property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
@@ -557,50 +448,10 @@
                                                     <property name="value">-250</property>
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
-                                                    <property name="window_style">wxSTATIC_BORDER</property>
-                                                    <event name="OnChar"></event>
+                                                    <property name="window_style">wxBORDER_STATIC</property>
                                                     <event name="OnCommandScroll">OnTrgLevelChange</event>
-                                                    <event name="OnCommandScrollBottom"></event>
-                                                    <event name="OnCommandScrollChanged"></event>
-                                                    <event name="OnCommandScrollLineDown"></event>
-                                                    <event name="OnCommandScrollLineUp"></event>
-                                                    <event name="OnCommandScrollPageDown"></event>
-                                                    <event name="OnCommandScrollPageUp"></event>
-                                                    <event name="OnCommandScrollThumbRelease"></event>
-                                                    <event name="OnCommandScrollThumbTrack"></event>
-                                                    <event name="OnCommandScrollTop"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
                                                     <event name="OnLeftDClick">OnZero</event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
                                                     <event name="OnRightDown">OnZero</event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnScroll"></event>
-                                                    <event name="OnScrollBottom"></event>
-                                                    <event name="OnScrollChanged"></event>
-                                                    <event name="OnScrollLineDown"></event>
-                                                    <event name="OnScrollLineUp"></event>
-                                                    <event name="OnScrollPageDown"></event>
-                                                    <event name="OnScrollPageUp"></event>
-                                                    <event name="OnScrollThumbRelease"></event>
-                                                    <event name="OnScrollThumbTrack"></event>
-                                                    <event name="OnScrollTop"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -634,27 +485,34 @@
                                                                     <property name="aui_name"></property>
                                                                     <property name="aui_position"></property>
                                                                     <property name="aui_row"></property>
+                                                                    <property name="auth_needed">0</property>
                                                                     <property name="best_size"></property>
                                                                     <property name="bg"></property>
+                                                                    <property name="bitmap"></property>
                                                                     <property name="caption"></property>
                                                                     <property name="caption_visible">1</property>
                                                                     <property name="center_pane">0</property>
                                                                     <property name="close_button">1</property>
                                                                     <property name="context_help"></property>
                                                                     <property name="context_menu">1</property>
+                                                                    <property name="current"></property>
                                                                     <property name="default">0</property>
                                                                     <property name="default_pane">0</property>
+                                                                    <property name="disabled"></property>
                                                                     <property name="dock">Dock</property>
                                                                     <property name="dock_fixed">0</property>
                                                                     <property name="docking">Left</property>
                                                                     <property name="enabled">1</property>
                                                                     <property name="fg"></property>
                                                                     <property name="floatable">1</property>
+                                                                    <property name="focus"></property>
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">ID_RUN</property>
                                                                     <property name="label">Stop</property>
+                                                                    <property name="margins"></property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -669,6 +527,8 @@
                                                                     <property name="permission">protected</property>
                                                                     <property name="pin_button">1</property>
                                                                     <property name="pos"></property>
+                                                                    <property name="position"></property>
+                                                                    <property name="pressed"></property>
                                                                     <property name="resize">Resizable</property>
                                                                     <property name="show">1</property>
                                                                     <property name="size">-1,-1</property>
@@ -684,29 +544,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <event name="OnButtonClick">OnTrigger</event>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                             <object class="sizeritem" expanded="0">
@@ -722,27 +559,34 @@
                                                                     <property name="aui_name"></property>
                                                                     <property name="aui_position"></property>
                                                                     <property name="aui_row"></property>
+                                                                    <property name="auth_needed">0</property>
                                                                     <property name="best_size"></property>
                                                                     <property name="bg"></property>
+                                                                    <property name="bitmap"></property>
                                                                     <property name="caption"></property>
                                                                     <property name="caption_visible">1</property>
                                                                     <property name="center_pane">0</property>
                                                                     <property name="close_button">1</property>
                                                                     <property name="context_help"></property>
                                                                     <property name="context_menu">1</property>
+                                                                    <property name="current"></property>
                                                                     <property name="default">0</property>
                                                                     <property name="default_pane">0</property>
+                                                                    <property name="disabled"></property>
                                                                     <property name="dock">Dock</property>
                                                                     <property name="dock_fixed">0</property>
                                                                     <property name="docking">Left</property>
                                                                     <property name="enabled">1</property>
                                                                     <property name="fg"></property>
                                                                     <property name="floatable">1</property>
+                                                                    <property name="focus"></property>
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">ID_SINGLE</property>
                                                                     <property name="label">Single</property>
+                                                                    <property name="margins"></property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -757,6 +601,8 @@
                                                                     <property name="permission">protected</property>
                                                                     <property name="pin_button">1</property>
                                                                     <property name="pos"></property>
+                                                                    <property name="position"></property>
+                                                                    <property name="pressed"></property>
                                                                     <property name="resize">Resizable</property>
                                                                     <property name="show">1</property>
                                                                     <property name="size">-1,-1</property>
@@ -772,29 +618,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <event name="OnButtonClick">OnTrigger</event>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                         </object>
@@ -809,8 +632,8 @@
                                                             <property name="minimum_size"></property>
                                                             <property name="name">sbSizer18</property>
                                                             <property name="orient">wxHORIZONTAL</property>
+                                                            <property name="parent">1</property>
                                                             <property name="permission">none</property>
-                                                            <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="0">
                                                                 <property name="border">5</property>
                                                                 <property name="flag"></property>
@@ -882,30 +705,7 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
-                                                                            <event name="OnChar"></event>
-                                                                            <event name="OnEnterWindow"></event>
-                                                                            <event name="OnEraseBackground"></event>
-                                                                            <event name="OnKeyDown"></event>
-                                                                            <event name="OnKeyUp"></event>
-                                                                            <event name="OnKillFocus"></event>
-                                                                            <event name="OnLeaveWindow"></event>
-                                                                            <event name="OnLeftDClick"></event>
-                                                                            <event name="OnLeftDown"></event>
-                                                                            <event name="OnLeftUp"></event>
-                                                                            <event name="OnMiddleDClick"></event>
-                                                                            <event name="OnMiddleDown"></event>
-                                                                            <event name="OnMiddleUp"></event>
-                                                                            <event name="OnMotion"></event>
-                                                                            <event name="OnMouseEvents"></event>
-                                                                            <event name="OnMouseWheel"></event>
-                                                                            <event name="OnPaint"></event>
                                                                             <event name="OnRadioButton">OnTrgButton</event>
-                                                                            <event name="OnRightDClick"></event>
-                                                                            <event name="OnRightDown"></event>
-                                                                            <event name="OnRightUp"></event>
-                                                                            <event name="OnSetFocus"></event>
-                                                                            <event name="OnSize"></event>
-                                                                            <event name="OnUpdateUI"></event>
                                                                         </object>
                                                                     </object>
                                                                     <object class="sizeritem" expanded="0">
@@ -970,30 +770,7 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
-                                                                            <event name="OnChar"></event>
-                                                                            <event name="OnEnterWindow"></event>
-                                                                            <event name="OnEraseBackground"></event>
-                                                                            <event name="OnKeyDown"></event>
-                                                                            <event name="OnKeyUp"></event>
-                                                                            <event name="OnKillFocus"></event>
-                                                                            <event name="OnLeaveWindow"></event>
-                                                                            <event name="OnLeftDClick"></event>
-                                                                            <event name="OnLeftDown"></event>
-                                                                            <event name="OnLeftUp"></event>
-                                                                            <event name="OnMiddleDClick"></event>
-                                                                            <event name="OnMiddleDown"></event>
-                                                                            <event name="OnMiddleUp"></event>
-                                                                            <event name="OnMotion"></event>
-                                                                            <event name="OnMouseEvents"></event>
-                                                                            <event name="OnMouseWheel"></event>
-                                                                            <event name="OnPaint"></event>
                                                                             <event name="OnRadioButton">OnTrgButton</event>
-                                                                            <event name="OnRightDClick"></event>
-                                                                            <event name="OnRightDown"></event>
-                                                                            <event name="OnRightUp"></event>
-                                                                            <event name="OnSetFocus"></event>
-                                                                            <event name="OnSize"></event>
-                                                                            <event name="OnUpdateUI"></event>
                                                                         </object>
                                                                     </object>
                                                                 </object>
@@ -1011,6 +788,7 @@
                                                                     <property name="aui_name"></property>
                                                                     <property name="aui_position"></property>
                                                                     <property name="aui_row"></property>
+                                                                    <property name="auth_needed">0</property>
                                                                     <property name="best_size"></property>
                                                                     <property name="bg"></property>
                                                                     <property name="bitmap">Load From File; pos.xpm</property>
@@ -1020,6 +798,7 @@
                                                                     <property name="close_button">1</property>
                                                                     <property name="context_help"></property>
                                                                     <property name="context_menu">1</property>
+                                                                    <property name="current"></property>
                                                                     <property name="default">0</property>
                                                                     <property name="default_pane">0</property>
                                                                     <property name="disabled"></property>
@@ -1033,9 +812,10 @@
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
-                                                                    <property name="hover"></property>
                                                                     <property name="id">ID_TR_POLARITY</property>
                                                                     <property name="label">MyButton</property>
+                                                                    <property name="margins"></property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -1050,11 +830,12 @@
                                                                     <property name="permission">protected</property>
                                                                     <property name="pin_button">1</property>
                                                                     <property name="pos"></property>
+                                                                    <property name="position"></property>
+                                                                    <property name="pressed"></property>
                                                                     <property name="resize">Resizable</property>
-                                                                    <property name="selected"></property>
                                                                     <property name="show">1</property>
                                                                     <property name="size"></property>
-                                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                                    <property name="style"></property>
                                                                     <property name="subclass"></property>
                                                                     <property name="toolbar_pane">0</property>
                                                                     <property name="tooltip">Set Trigger Polarity</property>
@@ -1066,29 +847,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <event name="OnButtonClick">OnTrgButton</event>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                             <object class="sizeritem" expanded="0">
@@ -1104,27 +862,34 @@
                                                                     <property name="aui_name"></property>
                                                                     <property name="aui_position"></property>
                                                                     <property name="aui_row"></property>
+                                                                    <property name="auth_needed">0</property>
                                                                     <property name="best_size"></property>
                                                                     <property name="bg"></property>
+                                                                    <property name="bitmap"></property>
                                                                     <property name="caption"></property>
                                                                     <property name="caption_visible">1</property>
                                                                     <property name="center_pane">0</property>
                                                                     <property name="close_button">1</property>
                                                                     <property name="context_help"></property>
                                                                     <property name="context_menu">1</property>
+                                                                    <property name="current"></property>
                                                                     <property name="default">0</property>
                                                                     <property name="default_pane">0</property>
+                                                                    <property name="disabled"></property>
                                                                     <property name="dock">Dock</property>
                                                                     <property name="dock_fixed">0</property>
                                                                     <property name="docking">Left</property>
                                                                     <property name="enabled">1</property>
                                                                     <property name="fg"></property>
                                                                     <property name="floatable">1</property>
+                                                                    <property name="focus"></property>
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">ID_TRGCFG</property>
                                                                     <property name="label">CFG</property>
+                                                                    <property name="margins"></property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -1139,6 +904,8 @@
                                                                     <property name="permission">protected</property>
                                                                     <property name="pin_button">1</property>
                                                                     <property name="pos"></property>
+                                                                    <property name="position"></property>
+                                                                    <property name="pressed"></property>
                                                                     <property name="resize">Resizable</property>
                                                                     <property name="show">1</property>
                                                                     <property name="size">45,-1</property>
@@ -1154,29 +921,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <event name="OnButtonClick">OnTrigger</event>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                         </object>
@@ -1223,6 +967,7 @@
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">wxID_ANY</property>
                                                                     <property name="label">Max</property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -1248,29 +993,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <property name="wrap">-1</property>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                             <object class="sizeritem" expanded="0">
@@ -1306,6 +1028,7 @@
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">wxID_ANY</property>
                                                                     <property name="label">Delay</property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -1323,7 +1046,7 @@
                                                                     <property name="resize">Resizable</property>
                                                                     <property name="show">1</property>
                                                                     <property name="size"></property>
-                                                                    <property name="style">wxALIGN_CENTRE</property>
+                                                                    <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                                                     <property name="subclass"></property>
                                                                     <property name="toolbar_pane">0</property>
                                                                     <property name="tooltip"></property>
@@ -1331,29 +1054,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <property name="wrap">-1</property>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                             <object class="sizeritem" expanded="0">
@@ -1389,6 +1089,7 @@
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">wxID_ANY</property>
                                                                     <property name="label">Min</property>
+                                                                    <property name="markup">0</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -1414,29 +1115,6 @@
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
                                                                     <property name="wrap">-1</property>
-                                                                    <event name="OnChar"></event>
-                                                                    <event name="OnEnterWindow"></event>
-                                                                    <event name="OnEraseBackground"></event>
-                                                                    <event name="OnKeyDown"></event>
-                                                                    <event name="OnKeyUp"></event>
-                                                                    <event name="OnKillFocus"></event>
-                                                                    <event name="OnLeaveWindow"></event>
-                                                                    <event name="OnLeftDClick"></event>
-                                                                    <event name="OnLeftDown"></event>
-                                                                    <event name="OnLeftUp"></event>
-                                                                    <event name="OnMiddleDClick"></event>
-                                                                    <event name="OnMiddleDown"></event>
-                                                                    <event name="OnMiddleUp"></event>
-                                                                    <event name="OnMotion"></event>
-                                                                    <event name="OnMouseEvents"></event>
-                                                                    <event name="OnMouseWheel"></event>
-                                                                    <event name="OnPaint"></event>
-                                                                    <event name="OnRightDClick"></event>
-                                                                    <event name="OnRightDown"></event>
-                                                                    <event name="OnRightUp"></event>
-                                                                    <event name="OnSetFocus"></event>
-                                                                    <event name="OnSize"></event>
-                                                                    <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
                                                         </object>
@@ -1480,7 +1158,7 @@
                                                             <property name="minValue">0</property>
                                                             <property name="min_size"></property>
                                                             <property name="minimize_button">0</property>
-                                                            <property name="minimum_size"></property>
+                                                            <property name="minimum_size">-1,30</property>
                                                             <property name="moveable">1</property>
                                                             <property name="name">m_slTrgDelay</property>
                                                             <property name="pane_border">1</property>
@@ -1491,7 +1169,7 @@
                                                             <property name="pos"></property>
                                                             <property name="resize">Resizable</property>
                                                             <property name="show">1</property>
-                                                            <property name="size">-1,20</property>
+                                                            <property name="size">-1,30</property>
                                                             <property name="style">wxSL_HORIZONTAL</property>
                                                             <property name="subclass"></property>
                                                             <property name="toolbar_pane">0</property>
@@ -1503,50 +1181,8 @@
                                                             <property name="value">100</property>
                                                             <property name="window_extra_style"></property>
                                                             <property name="window_name"></property>
-                                                            <property name="window_style">wxSTATIC_BORDER</property>
-                                                            <event name="OnChar"></event>
+                                                            <property name="window_style">wxBORDER_STATIC</property>
                                                             <event name="OnCommandScroll">OnTrgDelayChange</event>
-                                                            <event name="OnCommandScrollBottom"></event>
-                                                            <event name="OnCommandScrollChanged"></event>
-                                                            <event name="OnCommandScrollLineDown"></event>
-                                                            <event name="OnCommandScrollLineUp"></event>
-                                                            <event name="OnCommandScrollPageDown"></event>
-                                                            <event name="OnCommandScrollPageUp"></event>
-                                                            <event name="OnCommandScrollThumbRelease"></event>
-                                                            <event name="OnCommandScrollThumbTrack"></event>
-                                                            <event name="OnCommandScrollTop"></event>
-                                                            <event name="OnEnterWindow"></event>
-                                                            <event name="OnEraseBackground"></event>
-                                                            <event name="OnKeyDown"></event>
-                                                            <event name="OnKeyUp"></event>
-                                                            <event name="OnKillFocus"></event>
-                                                            <event name="OnLeaveWindow"></event>
-                                                            <event name="OnLeftDClick"></event>
-                                                            <event name="OnLeftDown"></event>
-                                                            <event name="OnLeftUp"></event>
-                                                            <event name="OnMiddleDClick"></event>
-                                                            <event name="OnMiddleDown"></event>
-                                                            <event name="OnMiddleUp"></event>
-                                                            <event name="OnMotion"></event>
-                                                            <event name="OnMouseEvents"></event>
-                                                            <event name="OnMouseWheel"></event>
-                                                            <event name="OnPaint"></event>
-                                                            <event name="OnRightDClick"></event>
-                                                            <event name="OnRightDown"></event>
-                                                            <event name="OnRightUp"></event>
-                                                            <event name="OnScroll"></event>
-                                                            <event name="OnScrollBottom"></event>
-                                                            <event name="OnScrollChanged"></event>
-                                                            <event name="OnScrollLineDown"></event>
-                                                            <event name="OnScrollLineUp"></event>
-                                                            <event name="OnScrollPageDown"></event>
-                                                            <event name="OnScrollPageUp"></event>
-                                                            <event name="OnScrollThumbRelease"></event>
-                                                            <event name="OnScrollThumbTrack"></event>
-                                                            <event name="OnScrollTop"></event>
-                                                            <event name="OnSetFocus"></event>
-                                                            <event name="OnSize"></event>
-                                                            <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
                                                 </object>
@@ -1617,30 +1253,7 @@
                                             <property name="window_extra_style"></property>
                                             <property name="window_name"></property>
                                             <property name="window_style"></property>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
                                             <event name="OnRadioBox">OnTrgButton</event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
                                 </object>
@@ -1655,8 +1268,8 @@
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer2</property>
                                     <property name="orient">wxVERTICAL</property>
+                                    <property name="parent">1</property>
                                     <property name="permission">none</property>
-                                    <event name="OnUpdateUI"></event>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
@@ -1679,6 +1292,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; left.xpm</property>
@@ -1688,6 +1302,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -1701,9 +1316,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_HSCALEDOWN</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -1718,11 +1334,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,32</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -1734,29 +1351,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnHScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -1792,6 +1386,7 @@
                                                     <property name="hidden">0</property>
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">ns/div</property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -1809,7 +1404,7 @@
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
-                                                    <property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property>
+                                                    <property name="style">wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL</property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -1817,29 +1412,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <property name="wrap">-1</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -1855,6 +1427,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; right.xpm</property>
@@ -1864,6 +1437,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -1877,9 +1451,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_HSCALEUP</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -1894,11 +1469,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,32</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -1910,29 +1486,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnHScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -1976,7 +1529,7 @@
                                             <property name="minValue">-1000</property>
                                             <property name="min_size"></property>
                                             <property name="minimize_button">0</property>
-                                            <property name="minimum_size"></property>
+                                            <property name="minimum_size">-1,30</property>
                                             <property name="moveable">1</property>
                                             <property name="name">m_slHOffset</property>
                                             <property name="pane_border">1</property>
@@ -1999,50 +1552,10 @@
                                             <property name="value">0</property>
                                             <property name="window_extra_style"></property>
                                             <property name="window_name"></property>
-                                            <property name="window_style">wxSTATIC_BORDER</property>
-                                            <event name="OnChar"></event>
+                                            <property name="window_style">wxBORDER_STATIC</property>
                                             <event name="OnCommandScroll">OnHOffsetChange</event>
-                                            <event name="OnCommandScrollBottom"></event>
-                                            <event name="OnCommandScrollChanged"></event>
-                                            <event name="OnCommandScrollLineDown"></event>
-                                            <event name="OnCommandScrollLineUp"></event>
-                                            <event name="OnCommandScrollPageDown"></event>
-                                            <event name="OnCommandScrollPageUp"></event>
-                                            <event name="OnCommandScrollThumbRelease"></event>
-                                            <event name="OnCommandScrollThumbTrack"></event>
-                                            <event name="OnCommandScrollTop"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
                                             <event name="OnLeftDClick">OnZero</event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRightDClick"></event>
                                             <event name="OnRightDown">OnZero</event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnScroll"></event>
-                                            <event name="OnScrollBottom"></event>
-                                            <event name="OnScrollChanged"></event>
-                                            <event name="OnScrollLineDown"></event>
-                                            <event name="OnScrollLineUp"></event>
-                                            <event name="OnScrollPageDown"></event>
-                                            <event name="OnScrollPageUp"></event>
-                                            <event name="OnScrollThumbRelease"></event>
-                                            <event name="OnScrollThumbTrack"></event>
-                                            <event name="OnScrollTop"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
                                 </object>
@@ -2057,8 +1570,8 @@
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer3</property>
                                     <property name="orient">wxHORIZONTAL</property>
+                                    <property name="parent">1</property>
                                     <property name="permission">none</property>
-                                    <event name="OnUpdateUI"></event>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
@@ -2083,24 +1596,30 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font">,90,92,12,74,0</property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CHON1</property>
                                                     <property name="label">1</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2115,6 +1634,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">30,27</property>
@@ -2129,30 +1650,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
                                                     <event name="OnToggleButton">OnChnOn</event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2217,50 +1715,10 @@
                                                     <property name="value">0</property>
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
-                                                    <property name="window_style">wxSTATIC_BORDER</property>
-                                                    <event name="OnChar"></event>
+                                                    <property name="window_style">wxBORDER_STATIC</property>
                                                     <event name="OnCommandScroll">OnPosChange</event>
-                                                    <event name="OnCommandScrollBottom"></event>
-                                                    <event name="OnCommandScrollChanged"></event>
-                                                    <event name="OnCommandScrollLineDown"></event>
-                                                    <event name="OnCommandScrollLineUp"></event>
-                                                    <event name="OnCommandScrollPageDown"></event>
-                                                    <event name="OnCommandScrollPageUp"></event>
-                                                    <event name="OnCommandScrollThumbRelease"></event>
-                                                    <event name="OnCommandScrollThumbTrack"></event>
-                                                    <event name="OnCommandScrollTop"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
                                                     <event name="OnLeftDClick">OnZero</event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
                                                     <event name="OnRightDown">OnZero</event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnScroll"></event>
-                                                    <event name="OnScrollBottom"></event>
-                                                    <event name="OnScrollChanged"></event>
-                                                    <event name="OnScrollLineDown"></event>
-                                                    <event name="OnScrollLineUp"></event>
-                                                    <event name="OnScrollPageDown"></event>
-                                                    <event name="OnScrollPageUp"></event>
-                                                    <event name="OnScrollThumbRelease"></event>
-                                                    <event name="OnScrollThumbTrack"></event>
-                                                    <event name="OnScrollTop"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2276,6 +1734,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; up.xpm</property>
@@ -2285,6 +1744,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -2298,9 +1758,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEUP1</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2315,11 +1776,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -2331,29 +1793,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2389,6 +1828,7 @@
                                                     <property name="hidden">0</property>
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">500mV</property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2406,7 +1846,7 @@
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,-1</property>
-                                                    <property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property>
+                                                    <property name="style">wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL</property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -2414,29 +1854,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <property name="wrap">-1</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2452,6 +1869,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; down.xpm</property>
@@ -2461,6 +1879,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -2474,9 +1893,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEDN1</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2491,11 +1911,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -2507,29 +1928,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -2558,24 +1956,30 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font">,90,92,12,74,0</property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CHON2</property>
                                                     <property name="label">2</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2590,6 +1994,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">30,27</property>
@@ -2604,30 +2010,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
                                                     <event name="OnToggleButton">OnChnOn</event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2692,50 +2075,10 @@
                                                     <property name="value">0</property>
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
-                                                    <property name="window_style">wxSTATIC_BORDER</property>
-                                                    <event name="OnChar"></event>
+                                                    <property name="window_style">wxBORDER_STATIC</property>
                                                     <event name="OnCommandScroll">OnPosChange</event>
-                                                    <event name="OnCommandScrollBottom"></event>
-                                                    <event name="OnCommandScrollChanged"></event>
-                                                    <event name="OnCommandScrollLineDown"></event>
-                                                    <event name="OnCommandScrollLineUp"></event>
-                                                    <event name="OnCommandScrollPageDown"></event>
-                                                    <event name="OnCommandScrollPageUp"></event>
-                                                    <event name="OnCommandScrollThumbRelease"></event>
-                                                    <event name="OnCommandScrollThumbTrack"></event>
-                                                    <event name="OnCommandScrollTop"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
                                                     <event name="OnLeftDClick">OnZero</event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
                                                     <event name="OnRightDown">OnZero</event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnScroll"></event>
-                                                    <event name="OnScrollBottom"></event>
-                                                    <event name="OnScrollChanged"></event>
-                                                    <event name="OnScrollLineDown"></event>
-                                                    <event name="OnScrollLineUp"></event>
-                                                    <event name="OnScrollPageDown"></event>
-                                                    <event name="OnScrollPageUp"></event>
-                                                    <event name="OnScrollThumbRelease"></event>
-                                                    <event name="OnScrollThumbTrack"></event>
-                                                    <event name="OnScrollTop"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2751,6 +2094,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; up.xpm</property>
@@ -2760,6 +2104,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -2773,9 +2118,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEUP2</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2790,11 +2136,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -2806,29 +2153,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2864,6 +2188,7 @@
                                                     <property name="hidden">0</property>
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">500mV</property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2881,7 +2206,7 @@
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
-                                                    <property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property>
+                                                    <property name="style">wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL</property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -2889,29 +2214,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <property name="wrap">-1</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2927,6 +2229,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; down.xpm</property>
@@ -2936,6 +2239,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -2949,9 +2253,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEDN2</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -2966,11 +2271,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -2982,29 +2288,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -3033,24 +2316,30 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font">,90,92,12,74,0</property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CHON3</property>
                                                     <property name="label">3</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3065,6 +2354,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">30,27</property>
@@ -3079,30 +2370,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
                                                     <event name="OnToggleButton">OnChnOn</event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3167,50 +2435,10 @@
                                                     <property name="value">0</property>
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
-                                                    <property name="window_style">wxSTATIC_BORDER</property>
-                                                    <event name="OnChar"></event>
+                                                    <property name="window_style">wxBORDER_STATIC</property>
                                                     <event name="OnCommandScroll">OnPosChange</event>
-                                                    <event name="OnCommandScrollBottom"></event>
-                                                    <event name="OnCommandScrollChanged"></event>
-                                                    <event name="OnCommandScrollLineDown"></event>
-                                                    <event name="OnCommandScrollLineUp"></event>
-                                                    <event name="OnCommandScrollPageDown"></event>
-                                                    <event name="OnCommandScrollPageUp"></event>
-                                                    <event name="OnCommandScrollThumbRelease"></event>
-                                                    <event name="OnCommandScrollThumbTrack"></event>
-                                                    <event name="OnCommandScrollTop"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
                                                     <event name="OnLeftDClick">OnZero</event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
                                                     <event name="OnRightDown">OnZero</event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnScroll"></event>
-                                                    <event name="OnScrollBottom"></event>
-                                                    <event name="OnScrollChanged"></event>
-                                                    <event name="OnScrollLineDown"></event>
-                                                    <event name="OnScrollLineUp"></event>
-                                                    <event name="OnScrollPageDown"></event>
-                                                    <event name="OnScrollPageUp"></event>
-                                                    <event name="OnScrollThumbRelease"></event>
-                                                    <event name="OnScrollThumbTrack"></event>
-                                                    <event name="OnScrollTop"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3226,6 +2454,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; up.xpm</property>
@@ -3235,6 +2464,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -3248,9 +2478,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEUP3</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3265,11 +2496,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -3281,29 +2513,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3339,6 +2548,7 @@
                                                     <property name="hidden">0</property>
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">500mV</property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3356,7 +2566,7 @@
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
-                                                    <property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property>
+                                                    <property name="style">wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL</property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -3364,29 +2574,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <property name="wrap">-1</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3402,6 +2589,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; down.xpm</property>
@@ -3411,6 +2599,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -3424,9 +2613,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEDN3</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3441,11 +2631,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -3457,29 +2648,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -3508,24 +2676,30 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font">,90,92,12,74,0</property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CHON4</property>
                                                     <property name="label">4</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3540,6 +2714,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">30,27</property>
@@ -3554,30 +2730,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
                                                     <event name="OnToggleButton">OnChnOn</event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3642,50 +2795,10 @@
                                                     <property name="value">0</property>
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
-                                                    <property name="window_style">wxSTATIC_BORDER</property>
-                                                    <event name="OnChar"></event>
+                                                    <property name="window_style">wxBORDER_STATIC</property>
                                                     <event name="OnCommandScroll">OnPosChange</event>
-                                                    <event name="OnCommandScrollBottom"></event>
-                                                    <event name="OnCommandScrollChanged"></event>
-                                                    <event name="OnCommandScrollLineDown"></event>
-                                                    <event name="OnCommandScrollLineUp"></event>
-                                                    <event name="OnCommandScrollPageDown"></event>
-                                                    <event name="OnCommandScrollPageUp"></event>
-                                                    <event name="OnCommandScrollThumbRelease"></event>
-                                                    <event name="OnCommandScrollThumbTrack"></event>
-                                                    <event name="OnCommandScrollTop"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
                                                     <event name="OnLeftDClick">OnZero</event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
                                                     <event name="OnRightDown">OnZero</event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnScroll"></event>
-                                                    <event name="OnScrollBottom"></event>
-                                                    <event name="OnScrollChanged"></event>
-                                                    <event name="OnScrollLineDown"></event>
-                                                    <event name="OnScrollLineUp"></event>
-                                                    <event name="OnScrollPageDown"></event>
-                                                    <event name="OnScrollPageUp"></event>
-                                                    <event name="OnScrollThumbRelease"></event>
-                                                    <event name="OnScrollThumbTrack"></event>
-                                                    <event name="OnScrollTop"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3701,6 +2814,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; up.xpm</property>
@@ -3710,6 +2824,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -3723,9 +2838,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEUP4</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3740,11 +2856,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -3756,29 +2873,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3814,6 +2908,7 @@
                                                     <property name="hidden">0</property>
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">500mV</property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3831,7 +2926,7 @@
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
-                                                    <property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property>
+                                                    <property name="style">wxST_NO_AUTORESIZE|wxALIGN_CENTER_HORIZONTAL</property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -3839,29 +2934,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <property name="wrap">-1</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -3877,6 +2949,7 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
                                                     <property name="bitmap">Load From File; down.xpm</property>
@@ -3886,6 +2959,7 @@
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
                                                     <property name="disabled"></property>
@@ -3899,9 +2973,10 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="hover"></property>
                                                     <property name="id">ID_SCALEDN4</property>
                                                     <property name="label">MyButton</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -3916,11 +2991,12 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
-                                                    <property name="selected"></property>
                                                     <property name="show">1</property>
                                                     <property name="size">-1,22</property>
-                                                    <property name="style">wxBU_AUTODRAW</property>
+                                                    <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
                                                     <property name="tooltip"></property>
@@ -3932,29 +3008,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnScaleChange</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -3971,8 +3024,8 @@
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer8</property>
                                     <property name="orient">wxVERTICAL</property>
+                                    <property name="parent">1</property>
                                     <property name="permission">none</property>
-                                    <event name="OnUpdateUI"></event>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
@@ -4015,6 +3068,7 @@
                                                     <property name="hidden">0</property>
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">Cursor:</property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4040,29 +3094,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <property name="wrap">-1</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4080,24 +3111,30 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CURSORA</property>
                                                     <property name="label">&amp;A</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size">40,-1</property>
@@ -4112,6 +3149,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">40,-1</property>
@@ -4126,30 +3165,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
                                                     <event name="OnToggleButton">OnCursor</event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4167,24 +3183,30 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CURSORB</property>
                                                     <property name="label">&amp;B</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size">40,-1</property>
@@ -4199,6 +3221,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size">40,-1</property>
@@ -4213,30 +3237,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
                                                     <event name="OnToggleButton">OnCursor</event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4301,30 +3302,7 @@
                                                     <property name="window_extra_style"></property>
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
-                                                    <event name="OnChar"></event>
                                                     <event name="OnCheckBox">OnSnap</event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -4341,8 +3319,8 @@
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer4</property>
                                     <property name="orient">wxVERTICAL</property>
+                                    <property name="parent">1</property>
                                     <property name="permission">none</property>
-                                    <event name="OnUpdateUI"></event>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
@@ -4368,27 +3346,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_CONFIG</property>
                                                     <property name="label">&amp;Config</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4403,6 +3388,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4418,29 +3405,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnConfig</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4456,27 +3420,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_SAVE</property>
                                                     <property name="label">&amp;Save</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4491,6 +3462,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4506,29 +3479,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnSave</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4544,27 +3494,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_MEASURE</property>
                                                     <property name="label">&amp;Measure</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4579,6 +3536,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4594,29 +3553,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnMeasure</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4632,27 +3568,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_MEASURE</property>
                                                     <property name="label">&amp;Display</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4667,6 +3610,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4682,29 +3627,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnDisplay</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4720,27 +3642,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_PRINT</property>
                                                     <property name="label">&amp;Print</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4755,6 +3684,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4770,29 +3701,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnPrint</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -4809,8 +3717,8 @@
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer9</property>
                                     <property name="orient">wxHORIZONTAL</property>
+                                    <property name="parent">1</property>
                                     <property name="permission">none</property>
-                                    <event name="OnUpdateUI"></event>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
@@ -4836,27 +3744,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_ABOUT</property>
                                                     <property name="label">About</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4871,6 +3786,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4886,29 +3803,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnAbout</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -4924,27 +3818,34 @@
                                                     <property name="aui_name"></property>
                                                     <property name="aui_position"></property>
                                                     <property name="aui_row"></property>
+                                                    <property name="auth_needed">0</property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmap"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>
+                                                    <property name="current"></property>
                                                     <property name="default">0</property>
                                                     <property name="default_pane">0</property>
+                                                    <property name="disabled"></property>
                                                     <property name="dock">Dock</property>
                                                     <property name="dock_fixed">0</property>
                                                     <property name="docking">Left</property>
                                                     <property name="enabled">1</property>
                                                     <property name="fg"></property>
                                                     <property name="floatable">1</property>
+                                                    <property name="focus"></property>
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
                                                     <property name="id">ID_EXIT</property>
                                                     <property name="label">E&amp;xit</property>
+                                                    <property name="margins"></property>
+                                                    <property name="markup">0</property>
                                                     <property name="max_size"></property>
                                                     <property name="maximize_button">0</property>
                                                     <property name="maximum_size"></property>
@@ -4959,6 +3860,8 @@
                                                     <property name="permission">protected</property>
                                                     <property name="pin_button">1</property>
                                                     <property name="pos"></property>
+                                                    <property name="position"></property>
+                                                    <property name="pressed"></property>
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
@@ -4974,29 +3877,6 @@
                                                     <property name="window_name"></property>
                                                     <property name="window_style"></property>
                                                     <event name="OnButtonClick">OnExit</event>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
                                         </object>
@@ -5042,45 +3922,10 @@
             <property name="subclass"></property>
             <property name="title">Configuration</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer12</property>
@@ -5096,8 +3941,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer5111</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
@@ -5169,30 +4014,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnChoice">OnBoardSelect</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -5208,27 +4030,34 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
+                                        <property name="bitmap"></property>
                                         <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="context_help"></property>
                                         <property name="context_menu">1</property>
+                                        <property name="current"></property>
                                         <property name="default">0</property>
                                         <property name="default_pane">0</property>
+                                        <property name="disabled"></property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
+                                        <property name="focus"></property>
                                         <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Rescan</property>
+                                        <property name="margins"></property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -5243,6 +4072,8 @@
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
                                         <property name="pos"></property>
+                                        <property name="position"></property>
+                                        <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
                                         <property name="size"></property>
@@ -5258,29 +4089,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <event name="OnButtonClick">OnRescan</event>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -5296,27 +4104,34 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
+                                        <property name="bitmap"></property>
                                         <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="context_help"></property>
                                         <property name="context_menu">1</property>
+                                        <property name="current"></property>
                                         <property name="default">0</property>
                                         <property name="default_pane">0</property>
+                                        <property name="disabled"></property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
+                                        <property name="focus"></property>
                                         <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Info</property>
+                                        <property name="margins"></property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -5331,6 +4146,8 @@
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
                                         <property name="pos"></property>
+                                        <property name="position"></property>
+                                        <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
                                         <property name="size"></property>
@@ -5346,29 +4163,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <event name="OnButtonClick">OnInfo</event>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                             </object>
@@ -5435,30 +4229,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnBoardSelect</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -5473,8 +4244,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer511</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxBOTTOM</property>
@@ -5539,30 +4310,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
                                 <event name="OnRadioBox">OnChannelHalf</event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -5627,30 +4375,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnClkOn</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -5665,8 +4390,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer17</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag"></property>
@@ -5731,30 +4456,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
                                 <event name="OnRadioBox">OnInputRange</event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -5769,8 +4471,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer512</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
@@ -5842,33 +4544,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnText"></event>
                                         <event name="OnTextEnter">OnFreq</event>
-                                        <event name="OnTextMaxLen"></event>
-                                        <event name="OnTextURL"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -5904,6 +4580,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">GSPS</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -5929,29 +4606,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -6016,30 +4670,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnCheckBox">OnLock</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -6075,6 +4706,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Actual speed:</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -6100,29 +4732,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -6158,6 +4767,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">0.000 GSPS</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -6183,29 +4793,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                             </object>
@@ -6222,8 +4809,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer5</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
@@ -6295,30 +4882,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnCheckBox">OnCalOn</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -6383,33 +4947,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnText"></event>
                                         <event name="OnTextEnter">OnCalEnter</event>
-                                        <event name="OnTextMaxLen"></event>
-                                        <event name="OnTextURL"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -6474,50 +5012,8 @@
                                         <property name="value">0</property>
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
-                                        <property name="window_style">wxSTATIC_BORDER</property>
-                                        <event name="OnChar"></event>
+                                        <property name="window_style">wxBORDER_STATIC</property>
                                         <event name="OnCommandScroll">OnCalSlider</event>
-                                        <event name="OnCommandScrollBottom"></event>
-                                        <event name="OnCommandScrollChanged"></event>
-                                        <event name="OnCommandScrollLineDown"></event>
-                                        <event name="OnCommandScrollLineUp"></event>
-                                        <event name="OnCommandScrollPageDown"></event>
-                                        <event name="OnCommandScrollPageUp"></event>
-                                        <event name="OnCommandScrollThumbRelease"></event>
-                                        <event name="OnCommandScrollThumbTrack"></event>
-                                        <event name="OnCommandScrollTop"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnScroll"></event>
-                                        <event name="OnScrollBottom"></event>
-                                        <event name="OnScrollChanged"></event>
-                                        <event name="OnScrollLineDown"></event>
-                                        <event name="OnScrollLineUp"></event>
-                                        <event name="OnScrollPageDown"></event>
-                                        <event name="OnScrollPageUp"></event>
-                                        <event name="OnScrollThumbRelease"></event>
-                                        <event name="OnScrollThumbTrack"></event>
-                                        <event name="OnScrollTop"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -6553,6 +5049,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">mV</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -6578,29 +5075,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                             </object>
@@ -6667,30 +5141,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnDisplayWaveforms</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -6755,30 +5206,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnDisplayWaveforms</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -6843,30 +5271,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnRemoveSpikes</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -6882,27 +5287,34 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
+                                <property name="bitmap"></property>
                                 <property name="caption"></property>
                                 <property name="caption_visible">1</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
+                                <property name="current"></property>
                                 <property name="default">0</property>
                                 <property name="default_pane">0</property>
+                                <property name="disabled"></property>
                                 <property name="dock">Dock</property>
                                 <property name="dock_fixed">0</property>
                                 <property name="docking">Left</property>
                                 <property name="enabled">1</property>
                                 <property name="fg"></property>
                                 <property name="floatable">1</property>
+                                <property name="focus"></property>
                                 <property name="font"></property>
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Execute Voltage Calibration</property>
+                                <property name="margins"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -6917,6 +5329,8 @@
                                 <property name="permission">protected</property>
                                 <property name="pin_button">1</property>
                                 <property name="pos"></property>
+                                <property name="position"></property>
+                                <property name="pressed"></property>
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
@@ -6932,29 +5346,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <event name="OnButtonClick">OnButtonCalVolt</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -7019,29 +5410,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -7056,8 +5424,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer6</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxRIGHT|wxLEFT</property>
@@ -7120,30 +5488,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnDisplayWaveforms</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -7208,30 +5553,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnDisplayWaveforms</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -7296,30 +5618,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnDisplayWaveforms</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -7384,30 +5683,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnDisplayWaveforms</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -7423,27 +5699,34 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
+                                <property name="bitmap"></property>
                                 <property name="caption"></property>
                                 <property name="caption_visible">1</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
+                                <property name="current"></property>
                                 <property name="default">0</property>
                                 <property name="default_pane">0</property>
+                                <property name="disabled"></property>
                                 <property name="dock">Dock</property>
                                 <property name="dock_fixed">0</property>
                                 <property name="docking">Left</property>
                                 <property name="enabled">1</property>
                                 <property name="fg"></property>
                                 <property name="floatable">1</property>
+                                <property name="focus"></property>
                                 <property name="font"></property>
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Execute Timing Calibration</property>
+                                <property name="margins"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -7458,6 +5741,8 @@
                                 <property name="permission">protected</property>
                                 <property name="pin_button">1</property>
                                 <property name="pos"></property>
+                                <property name="position"></property>
+                                <property name="pressed"></property>
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
@@ -7473,29 +5758,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <event name="OnButtonClick">OnButtonCalTime</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -7560,29 +5822,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -7600,27 +5839,34 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
+                        <property name="auth_needed">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmap"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
+                        <property name="current"></property>
                         <property name="default">0</property>
                         <property name="default_pane">0</property>
+                        <property name="disabled"></property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
+                        <property name="focus"></property>
                         <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">&amp;Close</property>
+                        <property name="margins"></property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -7635,6 +5881,8 @@
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
+                        <property name="position"></property>
+                        <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -7650,29 +5898,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <event name="OnButtonClick">OnClose</event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
             </object>
@@ -7700,45 +5925,10 @@
             <property name="subclass"></property>
             <property name="title">Display</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer12</property>
@@ -7754,8 +5944,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer7</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
@@ -7827,30 +6017,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnCheckBox">OnDateTime</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -7915,30 +6082,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnCheckBox">OnShowGrid</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -8003,30 +6147,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnCheckBox">OnLines</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                             </object>
@@ -8093,30 +6214,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnScalers</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -8131,8 +6229,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer71</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxALL</property>
@@ -8195,30 +6293,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
                                 <event name="OnRadioButton">OnDisplayMode</event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -8301,30 +6376,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
                                                 <event name="OnRadioButton">OnDisplayMode</event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -8389,30 +6441,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
                                                 <event name="OnRadioButton">OnDisplayMode</event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                     </object>
@@ -8450,6 +6479,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Number of waveforms:</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -8475,29 +6505,6 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -8563,32 +6570,8 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
                                         <event name="OnCombobox">OnDisplayMode</event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnText"></event>
                                         <event name="OnTextEnter">OnDisplayMode</event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                             </object>
@@ -8605,8 +6588,8 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizer711</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
-                        <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
@@ -8665,6 +6648,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label"></property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -8690,29 +6674,6 @@
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -8748,6 +6709,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">CH1</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -8773,29 +6735,6 @@
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -8831,6 +6770,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">CH2</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -8856,29 +6796,6 @@
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -8914,6 +6831,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">CH3</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -8939,29 +6857,6 @@
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -8997,6 +6892,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">CH4</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -9022,29 +6918,6 @@
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -9080,6 +6953,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Period Jitter</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -9105,29 +6979,6 @@
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -9192,30 +7043,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnChar"></event>
                                                 <event name="OnCheckBox">OnButton</event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -9280,30 +7108,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnChar"></event>
                                                 <event name="OnCheckBox">OnButton</event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -9368,30 +7173,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnChar"></event>
                                                 <event name="OnCheckBox">OnButton</event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -9456,30 +7238,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnChar"></event>
                                                 <event name="OnCheckBox">OnButton</event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                     </object>
@@ -9501,27 +7260,34 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
+                        <property name="auth_needed">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmap"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
+                        <property name="current"></property>
                         <property name="default">0</property>
                         <property name="default_pane">0</property>
+                        <property name="disabled"></property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
+                        <property name="focus"></property>
                         <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">&amp;Close</property>
+                        <property name="margins"></property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -9536,6 +7302,8 @@
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
+                        <property name="position"></property>
+                        <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -9551,29 +7319,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <event name="OnButtonClick">OnClose</event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
             </object>
@@ -9601,45 +7346,10 @@
             <property name="subclass"></property>
             <property name="title">Select Measurements</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer14</property>
@@ -9694,6 +7404,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -9719,29 +7430,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -9777,6 +7465,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH1</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -9802,29 +7491,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -9860,6 +7526,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH2</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -9885,29 +7552,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -9943,6 +7587,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH3</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -9968,29 +7613,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10026,6 +7648,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH4</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10051,29 +7674,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10109,6 +7709,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Amplitude</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10134,29 +7735,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10192,6 +7770,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10217,29 +7796,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10275,6 +7831,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10300,29 +7857,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10358,6 +7892,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10383,29 +7918,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10441,6 +7953,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10466,29 +7979,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10524,6 +8014,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Level</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10549,29 +8040,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10636,30 +8104,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10724,30 +8169,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10812,30 +8234,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10900,30 +8299,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -10959,6 +8335,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Peak-Peak Amplitude</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -10984,29 +8361,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11071,30 +8425,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11159,30 +8490,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11247,30 +8555,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11335,30 +8620,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11394,6 +8656,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">RMS</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -11419,29 +8682,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11506,30 +8746,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11594,30 +8811,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11682,30 +8876,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11770,30 +8941,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11829,6 +8977,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Vertical slice</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -11854,29 +9003,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -11941,30 +9067,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12029,30 +9132,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12117,30 +9197,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12205,30 +9262,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -12264,6 +9298,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Gated charge</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -12289,29 +9324,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -12376,30 +9388,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -12464,30 +9453,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -12552,30 +9518,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -12640,30 +9583,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12722,29 +9642,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12803,29 +9700,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12884,29 +9758,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -12965,29 +9816,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13046,29 +9874,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13104,6 +9909,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Time</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13129,29 +9935,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13187,6 +9970,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13212,29 +9996,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13270,6 +10031,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13295,29 +10057,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13353,6 +10092,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13378,29 +10118,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13436,6 +10153,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13461,29 +10179,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13519,6 +10214,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Frequency</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13544,29 +10240,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13631,30 +10304,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13719,30 +10369,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13807,30 +10434,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13895,30 +10499,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -13954,6 +10535,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Period</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -13979,29 +10561,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14066,30 +10625,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14154,30 +10690,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14242,30 +10755,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14330,30 +10820,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14389,6 +10856,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Rise time</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -14414,29 +10882,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14501,30 +10946,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14589,30 +11011,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14677,30 +11076,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14765,30 +11141,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14824,6 +11177,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Fall time</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -14849,29 +11203,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -14936,30 +11267,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15024,30 +11332,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15112,30 +11397,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15200,30 +11462,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15259,6 +11498,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Positive width</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -15284,29 +11524,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15371,30 +11588,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15459,30 +11653,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15547,30 +11718,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15635,30 +11783,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15694,6 +11819,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Negative width</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -15719,29 +11845,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15806,30 +11909,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15894,30 +11974,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -15982,30 +12039,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16070,30 +12104,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16129,6 +12140,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH(x+1)-CH(x) delay</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -16154,29 +12166,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16241,30 +12230,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16329,30 +12295,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16417,30 +12360,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16505,30 +12425,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16564,6 +12461,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Horizontal slice</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -16589,29 +12487,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16676,30 +12551,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16764,30 +12616,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16852,30 +12681,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -16940,30 +12746,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -17024,29 +12807,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
@@ -17120,30 +12880,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnStat</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -17208,30 +12945,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnHist</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -17278,6 +12992,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Accumulate</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -17303,29 +13018,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -17391,32 +13083,8 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCombobox">OnStatNAverage</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnText"></event>
                                 <event name="OnTextEnter">OnStatNAverage</event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -17452,6 +13120,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">measurements</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size">-1,-1</property>
@@ -17477,29 +13146,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -17517,27 +13163,34 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
+                        <property name="auth_needed">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmap"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
+                        <property name="current"></property>
                         <property name="default">0</property>
                         <property name="default_pane">0</property>
+                        <property name="disabled"></property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
+                        <property name="focus"></property>
                         <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">Clear</property>
+                        <property name="margins"></property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -17552,6 +13205,8 @@
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
+                        <property name="position"></property>
+                        <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -17567,29 +13222,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <event name="OnButtonClick">OnStatReset</event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -17648,29 +13280,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -17735,30 +13344,7 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
                         <event name="OnCheckBox">OnIndicator</event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -17817,29 +13403,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -17855,27 +13418,34 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
+                        <property name="auth_needed">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmap"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
+                        <property name="current"></property>
                         <property name="default">0</property>
                         <property name="default_pane">0</property>
+                        <property name="disabled"></property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
+                        <property name="focus"></property>
                         <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">Cl&amp;ose</property>
+                        <property name="margins"></property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -17890,6 +13460,8 @@
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
+                        <property name="position"></property>
+                        <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -17905,29 +13477,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <event name="OnButtonClick">OnClose</event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
             </object>
@@ -17955,45 +13504,10 @@
             <property name="subclass"></property>
             <property name="title">Configure Trigger</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer14</property>
@@ -18041,6 +13555,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH1</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18058,7 +13573,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18066,29 +13581,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18124,6 +13616,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH2</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18141,7 +13634,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18149,29 +13642,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18207,6 +13677,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH3</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18224,7 +13695,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18232,29 +13703,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18290,6 +13738,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">CH4</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18307,7 +13756,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18315,29 +13764,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18373,6 +13799,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">EXT</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18390,7 +13817,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18398,29 +13825,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -18481,29 +13885,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -18539,6 +13920,7 @@
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">Trigger logic</property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -18564,29 +13946,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <property name="wrap">-1</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -18660,30 +14019,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18719,6 +14055,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">OR</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18736,7 +14073,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18744,29 +14081,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18831,30 +14145,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -18890,6 +14181,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">OR</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -18907,7 +14199,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -18915,29 +14207,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19002,30 +14271,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19061,6 +14307,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">OR</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -19078,7 +14325,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -19086,29 +14333,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19173,30 +14397,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19232,6 +14433,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">OR</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -19249,7 +14451,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -19257,29 +14459,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19344,30 +14523,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -19405,6 +14561,7 @@
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">- OR -</property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -19422,7 +14579,7 @@
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
-                        <property name="style">wxALIGN_CENTRE</property>
+                        <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                         <property name="subclass"></property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
@@ -19430,29 +14587,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <property name="wrap">-1</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -19526,30 +14660,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19585,6 +14696,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">AND</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -19602,7 +14714,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -19610,29 +14722,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19697,30 +14786,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19756,6 +14822,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">AND</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -19773,7 +14840,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -19781,29 +14848,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19868,30 +14912,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -19927,6 +14948,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">AND</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -19944,7 +14966,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -19952,29 +14974,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20039,30 +15038,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20098,6 +15074,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">AND</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -20115,7 +15092,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style">wxALIGN_CENTRE</property>
+                                <property name="style">wxALIGN_CENTER_HORIZONTAL</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -20123,29 +15100,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20210,30 +15164,7 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
                                 <event name="OnCheckBox">OnButton</event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -20300,30 +15231,7 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
                         <event name="OnCheckBox">OnButton</event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -20382,29 +15290,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -20440,6 +15325,7 @@
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">Trigger level</property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -20465,29 +15351,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <property name="wrap">-1</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -20561,33 +15424,8 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
                                 <event name="OnText">OnTriggerLevel</event>
                                 <event name="OnTextEnter">OnTriggerLevel</event>
-                                <event name="OnTextMaxLen"></event>
-                                <event name="OnTextURL"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20652,33 +15490,8 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
                                 <event name="OnText">OnTriggerLevel</event>
                                 <event name="OnTextEnter">OnTriggerLevel</event>
-                                <event name="OnTextMaxLen"></event>
-                                <event name="OnTextURL"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20743,33 +15556,8 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
                                 <event name="OnText">OnTriggerLevel</event>
                                 <event name="OnTextEnter">OnTriggerLevel</event>
-                                <event name="OnTextMaxLen"></event>
-                                <event name="OnTextURL"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20834,33 +15622,8 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
                                 <event name="OnText">OnTriggerLevel</event>
                                 <event name="OnTextEnter">OnTriggerLevel</event>
-                                <event name="OnTextMaxLen"></event>
-                                <event name="OnTextURL"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -20896,6 +15659,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Volt</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -20921,29 +15685,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -21004,29 +15745,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="0">
@@ -21042,27 +15760,34 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
+                        <property name="auth_needed">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmap"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
+                        <property name="current"></property>
                         <property name="default">0</property>
                         <property name="default_pane">0</property>
+                        <property name="disabled"></property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
+                        <property name="focus"></property>
                         <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="label">Cl&amp;ose</property>
+                        <property name="margins"></property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -21077,6 +15802,8 @@
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
+                        <property name="position"></property>
+                        <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -21092,29 +15819,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                         <event name="OnButtonClick">OnClose</event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
             </object>
@@ -21142,45 +15846,10 @@
             <property name="subclass"></property>
             <property name="title">About</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer15</property>
@@ -21228,6 +15897,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">DRS Oscilloscope</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21253,29 +15923,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21311,6 +15958,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Version 0.0.0</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21336,29 +15984,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21394,6 +16019,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Build 0</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21419,29 +16045,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21477,6 +16080,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Stefan Ritt</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21502,29 +16106,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21560,6 +16141,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Paul Scherrer Institute</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21585,29 +16167,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21705,29 +16264,6 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="0">
@@ -21795,6 +16331,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">For updates please visit</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21820,29 +16357,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21906,30 +16420,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnHyperlink"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -21945,27 +16435,34 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
+                                <property name="bitmap"></property>
                                 <property name="caption"></property>
                                 <property name="caption_visible">1</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
+                                <property name="current"></property>
                                 <property name="default">0</property>
                                 <property name="default_pane">0</property>
+                                <property name="disabled"></property>
                                 <property name="dock">Dock</property>
                                 <property name="dock_fixed">0</property>
                                 <property name="docking">Left</property>
                                 <property name="enabled">1</property>
                                 <property name="fg"></property>
                                 <property name="floatable">1</property>
+                                <property name="focus"></property>
                                 <property name="font">,90,90,-1,74,0</property>
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_OK</property>
                                 <property name="label">Ok</property>
+                                <property name="margins"></property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -21980,6 +16477,8 @@
                                 <property name="permission">protected</property>
                                 <property name="pin_button">1</property>
                                 <property name="pos"></property>
+                                <property name="position"></property>
+                                <property name="pressed"></property>
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
@@ -21994,30 +16493,6 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -22047,45 +16522,10 @@
             <property name="subclass"></property>
             <property name="title">Info</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">bSizer15</property>
@@ -22136,6 +16576,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Board type:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22161,29 +16602,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22219,6 +16637,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">0</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22244,29 +16663,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22302,6 +16698,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">DRS type:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22327,29 +16724,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22385,6 +16759,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">DRS4</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22410,29 +16785,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22468,6 +16820,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Serial number:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22493,29 +16846,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22551,6 +16881,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">0</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22576,29 +16907,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22634,6 +16942,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Firmware revision:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22659,29 +16968,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22717,6 +17003,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">0</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22742,29 +17029,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22800,6 +17064,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Temperature:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22825,29 +17090,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22883,6 +17125,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">0 C</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22908,29 +17151,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -22966,6 +17186,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Input range:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -22991,29 +17212,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23049,6 +17247,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">-0.5V...0.5V</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23074,29 +17273,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23132,6 +17308,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Calibrated range:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23157,29 +17334,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23215,6 +17369,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">-0.5V...0.5V</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23240,29 +17395,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23298,6 +17430,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Calibrated frequency:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23323,29 +17456,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23381,6 +17491,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">5.000 GSPS</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23406,29 +17517,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23464,6 +17552,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Current frequency:</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23489,29 +17578,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
@@ -23547,6 +17613,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">5.000 GSPS</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -23572,29 +17639,6 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
                             </object>
                         </object>
                     </object>
@@ -23612,27 +17656,34 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
+                        <property name="auth_needed">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmap"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
+                        <property name="current"></property>
                         <property name="default">0</property>
                         <property name="default_pane">0</property>
+                        <property name="disabled"></property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
+                        <property name="focus"></property>
                         <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_OK</property>
                         <property name="label">Ok</property>
+                        <property name="margins"></property>
+                        <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -23647,6 +17698,8 @@
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
+                        <property name="position"></property>
+                        <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -23661,30 +17714,6 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                        <event name="OnButtonClick"></event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
             </object>
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/left.xpm
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/left.xpm
@@ -1,35 +1,48 @@
 /* XPM */
-static const char *left_xpm[]={
-"20 28 4 1",
-". c None",
-"b c #808080",
-"a c #c0c0c0",
-"# c #ffffff",
-"....................",
-"...............#a...",
-"..............#aabb.",
-".............#aaabb.",
-"............#aaaabb.",
-"...........#aaaaabb.",
-"..........#aaaaaabb.",
-".........#aaaaaaabb.",
-"........#aaaaaaaabb.",
-".......#aaaaaaaaabb.",
-"......#aaaaaaaaaabb.",
-".....#aaaaaaaaaaabb.",
-"....#aaaaaaaaaaaabb.",
-"...#aaaaaaaaaaaaabb.",
-"....aaaaaaaaaaaaabb.",
-".....aaaaaaaaaaaabb.",
-"......aaaaaaaaaaabb.",
-".......aaaaaaaaaabb.",
-"........aaaaaaaaabb.",
-".........aaaaaaaabb.",
-"..........aaaaaaabb.",
-"...........aaaaaabb.",
-"............aaaaabb.",
-".............aaaabb.",
-"..............aaabb.",
-"...............aabb.",
-"................abb.",
-".................bb."};
+static char * left_xpm[] = {
+"17 24 21 1",
+" 	c None",
+".	c #E0E0E0",
+"+	c #B1B1B1",
+"@	c #BFBFBF",
+"#	c #A0A0A0",
+"$	c #7F7F7F",
+"%	c #DDDDDD",
+"&	c #C1C1C1",
+"*	c #DADADA",
+"=	c #C0C0C0",
+"-	c #DBDBDB",
+";	c #DFDFDF",
+">	c #E2E2E2",
+",	c #BEBEBE",
+"'	c #DEDEDE",
+")	c #DCDCDC",
+"!	c #C2C2C2",
+"~	c #C3C3C3",
+"{	c #A1A1A1",
+"]	c #888888",
+"^	c #808080",
+"                 ",
+"             .+  ",
+"            .@#$ ",
+"           %@&#$ ",
+"          *&=&#$ ",
+"         -&==&#$ ",
+"        ;====&#$ ",
+"       >@====&#$ ",
+"      >,=====&#$ ",
+"     '=======&#$ ",
+"    )&=======&#$ ",
+"   '!========&#$ ",
+"   ~=========&#$ ",
+"    =========&#$ ",
+"     ========&#$ ",
+"      =======&#$ ",
+"       ======&#$ ",
+"        =====&#$ ",
+"         ====&#$ ",
+"          ===&#$ ",
+"           ==&#$ ",
+"            =&#$ ",
+"             !{$ ",
+"              ]^ "};
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/neg.xpm
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/neg.xpm
@@ -1,35 +1,67 @@
 /* XPM */
-static const char *neg_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    20    20        8            1",
-/* colors */
-"` c #36349b",
-". c #a2a1ba",
-"# c #dddfde",
-"a c #82818a",
-"b c None",
-"c c #5959a4",
-"d c #babbbd",
-"e c #9292a0",
-/* pixels */
-"bbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbbbbbbbbb",
-"#######bbbbbbbbbbbbb",
-"daaaaaa#bbbbbbbbbbbb",
-"b#ddddee#bbbbbbbbbbb",
-"bb#####adbbbbbbbbbbb",
-"bbbbbbb.ac#bbbbbbbbb",
-"bbbbbb.c``.bbbbbbbbb",
-"bbbbbbe```a#bbbbbbbb",
-"bbbbbbb.``c#bbbbbbbb",
-"bbbbbbbb.``dbbbbbbbb",
-"bbbbbbbbb.`ebbbbbbbb",
-"bbbbbbbbbbaa#bbbbbbb",
-"bbbbbbbbbb#adbbbbbbb",
-"bbbbbbbbbbb.e#####bb",
-"bbbbbbbbbbb#aaaaaadb",
-"bbbbbbbbbbbbbdddddd#",
-"bbbbbbbbbbbbbb######",
-"bbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbbbbbbbbb"
-};
+static char * neg_xpm[] = {
+"16 16 48 1",
+" 	c None",
+".	c #C4C5C6",
+"+	c #ABACAF",
+"@	c #ACADB0",
+"#	c #BCBDBF",
+"$	c #C7C8C9",
+"%	c #B3B4B6",
+"&	c #B4B4B7",
+"*	c #AFAFB3",
+"=	c #9697A3",
+"-	c #C6C8CB",
+";	c #DCDEDD",
+">	c #BDBEC2",
+",	c #A4A5AA",
+"'	c #9594B6",
+")	c #7A799E",
+"!	c #5B5AA0",
+"~	c #C7C8D1",
+"{	c #8181A6",
+"]	c #35339C",
+"^	c #3A389B",
+"/	c #9897A6",
+"(	c #6B69A6",
+"_	c #39379B",
+":	c #7F80AC",
+"<	c #DEE0DE",
+"[	c #A1A0BA",
+"}	c #6362A4",
+"|	c #5D5DA1",
+"1	c #B8B8BB",
+"2	c #A09FB9",
+"3	c #656495",
+"4	c #A1A1A9",
+"5	c #B9BABC",
+"6	c #A1A1A6",
+"7	c #9C9BAE",
+"8	c #C2C4C7",
+"9	c #DBDDDC",
+"0	c #DADCDC",
+"a	c #C0C2C4",
+"b	c #8A8A92",
+"c	c #919097",
+"d	c #908F96",
+"e	c #ACACB0",
+"f	c #C8C9CA",
+"g	c #C9CBCB",
+"h	c #C8CACB",
+"i	c #DADCDB",
+"                ",
+"                ",
+".+@@@#          ",
+" $%&*=-         ",
+"  ;;;>,         ",
+"     ')!~       ",
+"     {]^/       ",
+"      (_:<      ",
+"      [}|1      ",
+"       234      ",
+"        56      ",
+"         78900  ",
+"         abccde ",
+"           fgghi",
+"                ",
+"                "};
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/pos.xpm
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/pos.xpm
@@ -1,35 +1,72 @@
 /* XPM */
-static const char *pos_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    20    20        8            1",
-/* colors */
-"` c #37369b",
-". c #a8a9ab",
-"# c #dfdedf",
-"a c #c3c3c4",
-"b c #7273a4",
-"c c #868589",
-"d c #5c5ca7",
-"e c None",
-/* pixels */
-"eeeeeeeeeeeeeeeeeeee",
-"eeeeeeeeeeeeeeeeeeee",
-"eeeeeeeeeeee#######e",
-"eeeeeeeeeee#ccccccae",
-"eeeeeeeeeee..aaaaaaa",
-"eeeeeeeeee#b#a######",
-"eeeeeeeeeedca#eeeeee",
-"eeeeeeeeed`a.eeeeeee",
-"eeeeeeeed``.aeeeeeee",
-"eeeeeeed``d.#eeeeeee",
-"eeeeeeb```d.eeeeeeee",
-"eeeeeee.``baeeeeeeee",
-"eeeeeee..c.#eeeeeeee",
-"eeeeee#c#a##eeeeeeee",
-"e#####..a#eeeeeeeeee",
-".cccccc#aeeeeeeeeeee",
-"e#....aa#eeeeeeeeeee",
-"ee######eeeeeeeeeeee",
-"eeeeeeeeeeeeeeeeeeee",
-"eeeeeeeeeeeeeeeeeeee"
-};
+static char * pos_xpm[] = {
+"16 16 53 1",
+" 	c None",
+".	c #CAC9CB",
+"+	c #AEADB0",
+"@	c #AFAEB0",
+"#	c #AEADAF",
+"$	c #C3C3C4",
+"%	c #ACADB0",
+"&	c #B3B3B4",
+"*	c #BCBBBD",
+"=	c #BCBCBD",
+"-	c #C1C1C2",
+";	c #C4C4C5",
+">	c #C5C4CF",
+",	c #A4A4B8",
+"'	c #D0CFD0",
+")	c #DAD9DA",
+"!	c #DEDDDE",
+"~	c #6060A2",
+"{	c #ABABAC",
+"]	c #CECECF",
+"^	c #4A4AA0",
+"/	c #5B5AA0",
+"(	c #B7B7B8",
+"_	c #39399C",
+":	c #6969A6",
+"<	c #BEBEBF",
+"[	c #6869A2",
+"}	c #45449C",
+"|	c #38379B",
+"1	c #7070A8",
+"2	c #AFB0B1",
+"3	c #8B8BA5",
+"4	c #626196",
+"5	c #9696AD",
+"6	c #BFBEC0",
+"7	c #BABABB",
+"8	c #B6B6B6",
+"9	c #E0DFE0",
+"0	c #DCDBDD",
+"a	c #D5D5D6",
+"b	c #ACACAE",
+"c	c #BBBBBD",
+"d	c #D8D7D8",
+"e	c #A6A7A9",
+"f	c #98979A",
+"g	c #8F8F92",
+"h	c #908F93",
+"i	c #B2B1B3",
+"j	c #D2D1D2",
+"k	c #C0C0C1",
+"l	c #C0C0C2",
+"m	c #CFCECF",
+"n	c #D7D6D7",
+"                ",
+"                ",
+"         .+@@#$ ",
+"         %&*=*-;",
+"        >,')!!!!",
+"        ~{]     ",
+"       ^/(      ",
+"      ^_:<      ",
+"     [}|12      ",
+"      345'      ",
+"     678'9      ",
+" 000abcd        ",
+"efghhi'         ",
+" jkl$mn         ",
+"                ",
+"                "};
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/right.xpm
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/right.xpm
@@ -1,35 +1,58 @@
 /* XPM */
-static const char *right_xpm[]={
-"20 28 4 1",
-". c None",
-"b c #808080",
-"a c #c0c0c0",
-"# c #ffffff",
-"....................",
-"...###..............",
-"...#aa#.............",
-"...#aaa#............",
-"...#aaaa#...........",
-"...#aaaaa#..........",
-"...#aaaaaa#.........",
-"...#aaaaaaa#........",
-"...#aaaaaaaa#.......",
-"...#aaaaaaaaa#......",
-"...#aaaaaaaaaa#.....",
-"...#aaaaaaaaaaa#....",
-"...#aaaaaaaaaaaa#...",
-"...#aaaaaaaaaaaaa#..",
-"...#aaaaaaaaaaaaab..",
-"...#aaaaaaaaaaaabb..",
-"...#aaaaaaaaaaabb...",
-"...#aaaaaaaaaabb....",
-"...#aaaaaaaaabb.....",
-"...#aaaaaaaabb......",
-"...#aaaaaaabb.......",
-"...#aaaaaabb........",
-"...#aaaaabb.........",
-"...#aaaabb..........",
-"...#aaabb...........",
-"...#aabb............",
-"....abb.............",
-"...................."};
+static char * right_xpm[] = {
+"17 24 31 1",
+" 	c None",
+".	c #F6F6F6",
+"+	c #F1F1F1",
+"@	c #DBDBDB",
+"#	c #BEBEBE",
+"$	c #E5E5E5",
+"%	c #DCDCDC",
+"&	c #BFBFBF",
+"*	c #C1C1C1",
+"=	c #E1E1E1",
+"-	c #C0C0C0",
+";	c #C3C3C3",
+">	c #C2C2C2",
+",	c #E4E4E4",
+"'	c #E8E8E8",
+")	c #E9E9E9",
+"!	c #E6E6E6",
+"~	c #E3E3E3",
+"{	c #C4C4C4",
+"]	c #A0A0A0",
+"^	c #A1A1A1",
+"/	c #7F7F7F",
+"(	c #7E7E7E",
+"_	c #9F9F9F",
+":	c #9D9D9D",
+"<	c #818181",
+"[	c #9E9E9E",
+"}	c #828282",
+"|	c #808080",
+"1	c #A3A3A3",
+"2	c #CCCCCC",
+"                 ",
+"   .+            ",
+"   @#$           ",
+"   %&*=          ",
+"   %&-;=         ",
+"   %&-->,        ",
+"   %&---*'       ",
+"   %&----&)      ",
+"   %&------!     ",
+"   %&------>~    ",
+"   %&-------{~   ",
+"   %&--------;$  ",
+"   %&--------#]  ",
+"   %&-------#^/  ",
+"   %&------&^(   ",
+"   %&------_/    ",
+"   %&-----:<     ",
+"   %&----[}      ",
+"   %&--#^|       ",
+"   %&-#1/        ",
+"   %&&1(         ",
+"   %-^|          ",
+"   2_}           ",
+"                 "};
--- drs4eb-5.0.6+git20211217+ds.orig/software/drsosc/up.xpm
+++ drs4eb-5.0.6+git20211217+ds/software/drsosc/up.xpm
@@ -1,27 +1,44 @@
 /* XPM */
-static const char *up_xpm[]={
-"28 20 4 1",
-". c None",
-"b c #808080",
-"a c #c0c0c0",
-"# c #ffffff",
-"............................",
-"............................",
-"............##..............",
-"...........##aa.............",
-"..........##aaaa............",
-".........##aaaaaa...........",
-"........##aaaaaaaa..........",
-".......##aaaaaaaaaa.........",
-"......##aaaaaaaaaaaa........",
-".....##aaaaaaaaaaaaaa.......",
-"....##aaaaaaaaaaaaaaaa......",
-"...##aaaaaaaaaaaaaaaaaa.....",
-"..##aaaaaaaaaaaaaaaaaaaa....",
-".##aaaaaaaaaaaaaaaaaaaaaa...",
-".#aaaaaaaaaaaaaaaaaaaaaaaa..",
-".#aaaaaaaaaaaaaaaaaaaaaaaab.",
-".#bbbbbbbbbbbbbbbbbbbbbbbbb.",
-"..bbbbbbbbbbbbbbbbbbbbbbbbb.",
-"............................",
-"............................"};
+static char * up_xpm[] = {
+"24 17 24 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #EAEAEA",
+"@	c #E6E6E6",
+"#	c #C3C3C3",
+"$	c #C0C0C0",
+"%	c #FEFEFE",
+"&	c #E8E8E8",
+"*	c #C2C2C2",
+"=	c #E9E9E9",
+"-	c #BFBFBF",
+";	c #E5E5E5",
+">	c #E3E3E3",
+",	c #C1C1C1",
+"'	c #F1F1F1",
+")	c #EDEDED",
+"!	c #A9A9A9",
+"~	c #ABABAB",
+"{	c #ACACAC",
+"]	c #8D8D8D",
+"^	c #D2D2D2",
+"/	c #7D7D7D",
+"(	c #7E7E7E",
+"_	c #808080",
+"                        ",
+"                        ",
+"          .+            ",
+"         .@#$           ",
+"        .@#$$$          ",
+"       %&*$$$$$         ",
+"      %=$$$$$$$$        ",
+"     .&-$$$$$$$$$       ",
+"    .;$$$$$$$$$$$$      ",
+"   .>*$$$$$$$$$$$$$     ",
+"  .>#$$$$$$$$$$$$$$$    ",
+" %@,$$$$$$$$$$$$$$$$$   ",
+" '-$$$$$$$$$$$$$$$$$$,  ",
+" )!~~~~~~~~~~~~~~~~~~{] ",
+" ^/(((((((((((((((((((_ ",
+"                        ",
+"                        "};
