wxformbuilder origin/HEAD origin/master
authoradouble42 <mrn@nowhere.no>
Wed, 16 Nov 2016 03:23:45 +0000 (22:23 -0500)
committeradouble42 <mrn@nowhere.no>
Wed, 16 Nov 2016 03:23:45 +0000 (22:23 -0500)
Main/Forms/Forms.cpp
Main/Forms/Forms.h
Main/Forms/MountOptionsDialog.cpp
Main/Forms/TrueCrypt.fbp
Main/Forms/TrueCrypt.fbp.bak [new file with mode: 0644]
Main/SystemPrecompiled.d

index 0eaea11..29e0c2c 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder
+// C++ code generated with wxFormBuilder (version Nov  8 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -62,7 +62,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        VolumePropertiesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Volume Properties...") ) , wxEmptyString, wxITEM_NORMAL );
        VolumesMenu->Append( VolumePropertiesMenuItem );
        
-       MainMenuBar->Append( VolumesMenu, _("&Volumes") );
+       MainMenuBar->Append( VolumesMenu, _("&Volumes") ); 
        
        FavoritesMenu = new wxMenu();
        AddToFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("Add Selected Volume to Favorites...") ) , wxEmptyString, wxITEM_NORMAL );
@@ -83,7 +83,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        
        FavoritesMenu->AppendSeparator();
        
-       MainMenuBar->Append( FavoritesMenu, _("&Favorites") );
+       MainMenuBar->Append( FavoritesMenu, _("&Favorites") ); 
        
        ToolsMenu = new wxMenu();
        wxMenuItem* BenchmarkMenuItem;
@@ -127,7 +127,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        WipeCachedPasswordsMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Wipe Cached Passwords") ) , wxEmptyString, wxITEM_NORMAL );
        ToolsMenu->Append( WipeCachedPasswordsMenuItem );
        
-       MainMenuBar->Append( ToolsMenu, _("T&ools") );
+       MainMenuBar->Append( ToolsMenu, _("T&ools") ); 
        
        SettingsMenu = new wxMenu();
        HotkeysMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("Hotkeys...") ) , wxEmptyString, wxITEM_NORMAL );
@@ -146,7 +146,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        PreferencesMenuItem = new wxMenuItem( SettingsMenu, wxID_PREFERENCES, wxString( _("&Preferences...") ) , wxEmptyString, wxITEM_NORMAL );
        SettingsMenu->Append( PreferencesMenuItem );
        
-       MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
+       MainMenuBar->Append( SettingsMenu, _("Settin&gs") ); 
        
        HelpMenu = new wxMenu();
        wxMenuItem* UserGuideMenuItem;
@@ -168,7 +168,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        HelpMenu->AppendSeparator();
        
        wxMenuItem* WebsiteMenuItem;
-       WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("nemesis Website") ) , wxEmptyString, wxITEM_NORMAL );
+       WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("nemesis website") ) , wxEmptyString, wxITEM_NORMAL );
        HelpMenu->Append( WebsiteMenuItem );
        
        wxMenuItem* DownloadsMenuItem;
@@ -197,7 +197,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        AboutMenuItem = new wxMenuItem( HelpMenu, wxID_ABOUT, wxString( _("About") ) , wxEmptyString, wxITEM_NORMAL );
        HelpMenu->Append( AboutMenuItem );
        
-       MainMenuBar->Append( HelpMenu, _("&Help") );
+       MainMenuBar->Append( HelpMenu, _("&Help") ); 
        
        this->SetMenuBar( MainMenuBar );
        
@@ -217,12 +217,14 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        SlotListCtrl = new wxListCtrl( MainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxSUNKEN_BORDER );
        sbSizer1->Add( SlotListCtrl, 1, wxALL|wxEXPAND, 5 );
        
+       
        bSizer48->Add( sbSizer1, 1, wxEXPAND, 5 );
        
        LowStaticBoxSizer = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
        
        HigherButtonSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        LowStaticBoxSizer->Add( HigherButtonSizer, 0, wxEXPAND|wxTOP, 2 );
        
        wxGridSizer* gSizer1;
@@ -235,6 +237,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        CreateVolumeButton = new wxButton( MainPanel, wxID_ANY, _("&Create Volume"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer17->Add( CreateVolumeButton, 1, wxALL|wxEXPAND, 5 );
        
+       
        gSizer1->Add( bSizer17, 0, 0, 5 );
        
        wxBoxSizer* bSizer18;
@@ -244,6 +247,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        VolumePropertiesButton = new wxButton( MainPanel, wxID_ANY, _("&Volume Properties..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
        
+       
        gSizer1->Add( bSizer18, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
        
        wxBoxSizer* bSizer19;
@@ -253,8 +257,10 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        WipeCacheButton = new wxButton( MainPanel, wxID_ANY, _("&Wipe Cache"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer19->Add( WipeCacheButton, 1, wxALL|wxALIGN_RIGHT|wxEXPAND, 5 );
        
+       
        gSizer1->Add( bSizer19, 0, wxALIGN_RIGHT, 5 );
        
+       
        LowStaticBoxSizer->Add( gSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
        
        
@@ -263,8 +269,6 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        VolumeStaticBoxSizer = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, _("Volume") ), wxVERTICAL );
        
        VolumeGridBagSizer = new wxGridBagSizer( 0, 0 );
-       VolumeGridBagSizer->AddGrowableCol( 1 );
-       VolumeGridBagSizer->AddGrowableRow( 0 );
        VolumeGridBagSizer->SetFlexibleDirection( wxBOTH );
        VolumeGridBagSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
        
@@ -283,10 +287,10 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        SelectFileButton = new wxButton( MainPanel, wxID_ANY, _("Select &File..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer191->Add( SelectFileButton, 1, wxALL|wxEXPAND, 5 );
        
+       
        VolumeGridBagSizer->Add( bSizer191, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
        
        NoHistoryCheckBox = new wxCheckBox( MainPanel, wxID_ANY, _("&Never save history"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        VolumeGridBagSizer->Add( NoHistoryCheckBox, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
        
        wxBoxSizer* bSizer20;
@@ -296,6 +300,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        VolumeToolsButton = new wxButton( MainPanel, wxID_ANY, _("Volume &Tools..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer20->Add( VolumeToolsButton, 1, wxALL|wxEXPAND, 5 );
        
+       
        VolumeGridBagSizer->Add( bSizer20, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_RIGHT, 5 );
        
        wxBoxSizer* bSizer21;
@@ -305,10 +310,16 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        SelectDeviceButton = new wxButton( MainPanel, wxID_ANY, _("Select D&evice..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer21->Add( SelectDeviceButton, 1, wxEXPAND|wxALL, 5 );
        
+       
        VolumeGridBagSizer->Add( bSizer21, wxGBPosition( 1, 3 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
        
+       
+       VolumeGridBagSizer->AddGrowableCol( 1 );
+       VolumeGridBagSizer->AddGrowableRow( 0 );
+       
        VolumeStaticBoxSizer->Add( VolumeGridBagSizer, 1, wxEXPAND|wxALL, 4 );
        
+       
        LowStaticBoxSizer->Add( VolumeStaticBoxSizer, 1, wxEXPAND, 5 );
        
        
@@ -327,6 +338,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        
        sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
        
+       
        gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
        
        wxStaticBoxSizer* sbSizer41;
@@ -337,6 +349,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        
        sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
        
+       
        gSizer2->Add( sbSizer41, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
        
        wxStaticBoxSizer* sbSizer42;
@@ -347,6 +360,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        
        sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
        
+       
        gSizer2->Add( sbSizer42, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
        
        wxStaticBoxSizer* sbSizer43;
@@ -357,19 +371,25 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        
        sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
        
+       
        gSizer2->Add( sbSizer43, 1, wxALIGN_RIGHT|wxEXPAND, 5 );
        
+       
        LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND, 5 );
        
+       
        bSizer48->Add( LowStaticBoxSizer, 0, wxEXPAND, 5 );
        
+       
        bSizer2->Add( bSizer48, 1, wxEXPAND, 5 );
        
+       
        MainPanel->SetSizer( bSizer2 );
        MainPanel->Layout();
        bSizer2->Fit( MainPanel );
        bSizer1->Add( MainPanel, 1, wxEXPAND, 0 );
        
+       
        this->SetSizer( bSizer1 );
        this->Layout();
        
@@ -465,8 +485,8 @@ MainFrameBase::~MainFrameBase()
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnHotkeysMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
-       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
-       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
+       this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
+       this->Disconnect( wxID_HELP, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
@@ -476,7 +496,7 @@ MainFrameBase::~MainFrameBase()
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVersionHistoryMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnContactMenuItemSelected ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnLegalNoticesMenuItemSelected ) );
-       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAboutMenuItemSelected ) );
+       this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAboutMenuItemSelected ) );
        SlotListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( MainFrameBase::OnListItemActivated ), NULL, this );
        SlotListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( MainFrameBase::OnListItemDeselected ), NULL, this );
        SlotListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEventHandler( MainFrameBase::OnListItemRightClick ), NULL, this );
@@ -493,6 +513,7 @@ MainFrameBase::~MainFrameBase()
        MountAllDevicesButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnMountAllDevicesButtonClick ), NULL, this );
        DismountAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnDismountAllButtonClick ), NULL, this );
        ExitButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitButtonClick ), NULL, this );
+       
 }
 
 WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
@@ -527,14 +548,18 @@ WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxStrin
        
        bSizer126->Add( PageTitleStaticText, 0, wxALL, 5 );
        
+       
        bSizer66->Add( bSizer126, 0, wxLEFT, 5 );
        
        PageSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        bSizer66->Add( PageSizer, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
        
+       
        sbSizer27->Add( bSizer66, 1, wxEXPAND|wxLEFT, 5 );
        
+       
        bSizer64->Add( sbSizer27, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
        
        wxBoxSizer* bSizer70;
@@ -562,15 +587,19 @@ WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxStrin
        CancelButton = new wxButton( MainPanel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer70->Add( CancelButton, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer64->Add( bSizer70, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
        
+       
        bSizer63->Add( bSizer64, 1, wxEXPAND, 5 );
        
+       
        MainPanel->SetSizer( bSizer63 );
        MainPanel->Layout();
        bSizer63->Fit( MainPanel );
        bSizer92->Add( MainPanel, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer92 );
        this->Layout();
        bSizer92->Fit( this );
@@ -595,6 +624,7 @@ WizardFrameBase::~WizardFrameBase()
        PreviousButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WizardFrameBase::OnPreviousButtonClick ), NULL, this );
        NextButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WizardFrameBase::OnNextButtonClick ), NULL, this );
        CancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WizardFrameBase::OnCancelButtonClick ), NULL, this );
+       
 }
 
 AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -626,13 +656,16 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
        LogoBitmap = new wxStaticBitmap( m_panel14, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
        bSizer122->Add( LogoBitmap, 0, wxALL, 10 );
        
+       
        bSizer121->Add( bSizer122, 0, wxEXPAND|wxLEFT, 8 );
        
+       
        m_panel14->SetSizer( bSizer121 );
        m_panel14->Layout();
        bSizer121->Fit( m_panel14 );
        bSizer120->Add( m_panel14, 1, wxEXPAND, 5 );
        
+       
        bSizer117->Add( bSizer120, 0, wxEXPAND, 5 );
        
        wxBoxSizer* bSizer118;
@@ -662,14 +695,17 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
        WebsiteHyperlink->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
        bSizer123->Add( WebsiteHyperlink, 0, wxALL, 5 );
        
+       
        bSizer118->Add( bSizer123, 1, wxEXPAND|wxLEFT, 5 );
        
+       
        bSizer117->Add( bSizer118, 1, wxALL|wxEXPAND, 15 );
        
        m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
        bSizer117->Add( m_staticline3, 0, wxEXPAND|wxBOTTOM, 5 );
        
        CreditsTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxSUNKEN_BORDER );
+       CreditsTextCtrl->SetMaxLength( 0 ); 
        bSizer117->Add( CreditsTextCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
        
        
@@ -695,10 +731,13 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
        
        bSizer119->Add( 0, 0, 0, wxLEFT, 5 );
        
+       
        bSizer117->Add( bSizer119, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 6 );
        
+       
        bSizer116->Add( bSizer117, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer116 );
        this->Layout();
        bSizer116->Fit( this );
@@ -711,6 +750,7 @@ AboutDialogBase::~AboutDialogBase()
 {
        // Disconnect Events
        WebsiteHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( AboutDialogBase::OnWebsiteHyperlinkClick ), NULL, this );
+       
 }
 
 BenchmarkDialogBase::BenchmarkDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -736,6 +776,7 @@ BenchmarkDialogBase::BenchmarkDialogBase( wxWindow* parent, wxWindowID id, const
        BufferSizeChoice->SetSelection( 0 );
        bSizer155->Add( BufferSizeChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer154->Add( bSizer155, 0, wxEXPAND, 5 );
        
        wxStaticLine* m_staticline6;
@@ -765,12 +806,16 @@ BenchmarkDialogBase::BenchmarkDialogBase( wxWindow* parent, wxWindowID id, const
        BenchmarkNoteStaticText->Wrap( -1 );
        RightSizer->Add( BenchmarkNoteStaticText, 1, wxALL|wxEXPAND, 5 );
        
+       
        bSizer156->Add( RightSizer, 0, wxEXPAND, 5 );
        
+       
        bSizer154->Add( bSizer156, 1, wxEXPAND, 5 );
        
+       
        bSizer153->Add( bSizer154, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer153 );
        this->Layout();
        bSizer153->Fit( this );
@@ -783,6 +828,7 @@ BenchmarkDialogBase::~BenchmarkDialogBase()
 {
        // Disconnect Events
        BenchmarkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BenchmarkDialogBase::OnBenchmarkButtonClick ), NULL, this );
+       
 }
 
 ChangePasswordDialogBase::ChangePasswordDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -803,18 +849,23 @@ ChangePasswordDialogBase::ChangePasswordDialogBase( wxWindow* parent, wxWindowID
        
        CurrentPasswordPanelSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        CurrentSizer->Add( CurrentPasswordPanelSizer, 0, wxALIGN_RIGHT, 5 );
        
+       
        bSizer32->Add( CurrentSizer, 0, wxEXPAND, 5 );
        
        NewSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("New") ), wxVERTICAL );
        
        NewPasswordPanelSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        NewSizer->Add( NewPasswordPanelSizer, 0, wxALIGN_RIGHT, 5 );
        
+       
        bSizer32->Add( NewSizer, 0, wxTOP|wxEXPAND, 5 );
        
+       
        bSizer31->Add( bSizer32, 1, wxEXPAND|wxALL, 5 );
        
        wxBoxSizer* bSizer33;
@@ -827,10 +878,13 @@ ChangePasswordDialogBase::ChangePasswordDialogBase( wxWindow* parent, wxWindowID
        CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer33->Add( CancelButton, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer31->Add( bSizer33, 0, 0, 5 );
        
+       
        bSizer30->Add( bSizer31, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer30 );
        this->Layout();
        bSizer30->Fit( this );
@@ -843,6 +897,7 @@ ChangePasswordDialogBase::~ChangePasswordDialogBase()
 {
        // Disconnect Events
        OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ChangePasswordDialogBase::OnOKButtonClick ), NULL, this );
+       
 }
 
 DeviceSelectionDialogBase::DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -865,10 +920,13 @@ DeviceSelectionDialogBase::DeviceSelectionDialogBase( wxWindow* parent, wxWindow
        StdButtonsCancel = new wxButton( this, wxID_CANCEL );
        StdButtons->AddButton( StdButtonsCancel );
        StdButtons->Realize();
+       
        bSizer4->Add( StdButtons, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer3->Add( bSizer4, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer3 );
        this->Layout();
        bSizer3->Fit( this );
@@ -887,6 +945,7 @@ DeviceSelectionDialogBase::~DeviceSelectionDialogBase()
        DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemActivated ), NULL, this );
        DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemDeselected ), NULL, this );
        DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemSelected ), NULL, this );
