From a27310520f595a63be801671c6817e5ce54ec90d Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Tue, 3 Nov 2015 08:57:59 +0000 Subject: [PATCH] Fixed issues where rows = 2 and cols = 2 in Telephone and Address forms caused asserts. --- source/AppXestiaAddrBk.cpp | 10 +++++----- source/AppXestiaAddrBk.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index d8faa7e..63e06ce 100644 --- 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 ); tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer6->AddGrowableCol( 1 ); fgSizer6->SetFlexibleDirection( wxVERTICAL ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -3868,7 +3868,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind tabGeneral->SetSizer( fgSizer6 ); tabGeneral->Layout(); fgSizer6->Fit( tabGeneral ); - nbkAddress->AddPage( tabGeneral, wxT("General"), true ); + nbkAddress->AddPage( tabGeneral, wxT("General"), false ); tabLabel = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer253; bSizer253 = new wxBoxSizer( wxVERTICAL ); @@ -3884,10 +3884,10 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind tabLabel->SetSizer( bSizer253 ); tabLabel->Layout(); bSizer253->Fit( tabLabel ); - nbkAddress->AddPage( tabLabel, wxT("Label"), false ); + nbkAddress->AddPage( tabLabel, wxT("Label"), true ); tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer61; - fgSizer61 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer61->AddGrowableCol( 1 ); fgSizer61->SetFlexibleDirection( wxVERTICAL ); fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -6327,7 +6327,7 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 ); wxGridSizer* gSizer5; - gSizer5 = new wxGridSizer( 2, 2, 0, 0 ); + gSizer5 = new wxGridSizer( 0, 2, 0, 0 ); chkVoice = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Voice"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer5->Add( chkVoice, 0, wxALL, 2 ); diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h index 3126cde..04e23b7 100644 --- a/source/AppXestiaAddrBk.h +++ b/source/AppXestiaAddrBk.h @@ -1646,7 +1646,7 @@ class frmContactEditorTelephoneADT : public wxDialog public: - 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 ); + 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 ); ~frmContactEditorTelephoneADT(); }; -- 2.39.2