Fixed issues where rows = 2 and cols = 2 in Telephone and Address forms caused asserts.

[xestiaab/.git] / source / AppXestiaAddrBk.cpp

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index 7be4fa4..63e06ce 100644 (file)
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -29,11 +29,11 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        mnuManage->AppendSeparator();\r
        \r
        wxMenuItem* mnuImport;\r
-       mnuImport = new wxMenuItem( mnuManage, ID_MANAGE_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       mnuImport = new wxMenuItem( mnuManage, ID_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );\r
        mnuManage->Append( mnuImport );\r
        \r
        wxMenuItem* mnuExport;\r
-       mnuExport = new wxMenuItem( mnuManage, ID_MANAGE_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       mnuExport = new wxMenuItem( mnuManage, ID_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );\r
        mnuManage->Append( mnuExport );\r
        \r
        mnuPrefSep = mnuManage->AppendSeparator();\r
@@ -261,8 +261,8 @@ frmMainADT::~frmMainADT()
        // Disconnect Events\r
        this->Disconnect( ID_MANAGE_NEWAB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) );\r
-       this->Disconnect( ID_MANAGE_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
-       this->Disconnect( ID_MANAGE_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );\r
+       this->Disconnect( ID_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
+       this->Disconnect( ID_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );\r
        this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) );\r
        this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) );\r
@@ -473,11 +473,9 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit
        mnuContactOpen = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Open Contact...") ) + wxT('\t') + wxT("CTRL+O"), wxEmptyString, wxITEM_NORMAL );\r
        mnuContact->Append( mnuContactOpen );\r
        \r
-       wxMenuItem* mnuContactEdit;\r
        mnuContactEdit = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Edit Contact...") ) + wxT('\t') + wxT("CTRL+E"), wxEmptyString, wxITEM_NORMAL );\r
        mnuContact->Append( mnuContactEdit );\r
        \r
-       wxMenuItem* mnuContactReveal;\r
        mnuContactReveal = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Reveal Contact") ) + wxT('\t') + wxT("CTRL+R"), wxEmptyString, wxITEM_NORMAL );\r
        mnuContact->Append( mnuContactReveal );\r
        \r
@@ -3773,7 +3771,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
        nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );\r
        tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxFlexGridSizer* fgSizer6;\r
-       fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 );\r
+       fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );\r
        fgSizer6->AddGrowableCol( 1 );\r
        fgSizer6->SetFlexibleDirection( wxVERTICAL );\r
        fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
@@ -3870,7 +3868,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
        tabGeneral->SetSizer( fgSizer6 );\r
        tabGeneral->Layout();\r
        fgSizer6->Fit( tabGeneral );\r
-       nbkAddress->AddPage( tabGeneral, wxT("General"), true );\r
+       nbkAddress->AddPage( tabGeneral, wxT("General"), false );\r
        tabLabel = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer253;\r
        bSizer253 = new wxBoxSizer( wxVERTICAL );\r
@@ -3886,10 +3884,10 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
        tabLabel->SetSizer( bSizer253 );\r
        tabLabel->Layout();\r
        bSizer253->Fit( tabLabel );\r
-       nbkAddress->AddPage( tabLabel, wxT("Label"), false );\r
+       nbkAddress->AddPage( tabLabel, wxT("Label"), true );\r
        tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxFlexGridSizer* fgSizer61;\r
-       fgSizer61 = new wxFlexGridSizer( 2, 2, 0, 0 );\r
+       fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );\r
        fgSizer61->AddGrowableCol( 1 );\r
        fgSizer61->SetFlexibleDirection( wxVERTICAL );\r
        fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
@@ -4081,11 +4079,6 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS
        \r
        wxMenuItem* mnuSleepMode;\r
        mnuSleepMode = new wxMenuItem( mnuWindow, wxID_ANY, wxString( wxT("Sleep Mode") ) , wxEmptyString, wxITEM_CHECK );\r
-       #ifdef __WXMSW__\r
-       mnuSleepMode->SetBitmaps( wxNullBitmap );\r
-       #elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))\r
-       mnuSleepMode->SetBitmap( wxNullBitmap );\r
-       #endif\r
        mnuWindow->Append( mnuSleepMode );\r
        \r
        mnuWindow->AppendSeparator();\r
@@ -6334,7 +6327,7 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
        fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 );\r
        \r
        wxGridSizer* gSizer5;\r
-       gSizer5 = new wxGridSizer( 2, 2, 0, 0 );\r
+       gSizer5 = new wxGridSizer( 0, 2, 0, 0 );\r
        \r
        chkVoice = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Voice"), wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer5->Add( chkVoice, 0, wxALL, 2 );\r
@@ -7108,13 +7101,13 @@ frmInvalidSSLCertificateADT::~frmInvalidSSLCertificateADT()
 \r
 frmImportContactsADT::frmImportContactsADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetSizeHints( wxSize( 325,400 ), wxSize( 325,400 ) );\r
        \r
        wxBoxSizer* bSizer393;\r
        bSizer393 = new wxBoxSizer( wxVERTICAL );\r
        \r
        lblImportText = new wxStaticText( this, wxID_ANY, wxT("Select the contacts you want to import and the account to import into. Click on Import to finish."), wxDefaultPosition, wxDefaultSize, 0 );\r
-       lblImportText->Wrap( -1 );\r
+       lblImportText->Wrap( 300 );\r
        bSizer393->Add( lblImportText, 0, wxALL|wxEXPAND, 5 );\r
        \r
        wxArrayString lstContactsChoices;\r