+       
 }
 
 EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -913,16 +972,17 @@ EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID
        bSizer134->Add( EncryptionAlgorithmChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
        XtsModeCheckBox = new wxCheckBox( this, wxID_ANY, _("XTS mode"), wxDefaultPosition, wxDefaultSize, 0 );
-       XtsModeCheckBox->SetValue(true);
-       
+       XtsModeCheckBox->SetValue(true); 
        bSizer134->Add( XtsModeCheckBox, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer133->Add( bSizer134, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
        
        wxStaticBoxSizer* sbSizer38;
        sbSizer38 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Key (hexadecimal)") ), wxVERTICAL );
        
        KeyTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       KeyTextCtrl->SetMaxLength( 0 ); 
        KeyTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
        
        sbSizer38->Add( KeyTextCtrl, 1, wxALL|wxEXPAND, 5 );
@@ -939,8 +999,10 @@ EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID
        KeySizeStaticText->Wrap( -1 );
        bSizer135->Add( KeySizeStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
        
+       
        sbSizer38->Add( bSizer135, 0, wxEXPAND, 5 );
        
+       
        bSizer133->Add( sbSizer38, 0, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer39;
@@ -952,6 +1014,7 @@ EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID
        sbSizer39->Add( m_staticText45, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
        
        SecondaryKeyTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       SecondaryKeyTextCtrl->SetMaxLength( 0 ); 
        SecondaryKeyTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
        
        sbSizer39->Add( SecondaryKeyTextCtrl, 0, wxEXPAND|wxALL, 5 );
@@ -962,6 +1025,7 @@ EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID
        sbSizer39->Add( m_staticText46, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
        
        DataUnitNumberTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       DataUnitNumberTextCtrl->SetMaxLength( 0 ); 
        sbSizer39->Add( DataUnitNumberTextCtrl, 0, wxALL, 5 );
        
        wxStaticText* m_staticText47;
@@ -970,28 +1034,34 @@ EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID
        sbSizer39->Add( m_staticText47, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
        
        BlockNumberTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       BlockNumberTextCtrl->SetMaxLength( 0 ); 
        sbSizer39->Add( BlockNumberTextCtrl, 0, wxALL, 5 );
        
+       
        bSizer133->Add( sbSizer39, 1, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer40;
        sbSizer40 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Plaintext (hexadecimal)") ), wxVERTICAL );
        
        PlainTextTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       PlainTextTextCtrl->SetMaxLength( 0 ); 
        PlainTextTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
        
        sbSizer40->Add( PlainTextTextCtrl, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer133->Add( sbSizer40, 0, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer41;
        sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Ciphertext (hexadecimal)") ), wxVERTICAL );
        
        CipherTextTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       CipherTextTextCtrl->SetMaxLength( 0 ); 
        CipherTextTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
        
        sbSizer41->Add( CipherTextTextCtrl, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer133->Add( sbSizer41, 0, wxEXPAND|wxALL, 5 );
        
        wxBoxSizer* bSizer136;
@@ -1012,10 +1082,13 @@ EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID
        CloseButton = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer136->Add( CloseButton, 0, wxALL, 5 );
        
+       
        bSizer133->Add( bSizer136, 0, wxEXPAND, 5 );
        
+       
        bSizer132->Add( bSizer133, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer132 );
        this->Layout();
        bSizer132->Fit( this );
@@ -1038,6 +1111,7 @@ EncryptionTestDialogBase::~EncryptionTestDialogBase()
        DecryptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnDecryptButtonClick ), NULL, this );
        AutoTestAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnAutoTestAllButtonClick ), NULL, this );
        ResetButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnResetButtonClick ), NULL, this );
+       
 }
 
 FavoriteVolumesDialogBase::FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -1071,6 +1145,7 @@ FavoriteVolumesDialogBase::FavoriteVolumesDialogBase( wxWindow* parent, wxWindow
        RemoveAllButton = new wxButton( this, wxID_ANY, _("Remove &All"), wxDefaultPosition, wxDefaultSize, 0 );
        gSizer5->Add( RemoveAllButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
        
+       
        bSizer58->Add( gSizer5, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
        
        wxFlexGridSizer* fgSizer4;
@@ -1082,8 +1157,10 @@ FavoriteVolumesDialogBase::FavoriteVolumesDialogBase( wxWindow* parent, wxWindow
        
        fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
        
+       
        bSizer58->Add( fgSizer4, 0, wxEXPAND, 5 );
        
+       
        bSizer60->Add( bSizer58, 1, wxEXPAND, 5 );
        
        wxBoxSizer* bSizer59;
@@ -1096,10 +1173,13 @@ FavoriteVolumesDialogBase::FavoriteVolumesDialogBase( wxWindow* parent, wxWindow
        CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer59->Add( CancelButton, 0, wxALL, 5 );
        
+       
        bSizer60->Add( bSizer59, 0, wxEXPAND, 5 );
        
+       
        bSizer57->Add( bSizer60, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer57 );
        this->Layout();
        bSizer57->Fit( this );
@@ -1124,6 +1204,7 @@ FavoriteVolumesDialogBase::~FavoriteVolumesDialogBase()
        RemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FavoriteVolumesDialogBase::OnRemoveButtonClick ), NULL, this );
        RemoveAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FavoriteVolumesDialogBase::OnRemoveAllButtonClick ), NULL, this );
        OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FavoriteVolumesDialogBase::OnOKButtonClick ), NULL, this );
+       
 }
 
 KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -1138,6 +1219,7 @@ KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const w
        
        PanelSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        UpperSizer->Add( PanelSizer, 1, wxEXPAND, 5 );
        
        wxBoxSizer* bSizer22;
@@ -1154,8 +1236,10 @@ KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const w
        WarningStaticText->Wrap( -1 );
        bSizer22->Add( WarningStaticText, 1, wxALL|wxEXPAND, 5 );
        
+       
        UpperSizer->Add( bSizer22, 0, wxEXPAND, 5 );
        
+       
        bSizer26->Add( UpperSizer, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
        
        wxBoxSizer* bSizer23;
@@ -1175,6 +1259,7 @@ KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const w
        m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
        KeyfilesNoteSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
        
+       
        bSizer23->Add( KeyfilesNoteSizer, 1, wxEXPAND, 5 );
        
        wxFlexGridSizer* fgSizer2;
@@ -1193,10 +1278,13 @@ KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const w
        CreateKeyfileButtton = new wxButton( this, wxID_ANY, _("&Generate Random Keyfile..."), wxDefaultPosition, wxDefaultSize, 0 );
        fgSizer2->Add( CreateKeyfileButtton, 0, wxALL, 5 );
        
+       
        bSizer23->Add( fgSizer2, 0, wxEXPAND, 5 );
        
+       
        bSizer26->Add( bSizer23, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
        
+       
        this->SetSizer( bSizer26 );
        this->Layout();
        bSizer26->Fit( this );
@@ -1211,6 +1299,7 @@ KeyfilesDialogBase::~KeyfilesDialogBase()
        // Disconnect Events
        KeyfilesHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( KeyfilesDialogBase::OnKeyfilesHyperlinkClick ), NULL, this );
        CreateKeyfileButtton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesDialogBase::OnCreateKeyfileButttonClick ), NULL, this );
+       
 }
 
 KeyfileGeneratorDialogBase::KeyfileGeneratorDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -1241,6 +1330,7 @@ KeyfileGeneratorDialogBase::KeyfileGeneratorDialogBase( wxWindow* parent, wxWind
        
        bSizer145->Add( 0, 0, 1, wxEXPAND, 5 );
        
+       
        bSizer144->Add( bSizer145, 0, wxEXPAND, 5 );
        
        wxStaticBoxSizer* sbSizer43;
@@ -1261,10 +1351,10 @@ KeyfileGeneratorDialogBase::KeyfileGeneratorDialogBase( wxWindow* parent, wxWind
        bSizer147->Add( RandomPoolStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
        ShowRandomPoolCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
-       ShowRandomPoolCheckBox->SetValue(true);
-       
+       ShowRandomPoolCheckBox->SetValue(true); 
        bSizer147->Add( ShowRandomPoolCheckBox, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        sbSizer43->Add( bSizer147, 0, wxEXPAND|wxTOP, 5 );
        
        
@@ -1277,6 +1367,7 @@ KeyfileGeneratorDialogBase::KeyfileGeneratorDialogBase( wxWindow* parent, wxWind
        
        sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
        
+       
        bSizer144->Add( sbSizer43, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
        
        wxBoxSizer* bSizer146;
@@ -1292,10 +1383,13 @@ KeyfileGeneratorDialogBase::KeyfileGeneratorDialogBase( wxWindow* parent, wxWind
        m_button61 = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer146->Add( m_button61, 0, wxALL, 5 );
        
+       
        bSizer144->Add( bSizer146, 0, wxEXPAND, 5 );
        
+       
        MainSizer->Add( bSizer144, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( MainSizer );
        this->Layout();
        MainSizer->Fit( this );
@@ -1314,6 +1408,7 @@ KeyfileGeneratorDialogBase::~KeyfileGeneratorDialogBase()
        HashChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnHashSelected ), NULL, this );
        ShowRandomPoolCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnShowRandomPoolCheckBoxClicked ), NULL, this );
        GenerateButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnGenerateButtonClick ), NULL, this );
+       
 }
 
 LegalNoticesDialogBase::LegalNoticesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -1327,6 +1422,7 @@ LegalNoticesDialogBase::LegalNoticesDialogBase( wxWindow* parent, wxWindowID id,
        bSizer115 = new wxBoxSizer( wxVERTICAL );
        
        LegalNoticesTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+       LegalNoticesTextCtrl->SetMaxLength( 0 ); 
        bSizer115->Add( LegalNoticesTextCtrl, 1, wxALL|wxEXPAND, 5 );
        
        wxButton* OKButton;
@@ -1334,8 +1430,10 @@ LegalNoticesDialogBase::LegalNoticesDialogBase( wxWindow* parent, wxWindowID id,
        OKButton->SetDefault(); 
        bSizer115->Add( OKButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
        
+       
        bSizer114->Add( bSizer115, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer114 );
        this->Layout();
        bSizer114->Fit( this );
@@ -1361,6 +1459,7 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        
        PasswordSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        bSizer14->Add( PasswordSizer, 1, wxEXPAND, 5 );
        
        wxBoxSizer* bSizer9;
@@ -1379,8 +1478,10 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        OptionsButton = new wxButton( this, wxID_ANY, _("Op&tions"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer9->Add( OptionsButton, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer14->Add( bSizer9, 0, wxEXPAND, 5 );
        
+       
        bSizer19->Add( bSizer14, 0, wxEXPAND|wxALL, 5 );
        
        wxBoxSizer* bSizer6;
@@ -1392,34 +1493,25 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        
        OptionsSizer->Add( 0, 0, 0, wxTOP, 5 );
        
-       ReadOnlyCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount volume as &read-only"), wxDefaultPosition, wxDefaultSize, 0 );
-       
+       ReadOnlyCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount &read-only"), wxDefaultPosition, wxDefaultSize, 0 );
        OptionsSizer->Add( ReadOnlyCheckBox, 0, wxALL, 5 );
        
        RemovableCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount volume as removable &medium"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        OptionsSizer->Add( RemovableCheckBox, 0, wxALL, 5 );
        
        PartitionInSystemEncryptionScopeCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount partition &using system encryption (preboot authentication)"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        OptionsSizer->Add( PartitionInSystemEncryptionScopeCheckBox, 0, wxALL, 5 );
        
        ProtectionSizer = new wxStaticBoxSizer( new wxStaticBox( OptionsPanel, wxID_ANY, _("Hidden Volume Protection") ), wxVERTICAL );
        
        ProtectionCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("&Protect hidden volume when mounting outer volume"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        ProtectionSizer->Add( ProtectionCheckBox, 0, wxALL, 5 );
        
        ProtectionPasswordSizer = new wxBoxSizer( wxVERTICAL );
        
-       ProtectionSizer->Add( ProtectionPasswordSizer, 1, wxEXPAND|wxLEFT, 5 );
        
-       ProtectionHyperlinkCtrl = new wxHyperlinkCtrl( OptionsPanel, wxID_ANY, _("What is hidden volume protection?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+       ProtectionSizer->Add( ProtectionPasswordSizer, 1, wxEXPAND|wxLEFT, 5 );
        
-       ProtectionHyperlinkCtrl->SetHoverColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
-       ProtectionHyperlinkCtrl->SetNormalColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
-       ProtectionHyperlinkCtrl->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
-       ProtectionSizer->Add( ProtectionHyperlinkCtrl, 0, wxALL, 5 );
        
        OptionsSizer->Add( ProtectionSizer, 1, wxEXPAND|wxALL, 5 );
        
@@ -1436,19 +1528,19 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        bSizer55 = new wxBoxSizer( wxVERTICAL );
        
        NoFilesystemCheckBox = new wxCheckBox( m_panel8, wxID_ANY, _("Do &not mount"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        bSizer55->Add( NoFilesystemCheckBox, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
        
+       
        bSizer54->Add( bSizer55, 1, wxEXPAND, 5 );
        
        FilesystemOptionsSizer = new wxGridBagSizer( 0, 0 );
-       FilesystemOptionsSizer->AddGrowableCol( 1 );
        FilesystemOptionsSizer->SetFlexibleDirection( wxBOTH );
        FilesystemOptionsSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
        FilesystemOptionsSizer->SetEmptyCellSize( wxSize( 0,0 ) );
        
        FilesystemSpacer = new wxBoxSizer( wxVERTICAL );
        
+       
        FilesystemOptionsSizer->Add( FilesystemSpacer, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 5 );
        
        MountPointTextCtrlStaticText = new wxStaticText( m_panel8, wxID_ANY, _("Mount at directory:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1456,6 +1548,7 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        FilesystemOptionsSizer->Add( MountPointTextCtrlStaticText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
        
        MountPointTextCtrl = new wxTextCtrl( m_panel8, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       MountPointTextCtrl->SetMaxLength( 0 ); 
        FilesystemOptionsSizer->Add( MountPointTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
        
        MountPointButton = new wxButton( m_panel8, wxID_ANY, _("Se&lect..."), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1466,28 +1559,39 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        FilesystemOptionsSizer->Add( FilesystemOptionsStaticText, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 );
        
        FilesystemOptionsTextCtrl = new wxTextCtrl( m_panel8, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       FilesystemOptionsTextCtrl->SetMaxLength( 0 ); 
        FilesystemOptionsSizer->Add( FilesystemOptionsTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
        
+       
+       FilesystemOptionsSizer->AddGrowableCol( 1 );
+       
        bSizer54->Add( FilesystemOptionsSizer, 0, wxEXPAND, 5 );
        
+       
        sbSizer28->Add( bSizer54, 0, wxEXPAND|wxBOTTOM, 5 );
        
+       
        m_panel8->SetSizer( sbSizer28 );
        m_panel8->Layout();
        sbSizer28->Fit( m_panel8 );
        FilesystemSizer->Add( m_panel8, 0, wxEXPAND | wxALL, 5 );
        
+       
        OptionsSizer->Add( FilesystemSizer, 0, wxEXPAND, 5 );
        
+       
        OptionsPanel->SetSizer( OptionsSizer );
        OptionsPanel->Layout();
        OptionsSizer->Fit( OptionsPanel );
        bSizer6->Add( OptionsPanel, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
        
+       
        bSizer19->Add( bSizer6, 0, wxEXPAND, 5 );
        
+       
        bSizer5->Add( bSizer19, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer5 );
        this->Layout();
        bSizer5->Fit( this );
@@ -1500,7 +1604,6 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
        OptionsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnOptionsButtonClick ), NULL, this );
        ReadOnlyCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnReadOnlyCheckBoxClick ), NULL, this );
        ProtectionCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnProtectionCheckBoxClick ), NULL, this );
-       ProtectionHyperlinkCtrl->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( MountOptionsDialogBase::OnProtectionHyperlinkClick ), NULL, this );
        NoFilesystemCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnNoFilesystemCheckBoxClick ), NULL, this );
        MountPointButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnMountPointButtonClick ), NULL, this );
 }
@@ -1513,9 +1616,9 @@ MountOptionsDialogBase::~MountOptionsDialogBase()
        OptionsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnOptionsButtonClick ), NULL, this );
        ReadOnlyCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnReadOnlyCheckBoxClick ), NULL, this );
        ProtectionCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnProtectionCheckBoxClick ), NULL, this );
-       ProtectionHyperlinkCtrl->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( MountOptionsDialogBase::OnProtectionHyperlinkClick ), NULL, this );
        NoFilesystemCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnNoFilesystemCheckBoxClick ), NULL, this );
        MountPointButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnMountPointButtonClick ), NULL, this );
