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

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index d8faa7e..63e06ce 100644 (file)
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -3771,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
@@ -3868,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
@@ -3884,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
@@ -6327,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

diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h
index 3126cde..04e23b7 100644 (file)
--- a/source/AppXestiaAddrBk.h
+++ b/source/AppXestiaAddrBk.h
@@ -1646,7 +1646,7 @@ class frmContactEditorTelephoneADT : public wxDialog
        \r
        public:\r
                \r
-               frmContactEditorTelephoneADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Telephone Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 401,262 ), long style = wxDEFAULT_DIALOG_STYLE ); \r
+               frmContactEditorTelephoneADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Telephone Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 401,307 ), long style = wxDEFAULT_DIALOG_STYLE ); \r
                ~frmContactEditorTelephoneADT();\r
        \r
 };\r