+       
 }
 
 NewSecurityTokenKeyfileDialogBase::NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -1552,10 +1655,13 @@ NewSecurityTokenKeyfileDialogBase::NewSecurityTokenKeyfileDialogBase( wxWindow*
        fgSizer7->Add( m_staticText48, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
        
        KeyfileNameTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       KeyfileNameTextCtrl->SetMaxLength( 0 ); 
        fgSizer7->Add( KeyfileNameTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
        
+       
        sbSizer42->Add( fgSizer7, 1, wxEXPAND|wxTOP, 5 );
        
+       
        bSizer144->Add( sbSizer42, 1, wxEXPAND|wxALL, 5 );
        
        StdButtons = new wxStdDialogButtonSizer();
@@ -1564,10 +1670,13 @@ NewSecurityTokenKeyfileDialogBase::NewSecurityTokenKeyfileDialogBase( wxWindow*
        StdButtonsCancel = new wxButton( this, wxID_CANCEL );
        StdButtons->AddButton( StdButtonsCancel );
        StdButtons->Realize();
+       
        bSizer144->Add( StdButtons, 0, wxALIGN_RIGHT|wxALL, 5 );
        
+       
        bSizer143->Add( bSizer144, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer143 );
        this->Layout();
        bSizer143->Fit( this );
@@ -1580,6 +1689,7 @@ NewSecurityTokenKeyfileDialogBase::~NewSecurityTokenKeyfileDialogBase()
 {
        // Disconnect Events
        KeyfileNameTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( NewSecurityTokenKeyfileDialogBase::OnKeyfileNameChanged ), NULL, this );
+       
 }
 
 PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -1607,24 +1717,21 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Dismount All Volumes When") ), wxVERTICAL );
        
        DismountOnLogOffCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("User logs off"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer13->Add( DismountOnLogOffCheckBox, 0, wxALL, 5 );
        
        DismountOnScreenSaverCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Screen saver is launched"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer13->Add( DismountOnScreenSaverCheckBox, 0, wxALL, 5 );
        
        DismountOnPowerSavingCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("System is entering power saving mode"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer13->Add( DismountOnPowerSavingCheckBox, 0, wxALL, 5 );
        
+       
        AutoDismountSizer->Add( sbSizer13, 0, wxEXPAND|wxALL, 5 );
        
        wxBoxSizer* bSizer34;
        bSizer34 = new wxBoxSizer( wxHORIZONTAL );
        
        DismountOnInactivityCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Auto-dismount volume after no data has been read/written to it for"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        bSizer34->Add( DismountOnInactivityCheckBox, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
        
        DismountOnInactivitySpinCtrl = new wxSpinCtrl( SecurityPage, wxID_ANY, wxT("1"), wxDefaultPosition, wxSize( 60,-1 ), wxSP_ARROW_KEYS, 1, 9999, 1 );
@@ -1635,41 +1742,43 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        m_staticText5->Wrap( -1 );
        bSizer34->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
        
+       
        AutoDismountSizer->Add( bSizer34, 0, wxEXPAND, 5 );
        
        ForceAutoDismountCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Force auto-dismount even if volume contains open files or directories"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        AutoDismountSizer->Add( ForceAutoDismountCheckBox, 0, wxALL, 5 );
        
+       
        bSizer33->Add( AutoDismountSizer, 0, wxEXPAND|wxALL, 5 );
        
        FilesystemSecuritySizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Filesystem") ), wxVERTICAL );
        
        PreserveTimestampsCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Preserve modification timestamp of file containers"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        FilesystemSecuritySizer->Add( PreserveTimestampsCheckBox, 0, wxALL, 5 );
        
+       
        bSizer33->Add( FilesystemSecuritySizer, 0, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer14;
        sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
        
        WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after nemesis window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
        
        WipeCacheOnAutoDismountCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after volume has been auto-dismounted"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer14->Add( WipeCacheOnAutoDismountCheckBox, 0, wxALL, 5 );
        
+       
        bSizer33->Add( sbSizer14, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer44->Add( bSizer33, 1, wxEXPAND|wxALL, 5 );
        
+       
        SecurityPage->SetSizer( bSizer44 );
        SecurityPage->Layout();
        bSizer44->Fit( SecurityPage );
-       PreferencesNotebook->AddPage( SecurityPage, _("Security"), true );
+       PreferencesNotebook->AddPage( SecurityPage, _("Security"), false );
        DefaultMountOptionsPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
        wxBoxSizer* bSizer46;
        bSizer46 = new wxBoxSizer( wxVERTICAL );
@@ -1681,17 +1790,15 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        sbSizer15 = new wxStaticBoxSizer( new wxStaticBox( DefaultMountOptionsPage, wxID_ANY, _("Default Mount Options") ), wxVERTICAL );
        
        MountReadOnlyCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("Mount volumes as read-only"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer15->Add( MountReadOnlyCheckBox, 0, wxALL, 5 );
        
        MountRemovableCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("Mount volumes as removable media"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer15->Add( MountRemovableCheckBox, 0, wxALL, 5 );
        
        CachePasswordsCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("Cache passwords in memory"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer15->Add( CachePasswordsCheckBox, 0, wxALL, 5 );
        
+       
        bSizer35->Add( sbSizer15, 0, wxEXPAND|wxALL, 5 );
        
        FilesystemSizer = new wxStaticBoxSizer( new wxStaticBox( DefaultMountOptionsPage, wxID_ANY, _("Filesystem") ), wxVERTICAL );
@@ -1708,18 +1815,23 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        fgSizer3->Add( m_staticText6, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
        
        FilesystemOptionsTextCtrl = new wxTextCtrl( DefaultMountOptionsPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       FilesystemOptionsTextCtrl->SetMaxLength( 0 ); 
        fgSizer3->Add( FilesystemOptionsTextCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        FilesystemSizer->Add( fgSizer3, 1, wxEXPAND, 5 );
        
+       
        bSizer35->Add( FilesystemSizer, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer46->Add( bSizer35, 1, wxEXPAND|wxALL, 5 );
        
+       
        DefaultMountOptionsPage->SetSizer( bSizer46 );
        DefaultMountOptionsPage->Layout();
        bSizer46->Fit( DefaultMountOptionsPage );
-       PreferencesNotebook->AddPage( DefaultMountOptionsPage, _("Mount Options"), false );
+       PreferencesNotebook->AddPage( DefaultMountOptionsPage, _("Mount Options"), true );
        BackgroundTaskPanel = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
        wxBoxSizer* bSizer61;
        bSizer61 = new wxBoxSizer( wxVERTICAL );
@@ -1728,37 +1840,36 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        bSizer62 = new wxBoxSizer( wxVERTICAL );
        
        wxStaticBoxSizer* sbSizer18;
-       sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("nemesis Background Task") ), wxVERTICAL );
+       sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("nemesis background task") ), wxVERTICAL );
        
        BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer18->Add( BackgroundTaskEnabledCheckBox, 0, wxALL, 5 );
        
        CloseBackgroundTaskOnNoVolumesCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Exit when there are no mounted volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer18->Add( CloseBackgroundTaskOnNoVolumesCheckBox, 0, wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer26;
        sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("Task Icon Menu Items") ), wxVERTICAL );
        
        BackgroundTaskMenuMountItemsEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Mount Favorite Volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer26->Add( BackgroundTaskMenuMountItemsEnabledCheckBox, 0, wxALL, 5 );
        
        BackgroundTaskMenuOpenItemsEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Open Mounted Volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer26->Add( BackgroundTaskMenuOpenItemsEnabledCheckBox, 0, wxALL, 5 );
        
        BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Dismount Mounted Volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer26->Add( BackgroundTaskMenuDismountItemsEnabledCheckBox, 0, wxALL, 5 );
        
+       
        sbSizer18->Add( sbSizer26, 1, wxEXPAND|wxALL, 5 );
        
+       
        bSizer62->Add( sbSizer18, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer61->Add( bSizer62, 1, wxEXPAND|wxALL, 5 );
        
+       
        BackgroundTaskPanel->SetSizer( bSizer61 );
        BackgroundTaskPanel->Layout();
        bSizer61->Fit( BackgroundTaskPanel );
@@ -1773,41 +1884,40 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
        
        StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start nemesis Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
        
        MountFavoritesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount favorite volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
        
        MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted nemesis volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
        
+       
        bSizer37->Add( LogOnSizer, 0, wxALL|wxEXPAND, 5 );
        
        ExplorerSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Filesystem Explorer") ), wxVERTICAL );
        
        OpenExplorerWindowAfterMountCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Open Explorer window for successfully mounted volume"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        ExplorerSizer->Add( OpenExplorerWindowAfterMountCheckBox, 0, wxALL, 5 );
        
        CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Close all Explorer windows of volume being dismounted"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        ExplorerSizer->Add( CloseExplorerWindowsOnDismountCheckBox, 0, wxALL, 5 );
        
+       
        bSizer37->Add( ExplorerSizer, 0, wxEXPAND|wxALL, 5 );
        
        KernelServicesSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Kernel Services") ), wxVERTICAL );
        
        NoKernelCryptoCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Do not use kernel cryptographic services"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        KernelServicesSizer->Add( NoKernelCryptoCheckBox, 0, wxALL, 5 );
        
+       
        bSizer37->Add( KernelServicesSizer, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer49->Add( bSizer37, 1, wxEXPAND|wxALL, 5 );
        
+       
        SystemIntegrationPage->SetSizer( bSizer49 );
        SystemIntegrationPage->Layout();
        bSizer49->Fit( SystemIntegrationPage );
@@ -1834,19 +1944,22 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        AesHwCpuSupportedStaticText->Wrap( -1 );
        bSizer158->Add( AesHwCpuSupportedStaticText, 0, wxALL, 5 );
        
+       
        sbSizer44->Add( bSizer158, 1, wxEXPAND, 5 );
        
        
        sbSizer44->Add( 0, 0, 0, wxBOTTOM, 5 );
        
        NoHardwareCryptoCheckBox = new wxCheckBox( PerformanceOptionsPage, wxID_ANY, _("Do not accelerate AES encryption/decryption by using the AES instructions of the processor"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer44->Add( NoHardwareCryptoCheckBox, 0, wxALL, 5 );
        
+       
        bSizer152->Add( sbSizer44, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer151->Add( bSizer152, 1, wxALL|wxEXPAND, 5 );
        
+       
        PerformanceOptionsPage->SetSizer( bSizer151 );
        PerformanceOptionsPage->Layout();
        bSizer151->Fit( PerformanceOptionsPage );
@@ -1863,16 +1976,19 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        
        DefaultKeyfilesSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        bSizer42->Add( DefaultKeyfilesSizer, 1, wxEXPAND, 5 );
        
+       
        bSizer43->Add( bSizer42, 1, wxEXPAND|wxALL, 5 );
        
        UseKeyfilesCheckBox = new wxCheckBox( DefaultKeyfilesPage, wxID_ANY, _("Use keyfiles by default"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        bSizer43->Add( UseKeyfilesCheckBox, 0, wxALL, 5 );
        
+       
        bSizer40->Add( bSizer43, 1, wxEXPAND|wxALL, 5 );
        
+       
        DefaultKeyfilesPage->SetSizer( bSizer40 );
        DefaultKeyfilesPage->Layout();
        bSizer40->Fit( DefaultKeyfilesPage );
@@ -1891,26 +2007,31 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        bSizer129 = new wxBoxSizer( wxHORIZONTAL );
        
        Pkcs11ModulePathTextCtrl = new wxTextCtrl( SecurityTokensPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       Pkcs11ModulePathTextCtrl->SetMaxLength( 0 ); 
        bSizer129->Add( Pkcs11ModulePathTextCtrl, 1, wxALL, 5 );
        
        SelectPkcs11ModuleButton = new wxButton( SecurityTokensPage, wxID_ANY, _("Select &Library..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer129->Add( SelectPkcs11ModuleButton, 0, wxALL, 5 );
        
+       
        sbSizer36->Add( bSizer129, 1, wxEXPAND, 5 );
        
+       
        bSizer128->Add( sbSizer36, 0, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer37;
        sbSizer37 = new wxStaticBoxSizer( new wxStaticBox( SecurityTokensPage, wxID_ANY, _("Security Options") ), wxVERTICAL );
        
        CloseSecurityTokenSessionsAfterMountCheckBox = new wxCheckBox( SecurityTokensPage, wxID_ANY, _("&Close token session (log out) after a volume is successfully mounted"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer37->Add( CloseSecurityTokenSessionsAfterMountCheckBox, 0, wxALL, 5 );
        
+       
        bSizer128->Add( sbSizer37, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer127->Add( bSizer128, 1, wxEXPAND|wxALL, 5 );
        
+       
        SecurityTokensPage->SetSizer( bSizer127 );
        SecurityTokensPage->Layout();
        bSizer127->Fit( SecurityTokensPage );
@@ -1942,6 +2063,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        fgSizer4->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
        
        HotkeyTextCtrl = new wxTextCtrl( HotkeysPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       HotkeyTextCtrl->SetMaxLength( 0 ); 
        fgSizer4->Add( HotkeyTextCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
        
        AssignHotkeyButton = new wxButton( HotkeysPage, wxID_ANY, _("Assign"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1954,47 +2076,48 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        gSizer4 = new wxGridSizer( 1, 4, 0, 0 );
        
        HotkeyControlCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Control"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        gSizer4->Add( HotkeyControlCheckBox, 0, wxALL, 5 );
        
        HotkeyShiftCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        gSizer4->Add( HotkeyShiftCheckBox, 0, wxALL, 5 );
        
        HotkeyAltCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Alt"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        gSizer4->Add( HotkeyAltCheckBox, 0, wxALL, 5 );
        
        HotkeyWinCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Win"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        gSizer4->Add( HotkeyWinCheckBox, 0, wxALL, 5 );
        
+       
        fgSizer4->Add( gSizer4, 1, wxEXPAND, 5 );
        
        RemoveHotkeyButton = new wxButton( HotkeysPage, wxID_ANY, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
        fgSizer4->Add( RemoveHotkeyButton, 1, wxALL, 5 );
        
+       
        sbSizer23->Add( fgSizer4, 1, wxALIGN_RIGHT, 5 );
        
+       
        sbSizer21->Add( sbSizer23, 0, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer24;
        sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( HotkeysPage, wxID_ANY, _("Options") ), wxVERTICAL );
        
        BeepAfterHotkeyMountDismountCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Play system notification sound after mount/dismount"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer24->Add( BeepAfterHotkeyMountDismountCheckBox, 0, wxALL, 5 );
        
        DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Display confirmation message box after dismount"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer24->Add( DisplayMessageAfterHotkeyDismountCheckBox, 0, wxALL, 5 );
        
+       
        sbSizer21->Add( sbSizer24, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer38->Add( sbSizer21, 1, wxEXPAND|wxALL, 5 );
        
+       
        bSizer51->Add( bSizer38, 1, wxEXPAND|wxALL, 5 );
        
+       
        HotkeysPage->SetSizer( bSizer51 );
        HotkeysPage->Layout();
        bSizer51->Fit( HotkeysPage );
@@ -2008,10 +2131,13 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
        StdButtonsCancel = new wxButton( this, wxID_CANCEL );
        StdButtons->AddButton( StdButtonsCancel );
        StdButtons->Realize();
+       
        bSizer41->Add( StdButtons, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer32->Add( bSizer41, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer32 );
        this->Layout();
        bSizer32->Fit( this );
@@ -2052,6 +2178,7 @@ PreferencesDialogBase::~PreferencesDialogBase()
        RemoveHotkeyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnRemoveHotkeyButtonClick ), NULL, this );
        StdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnCancelButtonClick ), NULL, this );
        StdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnOKButtonClick ), NULL, this );
+       
 }
 
 RandomPoolEnrichmentDialogBase::RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -2082,6 +2209,7 @@ RandomPoolEnrichmentDialogBase::RandomPoolEnrichmentDialogBase( wxWindow* parent
        
        bSizer145->Add( 0, 0, 1, wxEXPAND, 5 );
        
+       
        bSizer144->Add( bSizer145, 0, wxEXPAND, 5 );
        
        wxStaticBoxSizer* sbSizer43;
@@ -2102,10 +2230,10 @@ RandomPoolEnrichmentDialogBase::RandomPoolEnrichmentDialogBase( wxWindow* parent
        bSizer147->Add( RandomPoolStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
        ShowRandomPoolCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
-       ShowRandomPoolCheckBox->SetValue(true);
-       
+       ShowRandomPoolCheckBox->SetValue(true); 
        bSizer147->Add( ShowRandomPoolCheckBox, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        sbSizer43->Add( bSizer147, 0, wxEXPAND|wxTOP, 5 );
        
        
@@ -2118,6 +2246,7 @@ RandomPoolEnrichmentDialogBase::RandomPoolEnrichmentDialogBase( wxWindow* parent
        
        sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
        
+       
        bSizer144->Add( sbSizer43, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
        
        wxBoxSizer* bSizer146;
@@ -2133,10 +2262,13 @@ RandomPoolEnrichmentDialogBase::RandomPoolEnrichmentDialogBase( wxWindow* parent
        
        bSizer146->Add( 0, 0, 1, wxEXPAND, 5 );
        
+       
        bSizer144->Add( bSizer146, 0, wxEXPAND, 5 );
        
+       
        MainSizer->Add( bSizer144, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( MainSizer );
        this->Layout();
        MainSizer->Fit( this );
@@ -2155,6 +2287,7 @@ RandomPoolEnrichmentDialogBase::~RandomPoolEnrichmentDialogBase()
        this->Disconnect( wxEVT_MOTION, wxMouseEventHandler( RandomPoolEnrichmentDialogBase::OnMouseMotion ) );
        HashChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( RandomPoolEnrichmentDialogBase::OnHashSelected ), NULL, this );
        ShowRandomPoolCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( RandomPoolEnrichmentDialogBase::OnShowRandomPoolCheckBoxClicked ), NULL, this );
+       
 }
 
 SecurityTokenKeyfilesDialogBase::SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -2189,8 +2322,10 @@ SecurityTokenKeyfilesDialogBase::SecurityTokenKeyfilesDialogBase( wxWindow* pare
        ImportButton = new wxButton( this, wxID_ANY, _("&Import Keyfile to Token..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer141->Add( ImportButton, 0, wxALL, 5 );
        
+       
        bSizer142->Add( bSizer141, 0, wxEXPAND, 5 );
        
+       
        bSizer138->Add( bSizer142, 1, wxEXPAND, 5 );
        
        wxBoxSizer* bSizer139;
@@ -2203,10 +2338,13 @@ SecurityTokenKeyfilesDialogBase::SecurityTokenKeyfilesDialogBase( wxWindow* pare
        CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer139->Add( CancelButton, 0, wxALL, 5 );
        
+       
        bSizer138->Add( bSizer139, 0, wxEXPAND, 5 );
        
+       
        bSizer3->Add( bSizer138, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer3 );
        this->Layout();
        bSizer3->Fit( this );
@@ -2231,6 +2369,7 @@ SecurityTokenKeyfilesDialogBase::~SecurityTokenKeyfilesDialogBase()
        DeleteButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SecurityTokenKeyfilesDialogBase::OnDeleteButtonClick ), NULL, this );
        ImportButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SecurityTokenKeyfilesDialogBase::OnImportButtonClick ), NULL, this );
        OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SecurityTokenKeyfilesDialogBase::OnOKButtonClick ), NULL, this );
+       
 }
 
 VolumePropertiesDialogBase::VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
@@ -2250,10 +2389,13 @@ VolumePropertiesDialogBase::VolumePropertiesDialogBase( wxWindow* parent, wxWind
        StdButtonsOK = new wxButton( this, wxID_OK );
        StdButtons->AddButton( StdButtonsOK );
        StdButtons->Realize();
+       
        bSizer50->Add( StdButtons, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
        
+       
        bSizer49->Add( bSizer50, 1, wxEXPAND|wxALL, 5 );
        
+       
        this->SetSizer( bSizer49 );
        this->Layout();
        bSizer49->Fit( this );
@@ -2288,6 +2430,7 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
        TestButton = new wxButton( this, wxID_ANY, _("&Test"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer96->Add( TestButton, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
        
+       
        sbSizer29->Add( bSizer96, 0, wxEXPAND, 5 );
        
        EncryptionAlgorithmStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
@@ -2310,8 +2453,10 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
        BenchmarkButton = new wxButton( this, wxID_ANY, _("&Benchmark"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer97->Add( BenchmarkButton, 0, wxALL, 5 );
        
+       
        sbSizer29->Add( bSizer97, 0, wxEXPAND, 5 );
        
+       
        bSizer95->Add( sbSizer29, 1, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer30;
@@ -2329,12 +2474,16 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
        HashHyperlink->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
        sbSizer30->Add( HashHyperlink, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer95->Add( sbSizer30, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer94->Add( bSizer95, 1, wxEXPAND, 5 );
        
+       
        bSizer93->Add( bSizer94, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer93 );
        this->Layout();
        bSizer93->Fit( this );
@@ -2355,6 +2504,7 @@ EncryptionOptionsWizardPageBase::~EncryptionOptionsWizardPageBase()
        EncryptionAlgorithmHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( EncryptionOptionsWizardPageBase::OnEncryptionAlgorithmHyperlinkClick ), NULL, this );
        BenchmarkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionOptionsWizardPageBase::OnBenchmarkButtonClick ), NULL, this );
        HashHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( EncryptionOptionsWizardPageBase::OnHashHyperlinkClick ), NULL, this );
+       
 }
 
 InfoWizardPageBase::InfoWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2368,8 +2518,10 @@ InfoWizardPageBase::InfoWizardPageBase( wxWindow* parent, wxWindowID id, const w
        InfoStaticText->Wrap( -1 );
        InfoPageSizer->Add( InfoStaticText, 1, wxALL|wxEXPAND, 5 );
        
+       
        bSizer71->Add( InfoPageSizer, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer71 );
        this->Layout();
        bSizer71->Fit( this );
@@ -2411,12 +2563,16 @@ KeyfilesPanelBase::KeyfilesPanelBase( wxWindow* parent, wxWindowID id, const wxP
        RemoveAllButton = new wxButton( this, wxID_ANY, _("Remove &All"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer137->Add( RemoveAllButton, 0, wxEXPAND|wxALL, 5 );
        
+       
        bSizer21->Add( bSizer137, 0, wxEXPAND, 5 );
        
+       
        bSizer20->Add( bSizer21, 1, wxEXPAND, 5 );
        
+       
        bSizer19->Add( bSizer20, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer19 );
        this->Layout();
        
@@ -2442,6 +2598,7 @@ KeyfilesPanelBase::~KeyfilesPanelBase()
        AddSecurityTokenSignatureButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesPanelBase::OnAddSecurityTokenSignatureButtonClick ), NULL, this );
        RemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesPanelBase::OnRemoveButtonClick ), NULL, this );
        RemoveAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesPanelBase::OnRemoveAllButtonClick ), NULL, this );
+       
 }
 
 ProgressWizardPageBase::ProgressWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2463,14 +2620,17 @@ ProgressWizardPageBase::ProgressWizardPageBase( wxWindow* parent, wxWindowID id,
        
        ProgressSizer->Add( AbortButton, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer82->Add( ProgressSizer, 0, wxEXPAND, 5 );
        
        InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
        InfoStaticText->Wrap( -1 );
        bSizer82->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer81->Add( bSizer82, 0, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer81 );
        this->Layout();
        bSizer81->Fit( this );
@@ -2483,6 +2643,7 @@ ProgressWizardPageBase::~ProgressWizardPageBase()
 {
        // Disconnect Events
        AbortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ProgressWizardPageBase::OnAbortButtonClick ), NULL, this );
+       
 }
 
 SelectDirectoryWizardPageBase::SelectDirectoryWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2497,19 +2658,23 @@ SelectDirectoryWizardPageBase::SelectDirectoryWizardPageBase( wxWindow* parent,
        bSizer70 = new wxBoxSizer( wxHORIZONTAL );
        
        DirectoryTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       DirectoryTextCtrl->SetMaxLength( 0 ); 
        bSizer70->Add( DirectoryTextCtrl, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
        BrowseButton = new wxButton( this, wxID_ANY, _("&Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer70->Add( BrowseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer69->Add( bSizer70, 0, wxEXPAND, 5 );
        
        InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
        InfoStaticText->Wrap( 300 );
        bSizer69->Add( InfoStaticText, 1, wxALL|wxEXPAND, 5 );
        
+       
        bSizer68->Add( bSizer69, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer68 );
        this->Layout();
        
@@ -2523,6 +2688,7 @@ SelectDirectoryWizardPageBase::~SelectDirectoryWizardPageBase()
        // Disconnect Events
        DirectoryTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SelectDirectoryWizardPageBase::OnDirectoryTextChanged ), NULL, this );
        BrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectDirectoryWizardPageBase::OnBrowseButtonClick ), NULL, this );
+       
 }
 
 SingleChoiceWizardPageBase::SingleChoiceWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2540,16 +2706,20 @@ SingleChoiceWizardPageBase::SingleChoiceWizardPageBase( wxWindow* parent, wxWind
        
        ChoicesSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        OuterChoicesSizer->Add( ChoicesSizer, 0, wxEXPAND, 5 );
        
+       
        bSizer77->Add( OuterChoicesSizer, 0, wxEXPAND, 5 );
        
        InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
        InfoStaticText->Wrap( -1 );
        bSizer77->Add( InfoStaticText, 1, wxALL|wxEXPAND, 5 );
        
+       
        bSizer71->Add( bSizer77, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer71 );
        this->Layout();
        bSizer71->Fit( this );
@@ -2574,8 +2744,10 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        
        KeySamplesUpperInnerSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        KeySamplesUpperSizer->Add( KeySamplesUpperInnerSizer, 1, wxEXPAND|wxTOP, 3 );
        
+       
        sbSizer31->Add( KeySamplesUpperSizer, 1, wxEXPAND, 30 );
        
        wxFlexGridSizer* fgSizer5;
@@ -2598,10 +2770,10 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT|wxALIGN_BOTTOM, 7 );
        
        DisplayKeysCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
-       DisplayKeysCheckBox->SetValue(true);
-       
+       DisplayKeysCheckBox->SetValue(true); 
        bSizer126->Add( DisplayKeysCheckBox, 0, wxEXPAND|wxRIGHT, 5 );
        
+       
        fgSizer5->Add( bSizer126, 1, wxEXPAND|wxALIGN_BOTTOM, 5 );
        
        wxStaticText* m_staticText28;
@@ -2626,8 +2798,10 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        
        fgSizer5->Add( MasterKeySampleStaticText, 0, wxEXPAND|wxALIGN_BOTTOM|wxTOP|wxRIGHT, 2 );
        
+       
        sbSizer31->Add( fgSizer5, 0, wxEXPAND, 5 );
        
+       
        bSizer105->Add( sbSizer31, 0, wxALL|wxEXPAND, 5 );
        
        wxStaticBoxSizer* sbSizer32;
@@ -2642,6 +2816,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        AbortButton = new wxButton( this, wxID_ANY, _("Abort"), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer106->Add( AbortButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
        
+       
        sbSizer32->Add( bSizer106, 0, wxEXPAND, 5 );
        
        wxGridSizer* gSizer6;
@@ -2662,11 +2837,13 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        SizeDoneStaticText->Wrap( -1 );
        bSizer115->Add( SizeDoneStaticText, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 );
        
+       
        m_panel12->SetSizer( bSizer115 );
        m_panel12->Layout();
        bSizer115->Fit( m_panel12 );
        bSizer108->Add( m_panel12, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
        
+       
        gSizer6->Add( bSizer108, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
        
        wxBoxSizer* bSizer1081;
@@ -2684,11 +2861,13 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        SpeedStaticText->Wrap( -1 );
        bSizer1151->Add( SpeedStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
        
+       
        m_panel121->SetSizer( bSizer1151 );
        m_panel121->Layout();
        bSizer1151->Fit( m_panel121 );
        bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        gSizer6->Add( bSizer1081, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
        
        wxBoxSizer* bSizer1082;
@@ -2706,15 +2885,19 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        TimeLeftStaticText->Wrap( -1 );
        bSizer1152->Add( TimeLeftStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
        
+       
        m_panel122->SetSizer( bSizer1152 );
        m_panel122->Layout();
        bSizer1152->Fit( m_panel122 );
        bSizer1082->Add( m_panel122, 1, wxALL|wxEXPAND, 5 );
        
+       
        gSizer6->Add( bSizer1082, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
        
+       
        sbSizer32->Add( gSizer6, 0, wxEXPAND|wxTOP, 2 );
        
+       
        bSizer105->Add( sbSizer32, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
        
        
@@ -2724,8 +2907,10 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
        InfoStaticText->Wrap( -1 );
        bSizer105->Add( InfoStaticText, 0, wxALL, 5 );
        
+       
        bSizer104->Add( bSizer105, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer104 );
        this->Layout();
        bSizer104->Fit( this );
@@ -2740,6 +2925,7 @@ VolumeCreationProgressWizardPageBase::~VolumeCreationProgressWizardPageBase()
        // Disconnect Events
        DisplayKeysCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeCreationProgressWizardPageBase::OnDisplayKeysCheckBoxClick ), NULL, this );
        AbortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeCreationProgressWizardPageBase::OnAbortButtonClick ), NULL, this );
+       
 }
 
 VolumeLocationWizardPageBase::VolumeLocationWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2774,8 +2960,10 @@ VolumeLocationWizardPageBase::VolumeLocationWizardPageBase( wxWindow* parent, wx
        SelectDeviceButton = new wxButton( this, wxID_ANY, _("Select D&evice..."), wxDefaultPosition, wxDefaultSize, 0 );
        bSizer90->Add( SelectDeviceButton, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer126->Add( bSizer90, 0, wxALIGN_CENTER_VERTICAL, 5 );
        
+       
        bSizer89->Add( bSizer126, 0, wxEXPAND, 5 );
        
        wxBoxSizer* bSizer91;
@@ -2785,13 +2973,15 @@ VolumeLocationWizardPageBase::VolumeLocationWizardPageBase( wxWindow* parent, wx
        bSizer91->Add( 0, 0, 0, wxLEFT, 5 );
        
        NoHistoryCheckBox = new wxCheckBox( this, wxID_ANY, _("&Never save history"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        bSizer91->Add( NoHistoryCheckBox, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer89->Add( bSizer91, 0, wxEXPAND, 5 );
        
+       
        bSizer88->Add( bSizer89, 1, wxEXPAND, 5 );
        
+       
        bSizer87->Add( bSizer88, 0, wxEXPAND, 5 );
        
        
@@ -2801,8 +2991,10 @@ VolumeLocationWizardPageBase::VolumeLocationWizardPageBase( wxWindow* parent, wx
        InfoStaticText->Wrap( -1 );
        bSizer87->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer86->Add( bSizer87, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer86 );
        this->Layout();
        bSizer86->Fit( this );
@@ -2821,6 +3013,7 @@ VolumeLocationWizardPageBase::~VolumeLocationWizardPageBase()
        SelectFileButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnSelectFileButtonClick ), NULL, this );
        SelectDeviceButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnSelectDeviceButtonClick ), NULL, this );
        NoHistoryCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnNoHistoryCheckBoxClick ), NULL, this );
+       
 }
 
 VolumeFormatOptionsWizardPageBase::VolumeFormatOptionsWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2848,17 +3041,19 @@ VolumeFormatOptionsWizardPageBase::VolumeFormatOptionsWizardPageBase( wxWindow*
        FilesystemTypeChoice->SetSelection( 0 );
        fgSizer6->Add( FilesystemTypeChoice, 0, wxALL, 5 );
        
+       
        sbSizer33->Add( fgSizer6, 1, wxEXPAND, 5 );
        
+       
        bSizer125->Add( sbSizer33, 0, wxEXPAND|wxALL, 5 );
        
        wxStaticBoxSizer* sbSizer34;
        sbSizer34 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Volume Format Options") ), wxVERTICAL );
        
        QuickFormatCheckBox = new wxCheckBox( this, wxID_ANY, _("Quick format"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        sbSizer34->Add( QuickFormatCheckBox, 0, wxALL, 5 );
        
+       
        bSizer125->Add( sbSizer34, 0, wxEXPAND|wxALL, 5 );
        
        
@@ -2868,8 +3063,10 @@ VolumeFormatOptionsWizardPageBase::VolumeFormatOptionsWizardPageBase( wxWindow*
        InfoStaticText->Wrap( -1 );
        bSizer125->Add( InfoStaticText, 0, wxALL, 5 );
        
+       
        bSizer124->Add( bSizer125, 0, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer124 );
        this->Layout();
        bSizer124->Fit( this );
@@ -2884,6 +3081,7 @@ VolumeFormatOptionsWizardPageBase::~VolumeFormatOptionsWizardPageBase()
        // Disconnect Events
        FilesystemTypeChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeFormatOptionsWizardPageBase::OnFilesystemTypeSelected ), NULL, this );
        QuickFormatCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeFormatOptionsWizardPageBase::OnQuickFormatCheckBoxClick ), NULL, this );
+       
 }
 
 VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
@@ -2892,7 +3090,6 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
        bSizer7 = new wxBoxSizer( wxVERTICAL );
        
        GridBagSizer = new wxGridBagSizer( 0, 0 );
-       GridBagSizer->AddGrowableCol( 1 );
        GridBagSizer->SetFlexibleDirection( wxBOTH );
        GridBagSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
        GridBagSizer->SetEmptyCellSize( wxSize( 0,0 ) );
@@ -2918,15 +3115,12 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
        GridBagSizer->Add( ConfirmPasswordTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
        
        CacheCheckBox = new wxCheckBox( this, wxID_ANY, _("Cach&e passwords and keyfiles in memory "), wxDefaultPosition, wxDefaultSize, 0 );
-       
        GridBagSizer->Add( CacheCheckBox, wxGBPosition( 3, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
        
        DisplayPasswordCheckBox = new wxCheckBox( this, wxID_ANY, _("&Display password"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        GridBagSizer->Add( DisplayPasswordCheckBox, wxGBPosition( 4, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
        
        UseKeyfilesCheckBox = new wxCheckBox( this, wxID_ANY, _("U&se keyfiles"), wxDefaultPosition, wxDefaultSize, 0 );
-       
        GridBagSizer->Add( UseKeyfilesCheckBox, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxTOP|wxRIGHT|wxLEFT, 5 );
        
        KeyfilesButton = new wxButton( this, wxID_ANY, _("&Keyfiles..."), wxDefaultPosition, wxDefaultSize, 0 );
@@ -2934,6 +3128,7 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
        
        Pkcs5PrfSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        GridBagSizer->Add( Pkcs5PrfSizer, wxGBPosition( 6, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxBOTTOM, 5 );
        
        Pkcs5PrfStaticText = new wxStaticText( this, wxID_ANY, _("PKCS-5 PRF:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -2948,10 +3143,15 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
        
        PasswordPlaceholderSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        GridBagSizer->Add( PasswordPlaceholderSizer, wxGBPosition( 8, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxEXPAND, 5 );
        
+       
+       GridBagSizer->AddGrowableCol( 1 );
+       
        bSizer7->Add( GridBagSizer, 1, wxALL|wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer7 );
        this->Layout();
        bSizer7->Fit( this );
@@ -2976,6 +3176,7 @@ VolumePasswordPanelBase::~VolumePasswordPanelBase()
        KeyfilesButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonClick ), NULL, this );
        KeyfilesButton->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonRightDown ), NULL, this );
        KeyfilesButton->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonRightClick ), NULL, this );
+       
 }
 
 VolumePasswordWizardPageBase::VolumePasswordWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
@@ -2988,14 +3189,17 @@ VolumePasswordWizardPageBase::VolumePasswordWizardPageBase( wxWindow* parent, wx
        
        PasswordPanelSizer = new wxBoxSizer( wxVERTICAL );
        
+       
        bSizer102->Add( PasswordPanelSizer, 0, wxEXPAND, 5 );
        
        InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
        InfoStaticText->Wrap( -1 );
        bSizer102->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer101->Add( bSizer102, 1, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer101 );
        this->Layout();
        bSizer101->Fit( this );
@@ -3020,6 +3224,7 @@ VolumeSizeWizardPageBase::VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID
        bSizer100 = new wxBoxSizer( wxHORIZONTAL );
        
        VolumeSizeTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+       VolumeSizeTextCtrl->SetMaxLength( 0 ); 
        bSizer100->Add( VolumeSizeTextCtrl, 0, wxALL, 5 );
        
        wxArrayString VolumeSizePrefixChoiceChoices;
@@ -3027,6 +3232,7 @@ VolumeSizeWizardPageBase::VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID
        VolumeSizePrefixChoice->SetSelection( 0 );
        bSizer100->Add( VolumeSizePrefixChoice, 0, wxALL, 5 );
        
+       
        bSizer99->Add( bSizer100, 0, wxEXPAND, 5 );
        
        
@@ -3043,8 +3249,10 @@ VolumeSizeWizardPageBase::VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID
        InfoStaticText->Wrap( -1 );
        bSizer99->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
        
+       
        bSizer98->Add( bSizer99, 0, wxEXPAND, 5 );
        
+       
        this->SetSizer( bSizer98 );
        this->Layout();
        bSizer98->Fit( this );
@@ -3059,4 +3267,5 @@ VolumeSizeWizardPageBase::~VolumeSizeWizardPageBase()
        // Disconnect Events
        VolumeSizeTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizeTextChanged ), NULL, this );
        VolumeSizePrefixChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizePrefixSelected ), NULL, this );
+       
 }
index c2d170b..a8b71d5 100644 (file)
@@ -1,15 +1,16 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder
+// C++ code generated with wxFormBuilder (version Nov  8 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __Forms__
-#define __Forms__
+#ifndef __FORMS_H__
+#define __FORMS_H__
 
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-
 class WizardPage;
 
 #include "WizardPage.h"
@@ -78,7 +79,6 @@ namespace nemesis
                        wxButton* CreateVolumeButton;
                        wxButton* VolumePropertiesButton;
                        wxButton* WipeCacheButton;
-                       
                        wxStaticBoxSizer* VolumeStaticBoxSizer;
                        wxGridBagSizer* VolumeGridBagSizer;
                        wxStaticBitmap* LogoBitmap;
@@ -87,67 +87,68 @@ namespace nemesis
                        wxCheckBox* NoHistoryCheckBox;
                        wxButton* VolumeToolsButton;
                        wxButton* SelectDeviceButton;
-                       
                        wxButton* VolumeButton;
                        wxButton* MountAllDevicesButton;
                        wxButton* DismountAllButton;
                        wxButton* ExitButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnActivate( wxActivateEvent& event ){ event.Skip(); }
-                       virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
-                       virtual void OnCreateVolumeButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnMountVolumeMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnMountAllDevicesButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDismountVolumeMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDismountAllButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnChangePasswordMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnChangePkcs5PrfMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnChangeKeyfilesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRemoveKeyfilesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnVolumePropertiesButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAddToFavoritesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAddAllMountedToFavoritesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnOrganizeFavoritesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnMountAllFavoritesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnBenchmarkMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnEncryptionTestMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnBackupVolumeHeadersMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRestoreVolumeHeaderMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnCreateKeyfileMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnManageSecurityTokenKeyfilesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnCloseAllSecurityTokenSessionsMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnWipeCacheButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnHotkeysMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDefaultKeyfilesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnOnlineHelpMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnBeginnersTutorialMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnFaqMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnWebsiteMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDownloadsMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnNewsMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnVersionHistoryMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnContactMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnLegalNoticesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAboutMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemDeselected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemRightClick( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnLogoBitmapClick( wxMouseEvent& event ){ event.Skip(); }
-                       virtual void OnSelectFileButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnNoHistoryCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnVolumeToolsButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnSelectDeviceButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnVolumeButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnExitButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnActivate( wxActivateEvent& event ) { event.Skip(); }
+                       virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+                       virtual void OnCreateVolumeButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnMountVolumeMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnMountAllDevicesButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDismountVolumeMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDismountAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnChangePasswordMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnChangePkcs5PrfMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnChangeKeyfilesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRemoveKeyfilesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnVolumePropertiesButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAddToFavoritesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAddAllMountedToFavoritesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnOrganizeFavoritesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnMountAllFavoritesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnBenchmarkMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnEncryptionTestMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnBackupVolumeHeadersMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRestoreVolumeHeaderMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnCreateKeyfileMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnManageSecurityTokenKeyfilesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnCloseAllSecurityTokenSessionsMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnWipeCacheButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnHotkeysMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDefaultKeyfilesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnOnlineHelpMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnBeginnersTutorialMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnFaqMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnWebsiteMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDownloadsMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNewsMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnVersionHistoryMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnContactMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnLegalNoticesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAboutMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnListItemActivated( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemRightClick( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnLogoBitmapClick( wxMouseEvent& event ) { event.Skip(); }
+                       virtual void OnSelectFileButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNoHistoryCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnVolumeToolsButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnSelectDeviceButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnVolumeButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnExitButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
+                       
                        MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
+                       
                        ~MainFrameBase();
                
        };
@@ -164,26 +165,25 @@ namespace nemesis
                        wxStaticBitmap* WizardBitmap;
                        wxStaticText* PageTitleStaticText;
                        wxBoxSizer* PageSizer;
-                       
                        wxButton* HelpButton;
-                       
                        wxButton* PreviousButton;
                        wxButton* NextButton;
-                       
                        wxButton* CancelButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnActivate( wxActivateEvent& event ){ event.Skip(); }
-                       virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
-                       virtual void OnMouseMotion( wxMouseEvent& event ){ event.Skip(); }
-                       virtual void OnHelpButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnPreviousButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnNextButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnActivate( wxActivateEvent& event ) { event.Skip(); }
+                       virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+                       virtual void OnMouseMotion( wxMouseEvent& event ) { event.Skip(); }
+                       virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnPreviousButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNextButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
+                       
                        WizardFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
+                       
                        ~WizardFrameBase();
                
        };
@@ -197,27 +197,22 @@ namespace nemesis
                
                protected:
                        wxPanel* m_panel14;
-                       
                        wxStaticBitmap* LogoBitmap;
                        wxStaticText* VersionStaticText;
-                       
                        wxStaticText* CopyrightStaticText;
-                       
                        wxHyperlinkCtrl* WebsiteHyperlink;
                        wxStaticLine* m_staticline3;
                        wxTextCtrl* CreditsTextCtrl;
-                       
                        wxStaticLine* m_staticline4;
                        wxStaticLine* m_staticline5;
                        
-                       
-                       
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnWebsiteHyperlinkClick( wxHyperlinkEvent& event ){ event.Skip(); }
+                       virtual void OnWebsiteHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
                        
                
                public:
-                       AboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       AboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~AboutDialogBase();
                
        };
@@ -234,15 +229,15 @@ namespace nemesis
                        wxListCtrl* BenchmarkListCtrl;
                        wxBoxSizer* RightSizer;
                        wxButton* BenchmarkButton;
-                       
                        wxStaticText* BenchmarkNoteStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnBenchmarkButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnBenchmarkButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - encryption algorithm benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~BenchmarkDialogBase();
                
        };
@@ -263,11 +258,12 @@ namespace nemesis
                        wxButton* CancelButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnOKButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       ChangePasswordDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       ChangePasswordDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~ChangePasswordDialogBase();
                
        };
@@ -286,13 +282,14 @@ namespace nemesis
                        wxButton* StdButtonsCancel;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemDeselected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
+                       virtual void OnListItemActivated( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
                        
                
                public:
-                       DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a Partition or Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a Partition or Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~DeviceSelectionDialogBase();
                
        };
@@ -321,16 +318,17 @@ namespace nemesis
                        wxButton* CloseButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnXtsModeCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnEncryptButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDecryptButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAutoTestAllButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnResetButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnXtsModeCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnEncryptButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDecryptButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAutoTestAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnResetButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - test vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~EncryptionTestDialogBase();
                
        };
@@ -348,22 +346,22 @@ namespace nemesis
                        wxButton* MoveDownButton;
                        wxButton* RemoveButton;
                        wxButton* RemoveAllButton;
-                       
                        wxButton* OKButton;
                        wxButton* CancelButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnListItemDeselected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnMoveUpButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnMoveDownButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRemoveButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRemoveAllButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnOKButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnMoveUpButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnMoveDownButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRemoveButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRemoveAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Favorite Volumes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Favorite Volumes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~FavoriteVolumesDialogBase();
                
        };
@@ -387,12 +385,13 @@ namespace nemesis
                        wxButton* CreateKeyfileButtton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnKeyfilesHyperlinkClick( wxHyperlinkEvent& event ){ event.Skip(); }
-                       virtual void OnCreateKeyfileButttonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnKeyfilesHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
+                       virtual void OnCreateKeyfileButttonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       KeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       KeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~KeyfilesDialogBase();
                
        };
@@ -406,26 +405,22 @@ namespace nemesis
                
                protected:
                        wxBoxSizer* MainSizer;
-                       
                        wxChoice* HashChoice;
-                       
                        wxStaticText* RandomPoolStaticText;
                        wxCheckBox* ShowRandomPoolCheckBox;
-                       
                        wxStaticText* MouseStaticText;
-                       
                        wxButton* GenerateButton;
                        
-                       
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnMouseMotion( wxMouseEvent& event ){ event.Skip(); }
-                       virtual void OnHashSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnShowRandomPoolCheckBoxClicked( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnGenerateButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnMouseMotion( wxMouseEvent& event ) { event.Skip(); }
+                       virtual void OnHashSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnShowRandomPoolCheckBoxClicked( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnGenerateButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       KeyfileGeneratorDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       KeyfileGeneratorDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~KeyfileGeneratorDialogBase();
                
        };
@@ -441,7 +436,8 @@ namespace nemesis
                        wxTextCtrl* LegalNoticesTextCtrl;
                
                public:
-                       LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - legal notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~LegalNoticesDialogBase();
                
        };
@@ -457,18 +453,15 @@ namespace nemesis
                        wxBoxSizer* PasswordSizer;
                        wxButton* OKButton;
                        wxButton* CancelButton;
-                       
                        wxButton* OptionsButton;
                        wxPanel* OptionsPanel;
                        wxStaticBoxSizer* OptionsSizer;
-                       
                        wxCheckBox* ReadOnlyCheckBox;
                        wxCheckBox* RemovableCheckBox;
                        wxCheckBox* PartitionInSystemEncryptionScopeCheckBox;
                        wxStaticBoxSizer* ProtectionSizer;
                        wxCheckBox* ProtectionCheckBox;
                        wxBoxSizer* ProtectionPasswordSizer;
-                       wxHyperlinkCtrl* ProtectionHyperlinkCtrl;
                        wxBoxSizer* FilesystemSizer;
                        wxPanel* m_panel8;
                        wxCheckBox* NoFilesystemCheckBox;
@@ -481,18 +474,18 @@ namespace nemesis
                        wxTextCtrl* FilesystemOptionsTextCtrl;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); }
-                       virtual void OnOKButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnOptionsButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnReadOnlyCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnProtectionCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnProtectionHyperlinkClick( wxHyperlinkEvent& event ){ event.Skip(); }
-                       virtual void OnNoFilesystemCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnMountPointButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+                       virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnOptionsButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnReadOnlyCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnProtectionCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNoFilesystemCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnMountPointButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter nemesis Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter nemesis volume password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~MountOptionsDialogBase();
                
        };
@@ -512,11 +505,12 @@ namespace nemesis
                        wxButton* StdButtonsCancel;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnKeyfileNameChanged( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnKeyfileNameChanged( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Security Token Keyfile Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Security Token Keyfile Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~NewSecurityTokenKeyfileDialogBase();
                
        };
@@ -566,7 +560,6 @@ namespace nemesis
                        wxCheckBox* NoKernelCryptoCheckBox;
                        wxPanel* PerformanceOptionsPage;
                        wxStaticText* AesHwCpuSupportedStaticText;
-                       
                        wxCheckBox* NoHardwareCryptoCheckBox;
                        wxBoxSizer* DefaultKeyfilesSizer;
                        wxCheckBox* UseKeyfilesCheckBox;
@@ -576,7 +569,6 @@ namespace nemesis
                        wxListCtrl* HotkeyListCtrl;
                        wxTextCtrl* HotkeyTextCtrl;
                        wxButton* AssignHotkeyButton;
-                       
                        wxCheckBox* HotkeyControlCheckBox;
                        wxCheckBox* HotkeyShiftCheckBox;
                        wxCheckBox* HotkeyAltCheckBox;
@@ -589,28 +581,29 @@ namespace nemesis
                        wxButton* StdButtonsCancel;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
-                       virtual void OnDismountOnScreenSaverCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDismountOnPowerSavingCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnForceAutoDismountCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnPreserveTimestampsCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnBackgroundTaskEnabledCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnNoKernelCryptoCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnNoHardwareCryptoCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnSelectPkcs11ModuleButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnHotkeyListItemDeselected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnHotkeyListItemSelected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnAssignHotkeyButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRemoveHotkeyButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnOKButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+                       virtual void OnDismountOnScreenSaverCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDismountOnPowerSavingCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnForceAutoDismountCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnPreserveTimestampsCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnBackgroundTaskEnabledCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNoKernelCryptoCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNoHardwareCryptoCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnSelectPkcs11ModuleButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnHotkeyListItemDeselected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnHotkeyListItemSelected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnAssignHotkeyButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRemoveHotkeyButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
                        wxPanel* DefaultKeyfilesPage;
                        wxPanel* SecurityTokensPage;
                        wxPanel* HotkeysPage;
-                       PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~PreferencesDialogBase();
                
        };
@@ -624,26 +617,21 @@ namespace nemesis
                
                protected:
                        wxBoxSizer* MainSizer;
-                       
                        wxChoice* HashChoice;
-                       
                        wxStaticText* RandomPoolStaticText;
                        wxCheckBox* ShowRandomPoolCheckBox;
-                       
                        wxStaticText* MouseStaticText;
-                       
-                       
                        wxButton* ContinueButton;
                        
-                       
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnMouseMotion( wxMouseEvent& event ){ event.Skip(); }
-                       virtual void OnHashSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnShowRandomPoolCheckBoxClicked( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnMouseMotion( wxMouseEvent& event ) { event.Skip(); }
+                       virtual void OnHashSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnShowRandomPoolCheckBoxClicked( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("nemesis - random pool enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~RandomPoolEnrichmentDialogBase();
                
        };
@@ -659,23 +647,23 @@ namespace nemesis
                        wxListCtrl* SecurityTokenKeyfileListCtrl;
                        wxButton* ExportButton;
                        wxButton* DeleteButton;
-                       
                        wxButton* ImportButton;
                        wxButton* OKButton;
                        wxButton* CancelButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemDeselected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnExportButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDeleteButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnImportButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnOKButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnListItemActivated( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDeleteButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Security Token Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Security Token Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~SecurityTokenKeyfilesDialogBase();
                
        };
@@ -693,7 +681,8 @@ namespace nemesis
                        wxButton* StdButtonsOK;
                
                public:
-                       VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Volume Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+                       
+                       VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Volume Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
                        ~VolumePropertiesDialogBase();
                
        };
@@ -710,21 +699,21 @@ namespace nemesis
                        wxButton* TestButton;
                        wxStaticText* EncryptionAlgorithmStaticText;
                        wxHyperlinkCtrl* EncryptionAlgorithmHyperlink;
-                       
                        wxButton* BenchmarkButton;
                        wxChoice* HashChoice;
                        wxHyperlinkCtrl* HashHyperlink;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnTestButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnEncryptionAlgorithmHyperlinkClick( wxHyperlinkEvent& event ){ event.Skip(); }
-                       virtual void OnBenchmarkButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnHashHyperlinkClick( wxHyperlinkEvent& event ){ event.Skip(); }
+                       virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnTestButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnEncryptionAlgorithmHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
+                       virtual void OnBenchmarkButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnHashHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
                        
                
                public:
-                       EncryptionOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       EncryptionOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~EncryptionOptionsWizardPageBase();
                
        };
@@ -741,7 +730,8 @@ namespace nemesis
                        wxStaticText* InfoStaticText;
                
                public:
-                       InfoWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       InfoWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~InfoWizardPageBase();
                
        };
@@ -762,18 +752,19 @@ namespace nemesis
                        wxButton* RemoveAllButton;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnListItemDeselected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
-                       virtual void OnListSizeChanged( wxSizeEvent& event ){ event.Skip(); }
-                       virtual void OnAddFilesButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAddDirectoryButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAddSecurityTokenSignatureButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRemoveButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnRemoveAllButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
+                       virtual void OnListSizeChanged( wxSizeEvent& event ) { event.Skip(); }
+                       virtual void OnAddFilesButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAddDirectoryButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAddSecurityTokenSignatureButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRemoveButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnRemoveAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       KeyfilesPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL );
+                       
+                       KeyfilesPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL ); 
                        ~KeyfilesPanelBase();
                
        };
@@ -792,11 +783,12 @@ namespace nemesis
                        wxStaticText* InfoStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnAbortButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnAbortButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       ProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       ProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~ProgressWizardPageBase();
                
        };
@@ -814,12 +806,13 @@ namespace nemesis
                        wxStaticText* InfoStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnDirectoryTextChanged( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnBrowseButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnDirectoryTextChanged( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnBrowseButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       SelectDirectoryWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 200,65 ), long style = wxTAB_TRAVERSAL );
+                       
+                       SelectDirectoryWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 200,65 ), long style = wxTAB_TRAVERSAL ); 
                        ~SelectDirectoryWizardPageBase();
                
        };
@@ -832,13 +825,13 @@ namespace nemesis
                private:
                
                protected:
-                       
                        wxBoxSizer* OuterChoicesSizer;
                        wxBoxSizer* ChoicesSizer;
                        wxStaticText* InfoStaticText;
                
                public:
-                       SingleChoiceWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       SingleChoiceWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~SingleChoiceWizardPageBase();
                
        };
@@ -868,16 +861,16 @@ namespace nemesis
                        wxStaticText* m_staticText312;
                        wxPanel* m_panel122;
                        wxStaticText* TimeLeftStaticText;
-                       
                        wxStaticText* InfoStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnDisplayKeysCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnAbortButtonClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnDisplayKeysCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnAbortButtonClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       VolumeCreationProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       VolumeCreationProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~VolumeCreationProgressWizardPageBase();
                
        };
@@ -890,24 +883,22 @@ namespace nemesis
                private:
                
                protected:
-                       
                        wxComboBox* VolumePathComboBox;
                        wxButton* SelectFileButton;
                        wxButton* SelectDeviceButton;
-                       
                        wxCheckBox* NoHistoryCheckBox;
-                       
                        wxStaticText* InfoStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnVolumePathTextChanged( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnSelectFileButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnSelectDeviceButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnNoHistoryCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnVolumePathTextChanged( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnSelectFileButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnSelectDeviceButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnNoHistoryCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       VolumeLocationWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       VolumeLocationWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~VolumeLocationWizardPageBase();
                
        };
@@ -923,16 +914,16 @@ namespace nemesis
                        wxStaticText* m_staticText43;
                        wxChoice* FilesystemTypeChoice;
                        wxCheckBox* QuickFormatCheckBox;
-                       
                        wxStaticText* InfoStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnFilesystemTypeSelected( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnQuickFormatCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnFilesystemTypeSelected( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnQuickFormatCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       VolumeFormatOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       VolumeFormatOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~VolumeFormatOptionsWizardPageBase();
                
        };
@@ -960,16 +951,17 @@ namespace nemesis
                        wxBoxSizer* PasswordPlaceholderSizer;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnTextChanged( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnDisplayPasswordCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnUseKeyfilesCheckBoxClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnKeyfilesButtonClick( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnKeyfilesButtonRightDown( wxMouseEvent& event ){ event.Skip(); }
-                       virtual void OnKeyfilesButtonRightClick( wxMouseEvent& event ){ event.Skip(); }
+                       virtual void OnTextChanged( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnDisplayPasswordCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnUseKeyfilesCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnKeyfilesButtonClick( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnKeyfilesButtonRightDown( wxMouseEvent& event ) { event.Skip(); }
+                       virtual void OnKeyfilesButtonRightClick( wxMouseEvent& event ) { event.Skip(); }
                        
                
                public:
-                       VolumePasswordPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       VolumePasswordPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~VolumePasswordPanelBase();
                
        };
@@ -986,7 +978,8 @@ namespace nemesis
                        wxStaticText* InfoStaticText;
                
                public:
-                       VolumePasswordWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       VolumePasswordWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~VolumePasswordWizardPageBase();
                
        };
@@ -999,25 +992,23 @@ namespace nemesis
                private:
                
                protected:
-                       
                        wxTextCtrl* VolumeSizeTextCtrl;
                        wxChoice* VolumeSizePrefixChoice;
-                       
                        wxStaticText* FreeSpaceStaticText;
-                       
                        wxStaticText* InfoStaticText;
                        
                        // Virtual event handlers, overide them in your derived class
-                       virtual void OnVolumeSizeTextChanged( wxCommandEvent& event ){ event.Skip(); }
-                       virtual void OnVolumeSizePrefixSelected( wxCommandEvent& event ){ event.Skip(); }
+                       virtual void OnVolumeSizeTextChanged( wxCommandEvent& event ) { event.Skip(); }
+                       virtual void OnVolumeSizePrefixSelected( wxCommandEvent& event ) { event.Skip(); }
                        
                
                public:
-                       VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+                       
+                       VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
                        ~VolumeSizeWizardPageBase();
                
        };
        
 } // namespace nemesis
 
-#endif //__Forms__
+#endif //__FORMS_H__
index 9b2796e..35283a2 100644 (file)
@@ -148,15 +148,15 @@ namespace nemesis
        {
                FreezeScope freeze (this);
 
-#ifdef TC_WINDOWS
-               FilesystemSizer->Show (false);
-#else
-               FilesystemOptionsSizer->Show (!NoFilesystemCheckBox->IsChecked());
+               //#ifdef TC_WINDOWS
+               //              FilesystemSizer->Show (false);
+               //#else
+                       FilesystemOptionsSizer->Show (!NoFilesystemCheckBox->IsChecked());
 
-#      ifdef TC_MACOSX
+                 //#ifdef TC_MACOSX
                FilesystemOptionsStaticText->Show (false);
                FilesystemOptionsTextCtrl->Show (false);
-#      endif
+               //#endif
 
                if (!Options.Path || Options.Path->IsEmpty())
                {
@@ -164,8 +164,8 @@ namespace nemesis
                        MountPointTextCtrl->Show (false);
                        MountPointButton->Show (false);
                }
-               RemovableCheckBox->Show (false);
-#endif
+               //              RemovableCheckBox->Show (false);
+               //#endif
                ProtectionSizer->Show (!ReadOnlyCheckBox->IsChecked());
                ProtectionPasswordPanel->Show (!ReadOnlyCheckBox->IsChecked() && ProtectionCheckBox->IsChecked());
 
index d7a3b74..d4eeccc 100644 (file)
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\r
-<wxFormBuilder_Project>\r
-    <FileVersion major="1" minor="9" />\r
-    <object class="Project" expanded="1">\r
-        <property name="class_decoration"></property>\r
-        <property name="code_generation">C++</property>\r
-        <property name="disconnect_events">1</property>\r
-        <property name="encoding">UTF-8</property>\r
-        <property name="event_generation">connect</property>\r
-        <property name="file">Forms</property>\r
-        <property name="first_id">1000</property>\r
-        <property name="help_provider">none</property>\r
-        <property name="internationalize">1</property>\r
-        <property name="name">nemesis</property>\r
-        <property name="namespace">&quot;nemesis&quot;</property>\r
-        <property name="path">.</property>\r
-        <property name="precompiled_header">#include &quot;System.h&quot;</property>\r
-        <property name="relative_path">1</property>\r
-        <property name="use_enum">1</property>\r
-        <property name="use_microsoft_bom">0</property>\r
-        <object class="Frame" expanded="0">\r
-            <property name="bg"></property>\r
-            <property name="center">wxBOTH</property>\r
-            <property name="context_help"></property>\r
-            <property name="enabled">1</property>\r
-            <property name="extra_style"></property>\r
-            <property name="fg"></property>\r
-            <property name="font"></property>\r
-            <property name="hidden">0</property>\r
-            <property name="id">wxID_ANY</property>\r
-            <property name="maximum_size"></property>\r
-            <property name="minimum_size">-1,496</property>\r
-            <property name="name">MainFrameBase</property>\r
-            <property name="pos"></property>\r
-            <property name="size">-1,496</property>\r
-            <property name="style">wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU</property>\r
-            <property name="subclass"></property>\r
-            <property name="title">nemesis</property>\r
-            <property name="tooltip"></property>\r
-            <property name="window_extra_style"></property>\r
-            <property name="window_name"></property>\r
-            <property name="window_style">wxTAB_TRAVERSAL</property>\r
-            <property name="xrc_skip_sizer">1</property>\r
-            <event name="OnActivate">OnActivate</event>\r
-            <event name="OnActivateApp"></event>\r
-            <event name="OnChar"></event>\r
-            <event name="OnClose">OnClose</event>\r
-            <event name="OnEnterWindow"></event>\r
-            <event name="OnEraseBackground"></event>\r
-            <event name="OnHibernate"></event>\r
-            <event name="OnIconize"></event>\r
-            <event name="OnIdle"></event>\r
-            <event name="OnKeyDown"></event>\r
-            <event name="OnKeyUp"></event>\r
-            <event name="OnKillFocus"></event>\r
-            <event name="OnLeaveWindow"></event>\r
-            <event name="OnLeftDClick"></event>\r
-            <event name="OnLeftDown"></event>\r
-            <event name="OnLeftUp"></event>\r
-            <event name="OnMiddleDClick"></event>\r
-            <event name="OnMiddleDown"></event>\r
-            <event name="OnMiddleUp"></event>\r
-            <event name="OnMotion"></event>\r
-            <event name="OnMouseEvents"></event>\r
-            <event name="OnMouseWheel"></event>\r
-            <event name="OnPaint"></event>\r
-            <event name="OnRightDClick"></event>\r
-            <event name="OnRightDown"></event>\r
-            <event name="OnRightUp"></event>\r
-            <event name="OnSetFocus"></event>\r
-            <event name="OnSize"></event>\r
-            <event name="OnUpdateUI"></event>\r
-            <object class="wxMenuBar" expanded="1">\r
-                <property name="bg"></property>\r
-                <property name="context_help"></property>\r
-                <property name="enabled">1</property>\r
-                <property name="fg"></property>\r
-                <property name="font"></property>\r
-                <property name="hidden">0</property>\r
-                <property name="id">wxID_ANY</property>\r
-                <property name="label">MainMenuBar</property>\r
-                <property name="maximum_size"></property>\r
-                <property name="minimum_size"></property>\r
-                <property name="name">MainMenuBar</property>\r
-                <property name="permission">protected</property>\r
-                <property name="pos"></property>\r
-                <property name="size"></property>\r
-                <property name="style"></property>\r
-                <property name="subclass"></property>\r
-                <property name="tooltip"></property>\r
-                <property name="window_extra_style"></property>\r
-                <property name="window_name"></property>\r
-                <property name="window_style"></property>\r
-                <event name="OnChar"></event>\r
-                <event name="OnEnterWindow"></event>\r
-                <event name="OnEraseBackground"></event>\r
-                <event name="OnKeyDown"></event>\r
-                <event name="OnKeyUp"></event>\r
-                <event name="OnKillFocus"></event>\r
-                <event name="OnLeaveWindow"></event>\r
-                <event name="OnLeftDClick"></event>\r
-                <event name="OnLeftDown"></event>\r
-                <event name="OnLeftUp"></event>\r
-                <event name="OnMiddleDClick"></event>\r
-                <event name="OnMiddleDown"></event>\r
-                <event name="OnMiddleUp"></event>\r
-                <event name="OnMotion"></event>\r
-                <event name="OnMouseEvents"></event>\r
-                <event name="OnMouseWheel"></event>\r
-                <event name="OnPaint"></event>\r
-                <event name="OnRightDClick"></event>\r
-                <event name="OnRightDown"></event>\r
-                <event name="OnRightUp"></event>\r
-                <event name="OnSetFocus"></event>\r
-                <event name="OnSize"></event>\r
-                <event name="OnUpdateUI"></event>\r
-                <object class="wxMenu" expanded="0">\r
-                    <property name="label">&amp;Volumes</property>\r
-                    <property name="name">VolumesMenu</property>\r
-                    <property name="permission">protected</property>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Create New Volume...</property>\r
-                        <property name="name">CreateNewVolumeMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnCreateVolumeButtonClick</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Mount Volume</property>\r
-                        <property name="name">MountVolumeMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnMountVolumeMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Auto-Mount All Device-Hosted Volumes</property>\r
-                        <property name="name">AutoMountDevicesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnMountAllDevicesButtonClick</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Dismount Volume</property>\r
-                        <property name="name">DismountVolumeMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnDismountVolumeMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Dismount All Mounted Volumes</property>\r
-                        <property name="name">DismountAllMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnDismountAllButtonClick</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Change Volume Password...</property>\r
-                        <property name="name">ChangePasswordMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnChangePasswordMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Change Header Key Derivation Algorithm...</property>\r
-                        <property name="name">ChangePkcs5PrfMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnChangePkcs5PrfMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Add/Remove Keyfiles to/from Volume...</property>\r
-                        <property name="name">ChangeKeyfilesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnChangeKeyfilesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Remove All Keyfiles from Volume...</property>\r
-                        <property name="name">RemoveKeyfilesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnRemoveKeyfilesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Volume Properties...</property>\r
-                        <property name="name">VolumePropertiesMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnVolumePropertiesButtonClick</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                </object>\r
-                <object class="wxMenu" expanded="0">\r
-                    <property name="label">&amp;Favorites</property>\r
-                    <property name="name">FavoritesMenu</property>\r
-                    <property name="permission">protected</property>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Add Selected Volume to Favorites...</property>\r
-                        <property name="name">AddToFavoritesMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnAddToFavoritesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Add All Mounted Volumes to Favorites...</property>\r
-                        <property name="name">AddAllMountedToFavoritesMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnAddAllMountedToFavoritesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Organize Favorite Volumes...</property>\r
-                        <property name="name">OrganizeFavoritesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnOrganizeFavoritesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Mount Favorite Volumes</property>\r
-                        <property name="name">MountAllFavoritesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnMountAllFavoritesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                </object>\r
-                <object class="wxMenu" expanded="0">\r
-                    <property name="label">T&amp;ools</property>\r
-                    <property name="name">ToolsMenu</property>\r
-                    <property name="permission">protected</property>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Benchmark...</property>\r
-                        <property name="name">BenchmarkMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnBenchmarkMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Test Vectors...</property>\r
-                        <property name="name">EncryptionTestMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnEncryptionTestMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Volume Creation Wizard</property>\r
-                        <property name="name">VolumeCreationWizardMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnCreateVolumeButtonClick</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Backup Volume Header...</property>\r
-                        <property name="name">BackupVolumeHeadersMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnBackupVolumeHeadersMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Restore Volume Header...</property>\r
-                        <property name="name">RestoreVolumeHeaderMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnRestoreVolumeHeaderMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Keyfile Generator</property>\r
-                        <property name="name">CreateKeyfileMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnCreateKeyfileMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Manage Security Token Keyfiles...</property>\r
-                        <property name="name">ManageSecurityTokenKeyfilesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnManageSecurityTokenKeyfilesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Close All Security Token Sessions</property>\r
-                        <property name="name">CloseAllSecurityTokenSessionsMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnCloseAllSecurityTokenSessionsMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Wipe Cached Passwords</property>\r
-                        <property name="name">WipeCachedPasswordsMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnWipeCacheButtonClick</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                </object>\r
-                <object class="wxMenu" expanded="0">\r
-                    <property name="label">Settin&amp;gs</property>\r
-                    <property name="name">SettingsMenu</property>\r
-                    <property name="permission">protected</property>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Hotkeys...</property>\r
-                        <property name="name">HotkeysMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnHotkeysMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Default Keyfiles...</property>\r
-                        <property name="name">DefaultKeyfilesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnDefaultKeyfilesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Security Tokens...</property>\r
-                        <property name="name">SecurityTokenPreferencesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnSecurityTokenPreferencesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_PREFERENCES</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">&amp;Preferences...</property>\r
-                        <property name="name">PreferencesMenuItem</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnPreferencesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                </object>\r
-                <object class="wxMenu" expanded="0">\r
-                    <property name="label">&amp;Help</property>\r
-                    <property name="name">HelpMenu</property>\r
-                    <property name="permission">protected</property>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_HELP</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">User&apos;s Guide</property>\r
-                        <property name="name">UserGuideMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnUserGuideMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Online Help</property>\r
-                        <property name="name">OnlineHelpMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnOnlineHelpMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Beginner&apos;s Tutorial</property>\r
-                        <property name="name">BeginnersTutorialMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnBeginnersTutorialMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Frequently Asked Questions</property>\r
-                        <property name="name">FaqMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnFaqMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">nemesis website</property>\r
-                        <property name="name">WebsiteMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnWebsiteMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Downloads</property>\r
-                        <property name="name">DownloadsMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnDownloadsMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">News</property>\r
-                        <property name="name">NewsMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnNewsMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Version History</property>\r
-                        <property name="name">VersionHistoryMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnVersionHistoryMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="separator" expanded="1">\r
-                        <property name="permission">none</property>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Contact</property>\r
-                        <property name="name">ContactMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnContactMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">Legal Notices</property>\r
-                        <property name="name">LegalNoticesMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnLegalNoticesMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_ABOUT</property>\r
-                        <property name="kind">wxITEM_NORMAL</property>\r
-                        <property name="label">About</property>\r
-                        <property name="name">AboutMenuItem</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnAboutMenuItemSelected</event>\r
-                        <event name="OnUpdateUI"></event>\r
-                    </object>\r
-                </object>\r
-            </object>\r
-            <object class="wxBoxSizer" expanded="0">\r
-                <property name="minimum_size"></property>\r
-                <property name="name">bSizer1</property>\r
-                <property name="orient">wxVERTICAL</property>\r
-                <property name="permission">none</property>\r
-                <object class="sizeritem" expanded="1">\r
-                    <property name="border">0</property>\r
-                    <property name="flag">wxEXPAND</property>\r
-                    <property name="proportion">1</property>\r
-                    <object class="wxPanel" expanded="0">\r
-                        <property name="bg"></property>\r
-                        <property name="context_help"></property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="fg"></property>\r
-                        <property name="font"></property>\r
-                        <property name="hidden">0</property>\r
-                        <property name="id">wxID_ANY</property>\r
-                        <property name="maximum_size"></property>\r
-                        <property name="minimum_size"></property>\r
-                        <property name="name">MainPanel</property>\r
-                        <property name="permission">protected</property>\r
-                        <property name="pos"></property>\r
-                        <property name="size"></property>\r
-                        <property name="subclass"></property>\r
-                        <property name="tooltip"></property>\r
-                        <property name="window_extra_style"></property>\r
-                        <property name="window_name"></property>\r
-                        <property name="window_style">wxTAB_TRAVERSAL</property>\r
-                        <event name="OnChar"></event>\r
-                        <event name="OnEnterWindow"></event>\r
-                        <event name="OnEraseBackground"></event>\r
-                        <event name="OnKeyDown"></event>\r
-                        <event name="OnKeyUp"></event>\r
-                        <event name="OnKillFocus"></event>\r
-                        <event name="OnLeaveWindow"></event>\r
-                        <event name="OnLeftDClick"></event>\r
-                        <event name="OnLeftDown"></event>\r
-                        <event name="OnLeftUp"></event>\r
-                        <event name="OnMiddleDClick"></event>\r
-                        <event name="OnMiddleDown"></event>\r
-                        <event name="OnMiddleUp"></event>\r
-                        <event name="OnMotion"></event>\r
-                        <event name="OnMouseEvents"></event>\r
-                        <event name="OnMouseWheel"></event>\r
-                        <event name="OnPaint"></event>\r
-                        <event name="OnRightDClick"></event>\r
-                        <event name="OnRightDown"></event>\r
-                        <event name="OnRightUp"></event>\r
-                        <event name="OnSetFocus"></event>\r
-                        <event name="OnSize"></event>\r
-                        <event name="OnUpdateUI"></event>\r
-                        <object class="wxBoxSizer" expanded="1">\r
-                            <property name="minimum_size"></property>\r
-                            <property name="name">bSizer2</property>\r
-                            <property name="orient">wxVERTICAL</property>\r
-                            <property name="permission">none</property>\r
-                            <object class="sizeritem" expanded="1">\r
-                                <property name="border">5</property>\r
-                                <property name="flag">wxEXPAND</property>\r
-                                <property name="proportion">1</property>\r
-                                <object class="wxBoxSizer" expanded="1">\r
-                                    <property name="minimum_size"></property>\r
-                                    <property name="name">bSizer48</property>\r
-                                    <property name="orient">wxVERTICAL</property>\r
-                                    <property name="permission">none</property>\r
-                                    <object class="sizeritem" expanded="1">\r
-                                        <property name="border">5</property>\r
-                                        <property name="flag">wxEXPAND</property>\r
-                                        <property name="proportion">1</property>\r
-                                        <object class="wxStaticBoxSizer" expanded="1">\r
-                                            <property name="id">wxID_ANY</property>\r
-                                            <property name="label"></property>\r
-                                            <property name="minimum_size"></property>\r
-                                            <property name="name">sbSizer1</property>\r
-                                            <property name="orient">wxVERTICAL</property>\r
-                                            <property name="permission">none</property>\r
-                                            <event name="OnUpdateUI"></event>\r
-                                            <object class="sizeritem" expanded="1">\r
-                                                <property name="border">5</property>\r
-                                                <property name="flag">wxALL|wxEXPAND</property>\r
-                                                <property name="proportion">1</property>\r
-                                                <object class="wxListCtrl" expanded="1">\r
-                                                    <property name="bg"></property>\r
-                                                    <property name="context_help"></property>\r
-                                                    <property name="enabled">1</property>\r
-                                                    <property name="fg"></property>\r
-                                                    <property name="font"></property>\r
-                                                    <property name="hidden">0</property>\r
-                                                    <property name="id">wxID_ANY</property>\r
-                                                    <property name="maximum_size"></property>\r
-                                                    <property name="minimum_size"></property>\r
-                                                    <property name="name">SlotListCtrl</property>\r
-                                                    <property name="permission">protected</property>\r
-                                                    <property name="pos"></property>\r
-                                                    <property name="size"></property>\r
-                                                    <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES</property>\r
-                                                    <property name="subclass"></property>\r
-                                                    <property name="tooltip"></property>\r
-                                                    <property name="window_extra_style"></property>\r
-                                                    <property name="window_name"></property>\r
-                                                    <property name="window_style">wxSUNKEN_BORDER</property>\r
-                                                    <event name="OnChar"></event>\r
-                                                    <event name="OnEnterWindow"></event>\r
-                                                    <event name="OnEraseBackground"></event>\r
-                                                    <event name="OnKeyDown"></event>\r
-                                                    <event name="OnKeyUp"></event>\r
-                                                    <event name="OnKillFocus"></event>\r
-                                                    <event name="OnLeaveWindow"></event>\r
-                                                    <event name="OnLeftDClick"></event>\r
-                                                    <event name="OnLeftDown"></event>\r
-                                                    <event name="OnLeftUp"></event>\r
-                                                    <event name="OnListBeginDrag"></event>\r
-                                                    <event name="OnListBeginLabelEdit"></event>\r
-                                                    <event name="OnListBeginRDrag"></event>\r
-                                                    <event name="OnListCacheHint"></event>\r
-                                                    <event name="OnListColBeginDrag"></event>\r
-                                                    <event name="OnListColClick"></event>\r
-                                                    <event name="OnListColDragging"></event>\r
-                                                    <event name="OnListColEndDrag"></event>\r
-                                                    <event name="OnListColRightClick"></event>\r
-                                                    <event name="OnListDeleteAllItems"></event>\r
-                                                    <event name="OnListDeleteItem"></event>\r
-                                                    <event name="OnListEndLabelEdit"></event>\r
-                                                    <event name="OnListInsertItem"></event>\r
-                                                    <event name="OnListItemActivated">OnListItemActivated</event>\r
-                                                    <event name="OnListItemDeselected">OnListItemDeselected</event>\r
-                                                    <event name="OnListItemFocused"></event>\r
-                                                    <event name="OnListItemMiddleClick"></event>\r
-                                                    <event name="OnListItemRightClick">OnListItemRightClick</event>\r
-                                                    <event name="OnListItemSelected">OnListItemSelected</event>\r
-                                                    <event name="OnListKeyDown"></event>\r
-                                                    <event name="OnMiddleDClick"></event>\r
-                                                    <event name="OnMiddleDown"></event>\r
-                                                    <event name="OnMiddleUp"></event>\r
-                                                    <event name="OnMotion"></event>\r
-                                                    <event name="OnMouseEvents"></event>\r
-                                                    <event name="OnMouseWheel"></event>\r
-                                                    <event name="OnPaint"></event>\r
-                                                    <event name="OnRightDClick"></event>\r
-                                                    <event name="OnRightDown"></event>\r
-                                                    <event name="OnRightUp"></event>\r
-                                                    <event name="OnSetFocus"></event>\r
-                                                    <event name="OnSize"></event>\r
-                                                    <event name="OnUpdateUI"></event>\r
-                                                </object>\r
-                                            </object>\r
-                                        </object>\r
-                                    </object>\r
-                                    <object class="sizeritem" expanded="1">\r
-                                        <property name="border">5</property>\r
-                                        <property name="flag">wxEXPAND</property>\r
-                                        <property name="proportion">0</property>\r
-                                        <object class="wxStaticBoxSizer" expanded="1">\r
-                                            <property name="id">wxID_ANY</property>\r
-                                            <property name="label"></property>\r
-                                            <property name="minimum_size"></property>\r
-                                            <property name="name">LowStaticBoxSizer</property>\r
-                                            <property name="orient">wxVERTICAL</property>\r
-                                            <property name="permission">protected</property>\r
-                                            <event name="OnUpdateUI"></event>\r
-                                            <object class="sizeritem" expanded="1">\r
-                                                <property name="border">2</property>\r
-                                                <property name="flag">wxEXPAND|wxTOP</property>\r
-                                                <property name="proportion">0</property>\r
-                                                <object class="wxBoxSizer" expanded="1">\r
-                                                    <property name="minimum_size"></property>\r
-                                                    <property name="name">HigherButtonSizer</property>\r
-                                                    <property name="orient">wxVERTICAL</property>\r
-                                                    <property name="permission">protected</property>\r
-                                                </object>\r
-                                            </object>\r
-                                            <object class="sizeritem" expanded="1">\r
-                                                <property name="border">5</property>\r
-                                                <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>\r
-                                                <property name="proportion">0</property>\r
-                                                <object class="wxGridSizer" expanded="1">\r
-                                                    <property name="cols">3</property>\r
-                                                    <property name="hgap">0</property>\r
-                                                    <property name="minimum_size"></property>\r
-                                                    <property name="name">gSizer1</property>\r
-                                                    <property name="permission">none</property>\r
-                                                    <property name="rows">1</property>\r
-                                                    <property name="vgap">0</property>\r
-                                                    <object class="sizeritem" expanded="1">\r
-                                                        <property name="border">5</property>\r
-                                                        <property name="flag"></property>\r
-                                                        <property name="proportion">0</property>\r
-                                                        <object class="wxBoxSizer" expanded="1">\r
-                                                            <property name="minimum_size">138,34</property>\r
-                                                            <property name="name">bSizer17</property>\r
-                                                            <property name="orient">wxVERTICAL</property>\r
-                                                            <property name="permission">none</property>\r
-                                                            <object class="sizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="flag">wxALL|wxEXPAND</property>\r
-                                                                <property name="proportion">1</property>\r
-                                                                <object class="wxButton" expanded="1">\r
-                                                                    <property name="bg"></property>\r
-                                                                    <property name="context_help"></property>\r
-                                                                    <property name="default">0</property>\r
-                                                                    <property name="enabled">1</property>\r
-                                                                    <property name="fg"></property>\r
-                                                                    <property name="font"></property>\r
-                                                                    <property name="hidden">0</property>\r
-                                                                    <property name="id">wxID_ANY</property>\r
-                                                                    <property name="label">&amp;Create Volume</property>\r
-                                                                    <property name="maximum_size"></property>\r
-                                                                    <property name="minimum_size">-1,-1</property>\r
-                                                                    <property name="name">CreateVolumeButton</property>\r
-                                                                    <property name="permission">protected</property>\r
-                                                                    <property name="pos"></property>\r
-                                                                    <property name="size"></property>\r
-                                                                    <property name="style"></property>\r
-                                                                    <property name="subclass"></property>\r
-                                                                    <property name="tooltip"></property>\r
-                                                                    <property name="window_extra_style"></property>\r
-                                                                    <property name="window_name"></property>\r
-                                                                    <property name="window_style"></property>\r
-                                                                    <event name="OnButtonClick">OnCreateVolumeButtonClick</event>\r
-                                                                    <event name="OnChar"></event>\r
-                                                                    <event name="OnEnterWindow"></event>\r
-                                                                    <event name="OnEraseBackground"></event>\r
-                                                                    <event name="OnKeyDown"></event>\r
-                                                                    <event name="OnKeyUp"></event>\r
-                                                                    <event name="OnKillFocus"></event>\r
-                                                                    <event name="OnLeaveWindow"></event>\r
-                                                                    <event name="OnLeftDClick"></event>\r
-                                                                    <event name="OnLeftDown"></event>\r
-                                                                    <event name="OnLeftUp"></event>\r
-                                                                    <event name="OnMiddleDClick"></event>\r
-                                                                    <event name="OnMiddleDown"></event>\r
-                                                                    <event name="OnMiddleUp"></event>\r
-                                                                    <event name="OnMotion"></event>\r
-                                                                    <event name="OnMouseEvents"></event>\r
-                                                                    <event name="OnMouseWheel"></event>\r
-                                                                    <event name="OnPaint"></event>\r
-                                                                    <event name="OnRightDClick"></event>\r
-                                                                    <event name="OnRightDown"></event>\r
-                                                                    <event name="OnRightUp"></event>\r
-                                                                    <event name="OnSetFocus"></event>\r
-                                                                    <event name="OnSize"></event>\r
-                                                                    <event name="OnUpdateUI"></event>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                        </object>\r
-                                                    </object>\r
-                                                    <object class="sizeritem" expanded="1">\r
-                                                        <property name="border">5</property>\r
-                                                        <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>\r
-                                                        <property name="proportion">0</property>\r
-                                                        <object class="wxBoxSizer" expanded="1">\r
-                                                            <property name="minimum_size">138,34</property>\r
-                                                            <property name="name">bSizer18</property>\r
-                                                            <property name="orient">wxVERTICAL</property>\r
-                                                            <property name="permission">none</property>\r
-                                                            <object class="sizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>\r
-                                                                <property name="proportion">1</property>\r
-                                                                <object class="wxButton" expanded="1">\r
-                                                                    <property name="bg"></property>\r
-                                                                    <property name="context_help"></property>\r
-                                                                    <property name="default">0</property>\r
-                                                                    <property name="enabled">1</property>\r
-                                                                    <property name="fg"></property>\r
-                                                                    <property name="font"></property>\r
-                                                                    <property name="hidden">0</property>\r
-                                                                    <property name="id">wxID_ANY</property>\r
-                                                                    <property name="label">&amp;Volume Properties...</property>\r
-                                                                    <property name="maximum_size"></property>\r
-                                                                    <property name="minimum_size">-1,-1</property>\r
-                                                                    <property name="name">VolumePropertiesButton</property>\r
-                                                                    <property name="permission">protected</property>\r
-                                                                    <property name="pos"></property>\r
-                                                                    <property name="size"></property>\r
-                                                                    <property name="style"></property>\r
-                                                                    <property name="subclass"></property>\r
-                                                                    <property name="tooltip"></property>\r
-                                                                    <property name="window_extra_style"></property>\r
-                                                                    <property name="window_name"></property>\r
-                                                                    <property name="window_style"></property>\r
-                                                                    <event name="OnButtonClick">OnVolumePropertiesButtonClick</event>\r
-                                                                    <event name="OnChar"></event>\r
-                                                                    <event name="OnEnterWindow"></event>\r
-                                                                    <event name="OnEraseBackground"></event>\r
-                                                                    <event name="OnKeyDown"></event>\r
-                                                                    <event name="OnKeyUp"></event>\r
-                                                                    <event name="OnKillFocus"></event>\r
-                                                                    <event name="OnLeaveWindow"></event>\r
-                                                                    <event name="OnLeftDClick"></event>\r
-                                                                    <event name="OnLeftDown"></event>\r
-                                                                    <event name="OnLeftUp"></event>\r
-                                                                    <event name="OnMiddleDClick"></event>\r
-                                                                    <event name="OnMiddleDown"></event>\r
-                                                                    <event name="OnMiddleUp"></event>\r
-                                                                    <event name="OnMotion"></event>\r
-                                                                    <event name="OnMouseEvents"></event>\r
-                                                                    <event name="OnMouseWheel"></event>\r
-                                                                    <event name="OnPaint"></event>\r
-                                                                    <event name="OnRightDClick"></event>\r
-                                                                    <event name="OnRightDown"></event>\r
-                                                                    <event name="OnRightUp"></event>\r
-                                                                    <event name="OnSetFocus"></event>\r
-                                                                    <event name="OnSize"></event>\r
-                                                                    <event name="OnUpdateUI"></event>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                        </object>\r
-                                                    </object>\r
-                                                    <object class="sizeritem" expanded="1">\r
-                                                        <property name="border">5</property>\r
-                                                        <property name="flag">wxALIGN_RIGHT</property>\r
-                                                        <property name="proportion">0</property>\r
-                                                        <object class="wxBoxSizer" expanded="1">\r
-                                                            <property name="minimum_size">138,34</property>\r
-                                                            <property name="name">bSizer19</property>\r
-                                                            <property name="orient">wxVERTICAL</property>\r
-                                                            <property name="permission">none</property>\r
-                                                            <object class="sizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="flag">wxALL|wxALIGN_RIGHT|wxEXPAND</property>\r
-                                                                <property name="proportion">1</property>\r
-                                                                <object class="wxButton" expanded="1">\r
-                                                                    <property name="bg"></property>\r
-                                                                    <property name="context_help"></property>\r
-                                                                    <property name="default">0</property>\r
-                                                                    <property name="enabled">1</property>\r
-                                                                    <property name="fg"></property>\r
-                                                                    <property name="font"></property>\r
-                                                                    <property name="hidden">0</property>\r
-                                                                    <property name="id">wxID_ANY</property>\r
-                                                                    <property name="label">&amp;Wipe Cache</property>\r
-                                                                    <property name="maximum_size"></property>\r
-                                                                    <property name="minimum_size">-1,-1</property>\r
-                                                                    <property name="name">WipeCacheButton</property>\r
-                                                                    <property name="permission">protected</property>\r
-                                                                    <property name="pos"></property>\r
-                                                                    <property name="size"></property>\r
-                                                                    <property name="style"></property>\r
-                                                                    <property name="subclass"></property>\r
-                                                                    <property name="tooltip"></property>\r
-                                                                    <property name="window_extra_style"></property>\r
-                                                                    <property name="window_name"></property>\r
-                                                                    <property name="window_style"></property>\r
-                                                                    <event name="OnButtonClick">OnWipeCacheButtonClick</event>\r
-                                                                    <event name="OnChar"></event>\r
-                                                                    <event name="OnEnterWindow"></event>\r
-                                                                    <event name="OnEraseBackground"></event>\r
-                                                                    <event name="OnKeyDown"></event>\r
-                                                                    <event name="OnKeyUp"></event>\r
-                                                                    <event name="OnKillFocus"></event>\r
-                                                                    <event name="OnLeaveWindow"></event>\r
-                                                                    <event name="OnLeftDClick"></event>\r
-                                                                    <event name="OnLeftDown"></event>\r
-                                                                    <event name="OnLeftUp"></event>\r
-                                                                    <event name="OnMiddleDClick"></event>\r
-                                                                    <event name="OnMiddleDown"></event>\r
-                                                                    <event name="OnMiddleUp"></event>\r
-                                                                    <event name="OnMotion"></event>\r
-                                                                    <event name="OnMouseEvents"></event>\r
-                                                                    <event name="OnMouseWheel"></event>\r
-                                                                    <event name="OnPaint"></event>\r
-                                                                    <event name="OnRightDClick"></event>\r
-                                                                    <event name="OnRightDown"></event>\r
-                                                                    <event name="OnRightUp"></event>\r
-                                                                    <event name="OnSetFocus"></event>\r
-                                                                    <event name="OnSize"></event>\r
-                                                                    <event name="OnUpdateUI"></event>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                        </object>\r
-                                                    </object>\r
-                                                </object>\r
-                                            </object>\r
-                                            <object class="sizeritem" expanded="1">\r
-                                                <property name="border">5</property>\r
-                                                <property name="flag"></property>\r
-                                                <property name="proportion">0</property>\r
-                                                <object class="spacer" expanded="1">\r
-                                                    <property name="height">0</property>\r
-                                                    <property name="permission">protected</property>\r
-                                                    <property name="width">0</property>\r
-                                                </object>\r
-                                            </object>\r
-                                            <object class="sizeritem" expanded="1">\r
-                                                <property name="border">5</property>\r
-                                                <property name="flag">wxEXPAND</property>\r
-                                                <property name="proportion">1</property>\r
-                                                <object class="wxStaticBoxSizer" expanded="1">\r
-                                                    <property name="id">wxID_ANY</property>\r
-                                                    <property name="label">Volume</property>\r
-                                                    <property name="minimum_size"></property>\r
-                                                    <property name="name">VolumeStaticBoxSizer</property>\r
-                                                    <property name="orient">wxVERTICAL</property>\r
-                                                    <property name="permission">protected</property>\r
-                                                    <event name="OnUpdateUI"></event>\r
-                                                    <object class="sizeritem" expanded="1">\r
-                                                        <property name="border">4</property>\r
-                                                        <property name="flag">wxEXPAND|wxALL</property>\r
-                                                        <property name="proportion">1</property>\r
-                                                        <object class="wxGridBagSizer" expanded="1">\r
-                                                            <property name="empty_cell_size"></property>\r
-                                                            <property name="flexible_direction">wxBOTH</property>\r
-                                                            <property name="growablecols">1</property>\r
-                                                            <property name="growablerows">0</property>\r
-                                                            <property name="hgap">0</property>\r
-                                                            <property name="minimum_size"></property>\r
-                                                            <property name="name">VolumeGridBagSizer</property>\r
-                                                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>\r
-                                                            <property name="permission">protected</property>\r
-                                                            <property name="vgap">0</property>\r
-                                                            <object class="gbsizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="colspan">1</property>\r
-                                                                <property name="column">0</property>\r
-                                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
-                                                                <property name="row">0</property>\r
-                                                                <property name="rowspan">2</property>\r
-                                                                <object class="wxStaticBitmap" expanded="1">\r
-                                                                    <property name="bg"></property>\r
-                                                                    <property name="bitmap"></property>\r
-                                                                    <property name="context_help"></property>\r
-                                                                    <property name="enabled">1</property>\r
-                                                                    <property name="fg"></property>\r
-                                                                    <property name="font"></property>\r
-                                                                    <property name="hidden">0</property>\r
-                                                                    <property name="id">wxID_ANY</property>\r
-                                                                    <property name="maximum_size"></property>\r
-                                                                    <property name="minimum_size">42,52</property>\r
-                                                                    <property name="name">LogoBitmap</property>\r
-                                                                    <property name="permission">protected</property>\r
-                                                                    <property name="pos"></property>\r
-                                                                    <property name="size"></property>\r
-                                                                    <property name="subclass"></property>\r
-                                                                    <property name="tooltip"></property>\r
-                                                                    <property name="window_extra_style"></property>\r
-                                                                    <property name="window_name"></property>\r
-                                                                    <property name="window_style">wxSUNKEN_BORDER</property>\r
-                                                                    <event name="OnChar"></event>\r
-                                                                    <event name="OnEnterWindow"></event>\r
-                                                                    <event name="OnEraseBackground"></event>\r
-                                                                    <event name="OnKeyDown"></event>\r
-                                                                    <event name="OnKeyUp"></event>\r
-                                                                    <event name="OnKillFocus"></event>\r
-                                                                    <event name="OnLeaveWindow"></event>\r
-                                                                    <event name="OnLeftDClick"></event>\r
-                                                                    <event name="OnLeftDown">OnLogoBitmapClick</event>\r
-                                                                    <event name="OnLeftUp"></event>\r
-                                                                    <event name="OnMiddleDClick"></event>\r
-                                                                    <event name="OnMiddleDown"></event>\r
-                                                                    <event name="OnMiddleUp"></event>\r
-                                                                    <event name="OnMotion"></event>\r
-                                                                    <event name="OnMouseEvents"></event>\r
-                                                                    <event name="OnMouseWheel"></event>\r
-                                                                    <event name="OnPaint"></event>\r
-                                                                    <event name="OnRightDClick"></event>\r
-                                                                    <event name="OnRightDown"></event>\r
-                                                                    <event name="OnRightUp"></event>\r
-                                                                    <event name="OnSetFocus"></event>\r
-                                                                    <event name="OnSize"></event>\r
-                                                                    <event name="OnUpdateUI"></event>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                            <object class="gbsizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="colspan">2</property>\r
-                                                                <property name="column">1</property>\r
-                                                                <property name="flag">wxEXPAND|wxALL</property>\r
-                                                                <property name="row">0</property>\r
-                                                                <property name="rowspan">1</property>\r
-                                                                <object class="wxComboBox" expanded="1">\r
-                                                                    <property name="bg"></property>\r
-                                                                    <property name="choices"></property>\r
-                                                                    <property name="context_help"></property>\r
-                                                                    <property name="enabled">1</property>\r
-                                                                    <property name="fg"></property>\r
-                                                                    <property name="font"></property>\r
-                                                                    <property name="hidden">0</property>\r
-                                                                    <property name="id">wxID_ANY</property>\r
-                                                                    <property name="maximum_size"></property>\r
-                                                                    <property name="minimum_size"></property>\r
-                                                                    <property name="name">VolumePathComboBox</property>\r
-                                                                    <property name="permission">protected</property>\r
-                                                                    <property name="pos"></property>\r
-                                                                    <property name="size"></property>\r
-                                                                    <property name="style">wxCB_DROPDOWN</property>\r
-                                                                    <property name="subclass"></property>\r
-                                                                    <property name="tooltip"></property>\r
-                                                                    <property name="value"></property>\r
-                                                                    <property name="window_extra_style"></property>\r
-                                                                    <property name="window_name"></property>\r
-                                                                    <property name="window_style"></property>\r
-                                                                    <event name="OnChar"></event>\r
-                                                                    <event name="OnCombobox"></event>\r
-                                                                    <event name="OnEnterWindow"></event>\r
-                                                                    <event name="OnEraseBackground"></event>\r
-                                                                    <event name="OnKeyDown"></event>\r
-                                                                    <event name="OnKeyUp"></event>\r
-                                                                    <event name="OnKillFocus"></event>\r
-                                                                    <event name="OnLeaveWindow"></event>\r
-                                                                    <event name="OnLeftDClick"></event>\r
-                                                                    <event name="OnLeftDown"></event>\r
-                                                                    <event name="OnLeftUp"></event>\r
-                                                                    <event name="OnMiddleDClick"></event>\r
-                                                                    <event name="OnMiddleDown"></event>\r
-                                                                    <event name="OnMiddleUp"></event>\r
-                                                                    <event name="OnMotion"></event>\r
-                                                                    <event name="OnMouseEvents"></event>\r
-                                                                    <event name="OnMouseWheel"></event>\r
-                                                                    <event name="OnPaint"></event>\r
-                                                                    <event name="OnRightDClick"></event>\r
-                                                                    <event name="OnRightDown"></event>\r
-                                                                    <event name="OnRightUp"></event>\r
-                                                                    <event name="OnSetFocus"></event>\r
-                                                                    <event name="OnSize"></event>\r
-                                                                    <event name="OnText"></event>\r
-                                                                    <event name="OnTextEnter"></event>\r
-                                                                    <event name="OnUpdateUI"></event>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                            <object class="gbsizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="colspan">1</property>\r
-                                                                <property name="column">3</property>\r
-                                                                <property name="flag">wxEXPAND</property>\r
-                                                                <property name="row">0</property>\r
-                                                                <property name="rowspan">1</property>\r
-                                                                <object class="wxBoxSizer" expanded="1">\r
-                                                                    <property name="minimum_size">138,34</property>\r
-                                                                    <property name="name">bSizer191</property>\r
-                                                                    <property name="orient">wxVERTICAL</property>\r
-                                                                    <property name="permission">none</property>\r
-                                                                    <object class="sizeritem" expanded="1">\r
-                                                                        <property name="border">5</property>\r
-                                                                        <property name="flag">wxALL|wxEXPAND</property>\r
-                                                                        <property name="proportion">1</property>\r
-                                                                        <object class="wxButton" expanded="1">\r
-                                                                            <property name="bg"></property>\r
-                                                                            <property name="context_help"></property>\r
-                                                                            <property name="default">0</property>\r
-                                                                            <property name="enabled">1</property>\r
-                                                                            <property name="fg"></property>\r
-                                                                            <property name="font"></property>\r
-                                                                            <property name="hidden">0</property>\r
-                                                                            <property name="id">wxID_ANY</property>\r
-                                                                            <property name="label">Select &amp;File...</property>\r
-                                                                            <property name="maximum_size"></property>\r
-                                                                            <property name="minimum_size">-1,-1</property>\r
-                                                                            <property name="name">SelectFileButton</property>\r
-                                                                            <property name="permission">protected</property>\r
-                                                                            <property name="pos"></property>\r
-                                                                            <property name="size"></property>\r
-                                                                            <property name="style"></property>\r
-                                                                            <property name="subclass"></property>\r
-                                                                            <property name="tooltip"></property>\r
-                                                                            <property name="window_extra_style"></property>\r
-                                                                            <property name="window_name"></property>\r
-                                                                            <property name="window_style"></property>\r
-                                                                            <event name="OnButtonClick">OnSelectFileButtonClick</event>\r
-                                                                            <event name="OnChar"></event>\r
-                                                                            <event name="OnEnterWindow"></event>\r
-                                                                            <event name="OnEraseBackground"></event>\r
-                                                                            <event name="OnKeyDown"></event>\r
-                                                                            <event name="OnKeyUp"></event>\r
-                                                                            <event name="OnKillFocus"></event>\r
-                                                                            <event name="OnLeaveWindow"></event>\r
-                                                                            <event name="OnLeftDClick"></event>\r
-                                                                            <event name="OnLeftDown"></event>\r
-                                                                            <event name="OnLeftUp"></event>\r
-                                                                            <event name="OnMiddleDClick"></event>\r
-                                                                            <event name="OnMiddleDown"></event>\r
-                                                                            <event name="OnMiddleUp"></event>\r
-                                                                            <event name="OnMotion"></event>\r
-                                                                            <event name="OnMouseEvents"></event>\r
-                                                                            <event name="OnMouseWheel"></event>\r
-                                                                            <event name="OnPaint"></event>\r
-                                                                            <event name="OnRightDClick"></event>\r
-                                                                            <event name="OnRightDown"></event>\r
-                                                                            <event name="OnRightUp"></event>\r
-                                                                            <event name="OnSetFocus"></event>\r
-                                                                            <event name="OnSize"></event>\r
-                                                                            <event name="OnUpdateUI"></event>\r
-                                                                        </object>\r
-                                                                    </object>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                            <object class="gbsizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="colspan">1</property>\r
-                                                                <property name="column">1</property>\r
-                                                                <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>\r
-                                                                <property name="row">1</property>\r
-                                                                <property name="rowspan">1</property>\r
-                                                                <object class="wxCheckBox" expanded="1">\r
-                                                                    <property name="bg"></property>\r
-                                                                    <property name="checked">0</property>\r
-                                                                    <property name="context_help"></property>\r
-                                                                    <property name="enabled">1</property>\r
-                                                                    <property name="fg"></property>\r
-                                                                    <property name="font"></property>\r
-                                                                    <property name="hidden">0</property>\r
-                                                                    <property name="id">wxID_ANY</property>\r
-                                                                    <property name="label">&amp;Never save history</property>\r
-                                                                    <property name="maximum_size"></property>\r
-                                                                    <property name="minimum_size"></property>\r
-                                                                    <property name="name">NoHistoryCheckBox</property>\r
-                                                                    <property name="permission">protected</property>\r
-                                                                    <property name="pos"></property>\r
-                                                                    <property name="size"></property>\r
-                                                                    <property name="style"></property>\r
-                                                                    <property name="subclass"></property>\r
-                                                                    <property name="tooltip"></property>\r
-                                                                    <property name="window_extra_style"></property>\r
-                                                                    <property name="window_name"></property>\r
-                                                                    <property name="window_style"></property>\r
-                                                                    <event name="OnChar"></event>\r
-                                                                    <event name="OnCheckBox">OnNoHistoryCheckBoxClick</event>\r
-                                                                    <event name="OnEnterWindow"></event>\r
-                                                                    <event name="OnEraseBackground"></event>\r
-                                                                    <event name="OnKeyDown"></event>\r
-                                                                    <event name="OnKeyUp"></event>\r
-                                                                    <event name="OnKillFocus"></event>\r
-                                                                    <event name="OnLeaveWindow"></event>\r
-                                                                    <event name="OnLeftDClick"></event>\r
-                                                                    <event name="OnLeftDown"></event>\r
-                                                                    <event name="OnLeftUp"></event>\r
-                                                                    <event name="OnMiddleDClick"></event>\r
-                                                                    <event name="OnMiddleDown"></event>\r
-                                                                    <event name="OnMiddleUp"></event>\r
-                                                                    <event name="OnMotion"></event>\r
-                                                                    <event name="OnMouseEvents"></event>\r
-                                                                    <event name="OnMouseWheel"></event>\r
-                                                                    <event name="OnPaint"></event>\r
-                                                                    <event name="OnRightDClick"></event>\r
-                                                                    <event name="OnRightDown"></event>\r
-                                                                    <event name="OnRightUp"></event>\r
-                                                                    <event name="OnSetFocus"></event>\r
-                                                                    <event name="OnSize"></event>\r
-                                                                    <event name="OnUpdateUI"></event>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                            <object class="gbsizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="colspan">1</property>\r
-                                                                <property name="column">2</property>\r
-                                                                <property name="flag">wxALIGN_RIGHT</property>\r
-                                                                <property name="row">1</property>\r
-                                                                <property name="rowspan">1</property>\r
-                                                                <object class="wxBoxSizer" expanded="1">\r
-                                                                    <property name="minimum_size">138,34</property>\r
-                                                                    <property name="name">bSizer20</property>\r
-                                                                    <property name="orient">wxVERTICAL</property>\r
-                                                                    <property name="permission">none</property>\r
-                                                                    <object class="sizeritem" expanded="1">\r
-                                                                        <property name="border">5</property>\r
-                                                                        <property name="flag">wxALL|wxEXPAND</property>\r
-                                                                        <property name="proportion">1</property>\r
-                                                                        <object class="wxButton" expanded="1">\r
-                                                                            <property name="bg"></property>\r
-                                                                            <property name="context_help"></property>\r
-                                                                            <property name="default">0</property>\r
-                                                                            <property name="enabled">1</property>\r
-                                                                            <property name="fg"></property>\r
-                                                                            <property name="font"></property>\r
-                                                                            <property name="hidden">0</property>\r
-                                                                            <property name="id">wxID_ANY</property>\r
-                                                                            <property name="label">Volume &amp;Tools...</property>\r
-                                                                            <property name="maximum_size"></property>\r
-                                                                            <property name="minimum_size">-1,-1</property>\r
-                                                                            <property name="name">VolumeToolsButton</property>\r
-                                                                            <property name="permission">protected</property>\r
-                                                                            <property name="pos"></property>\r
-                                                                            <property name="size"></property>\r
-                                                                            <property name="style"></property>\r
-                                                                            <property name="subclass"></property>\r
-                                                                            <property name="tooltip"></property>\r
-                                                                            <property name="window_extra_style"></property>\r
-                                                                            <property name="window_name"></property>\r
-                                                                            <property name="window_style"></property>\r
-                                                                            <event name="OnButtonClick">OnVolumeToolsButtonClick</event>\r
-                                                                            <event name="OnChar"></event>\r
-                                                                            <event name="OnEnterWindow"></event>\r
-                                                                            <event name="OnEraseBackground"></event>\r
-                                                                            <event name="OnKeyDown"></event>\r
-                                                                            <event name="OnKeyUp"></event>\r
-                                                                            <event name="OnKillFocus"></event>\r
-                                                                            <event name="OnLeaveWindow"></event>\r
-                                                                            <event name="OnLeftDClick"></event>\r
-                                                                            <event name="OnLeftDown"></event>\r
-                                                                            <event name="OnLeftUp"></event>\r
-                                                                            <event name="OnMiddleDClick"></event>\r
-                                                                            <event name="OnMiddleDown"></event>\r
-                                                                            <event name="OnMiddleUp"></event>\r
-                                                                            <event name="OnMotion"></event>\r
-                                                                            <event name="OnMouseEvents"></event>\r
-                                                                            <event name="OnMouseWheel"></event>\r
-                                                                            <event name="OnPaint"></event>\r
-                                                                            <event name="OnRightDClick"></event>\r
-                                                                            <event name="OnRightDown"></event>\r
-                                                                            <event name="OnRightUp"></event>\r
-                                                                            <event name="OnSetFocus"></event>\r
-                                                                            <event name="OnSize"></event>\r
-                                                                            <event name="OnUpdateUI"></event>\r
-                                                                        </object>\r
-                                                                    </object>\r
-                                                                </object>\r
-                                                            </object>\r
-                                                            <object class="gbsizeritem" expanded="1">\r
-                                                                <property name="border">5</property>\r
-                                                                <property name="colspan">1</property>\r
-                                                                <property name="column">3</property>\r
-                                                                <property name="flag">wxEXPAND</property>\r
-                                                                <property name="row">1</property>\r
-    &nbs