From ada42724cf083b0a311cf22260485d61516c25c8 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Wed, 6 Sep 2017 22:40:50 +0100 Subject: [PATCH] frmContactEditor(*): Call Layout on szrGeneral after adding priorty control --- source/contacteditor/frmContactEditorCalAdr.cpp | 1 + source/contacteditor/frmContactEditorCategory.cpp | 1 + source/contacteditor/frmContactEditorEmail.cpp | 1 + source/contacteditor/frmContactEditorGeoposition.cpp | 1 + source/contacteditor/frmContactEditorIM.cpp | 1 + source/contacteditor/frmContactEditorKey.cpp | 1 + source/contacteditor/frmContactEditorLanguages.cpp | 1 + source/contacteditor/frmContactEditorNickname.cpp | 1 + source/contacteditor/frmContactEditorNotes.cpp | 1 + source/contacteditor/frmContactEditorOrganisations.cpp | 1 + source/contacteditor/frmContactEditorPicture.cpp | 1 + source/contacteditor/frmContactEditorRelated.cpp | 1 + source/contacteditor/frmContactEditorRoles.cpp | 1 + source/contacteditor/frmContactEditorSound.cpp | 1 + source/contacteditor/frmContactEditorTelephone.cpp | 1 + source/contacteditor/frmContactEditorTimezones.cpp | 1 + source/contacteditor/frmContactEditorTitles.cpp | 2 ++ source/contacteditor/frmContactEditorWebsites.cpp | 1 + 18 files changed, 19 insertions(+) diff --git a/source/contacteditor/frmContactEditorCalAdr.cpp b/source/contacteditor/frmContactEditorCalAdr.cpp index 176bb00..c900b7c 100644 --- a/source/contacteditor/frmContactEditorCalAdr.cpp +++ b/source/contacteditor/frmContactEditorCalAdr.cpp @@ -30,6 +30,7 @@ frmContactEditorCalAdrADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); cmbType->Append(wxT("")); cmbType->Append(_("Home")); diff --git a/source/contacteditor/frmContactEditorCategory.cpp b/source/contacteditor/frmContactEditorCategory.cpp index 6df0ef3..53bcbd0 100644 --- a/source/contacteditor/frmContactEditorCategory.cpp +++ b/source/contacteditor/frmContactEditorCategory.cpp @@ -30,6 +30,7 @@ frmContactEditorCategoryADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); cmbType->Append(wxT("")); cmbType->Append(_("Home")); diff --git a/source/contacteditor/frmContactEditorEmail.cpp b/source/contacteditor/frmContactEditorEmail.cpp index 6ee0219..fa3bb3e 100644 --- a/source/contacteditor/frmContactEditorEmail.cpp +++ b/source/contacteditor/frmContactEditorEmail.cpp @@ -30,6 +30,7 @@ frmContactEditorEmailADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp index e8c89eb..bcc3e87 100644 --- a/source/contacteditor/frmContactEditorGeoposition.cpp +++ b/source/contacteditor/frmContactEditorGeoposition.cpp @@ -30,6 +30,7 @@ frmContactEditorGeopositionADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorIM.cpp b/source/contacteditor/frmContactEditorIM.cpp index 87b8cb8..cfee2d3 100644 --- a/source/contacteditor/frmContactEditorIM.cpp +++ b/source/contacteditor/frmContactEditorIM.cpp @@ -32,6 +32,7 @@ frmContactEditorIMADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); // Add some values to the drop down box for IM types. diff --git a/source/contacteditor/frmContactEditorKey.cpp b/source/contacteditor/frmContactEditorKey.cpp index 78ee77a..01de318 100644 --- a/source/contacteditor/frmContactEditorKey.cpp +++ b/source/contacteditor/frmContactEditorKey.cpp @@ -31,6 +31,7 @@ frmContactEditorKeyADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); // Setup the control boxes and hide tabs unless they are // needed. diff --git a/source/contacteditor/frmContactEditorLanguages.cpp b/source/contacteditor/frmContactEditorLanguages.cpp index c40c654..64305ae 100644 --- a/source/contacteditor/frmContactEditorLanguages.cpp +++ b/source/contacteditor/frmContactEditorLanguages.cpp @@ -30,6 +30,7 @@ frmContactEditorLanguagesADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp index 68e64ef..6af836b 100644 --- a/source/contacteditor/frmContactEditorNickname.cpp +++ b/source/contacteditor/frmContactEditorNickname.cpp @@ -37,6 +37,7 @@ frmContactEditorNicknameADT( parent ) priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp index 1bc24fc..ee8693c 100644 --- a/source/contacteditor/frmContactEditorNotes.cpp +++ b/source/contacteditor/frmContactEditorNotes.cpp @@ -28,6 +28,7 @@ frmContactEditorNotesADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabPriority); szrPriority->Add(priorityCtrl, 1, wxEXPAND, 5); + szrPriority->Layout(); // Setup the language combo box. diff --git a/source/contacteditor/frmContactEditorOrganisations.cpp b/source/contacteditor/frmContactEditorOrganisations.cpp index e8aeb69..2f67cb4 100644 --- a/source/contacteditor/frmContactEditorOrganisations.cpp +++ b/source/contacteditor/frmContactEditorOrganisations.cpp @@ -30,6 +30,7 @@ frmContactEditorOrganisationsADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp index e28b271..1600bb0 100644 --- a/source/contacteditor/frmContactEditorPicture.cpp +++ b/source/contacteditor/frmContactEditorPicture.cpp @@ -39,6 +39,7 @@ frmContactEditorPictureADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); cmbType->Append(wxT("")); cmbType->Append(_("Home")); diff --git a/source/contacteditor/frmContactEditorRelated.cpp b/source/contacteditor/frmContactEditorRelated.cpp index 03a2e0b..17117ca 100644 --- a/source/contacteditor/frmContactEditorRelated.cpp +++ b/source/contacteditor/frmContactEditorRelated.cpp @@ -31,6 +31,7 @@ frmContactEditorRelatedADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); // Setup the list of types for the related drop down box. diff --git a/source/contacteditor/frmContactEditorRoles.cpp b/source/contacteditor/frmContactEditorRoles.cpp index b36bda1..064eb79 100644 --- a/source/contacteditor/frmContactEditorRoles.cpp +++ b/source/contacteditor/frmContactEditorRoles.cpp @@ -33,6 +33,7 @@ frmContactEditorRolesADT( parent ) priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp index 276abe7..28f3aeb 100644 --- a/source/contacteditor/frmContactEditorSound.cpp +++ b/source/contacteditor/frmContactEditorSound.cpp @@ -28,6 +28,7 @@ frmContactEditorSoundADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); cmbType->Append(wxT("")); cmbType->Append(_("Home")); diff --git a/source/contacteditor/frmContactEditorTelephone.cpp b/source/contacteditor/frmContactEditorTelephone.cpp index 0b609b2..68d6562 100644 --- a/source/contacteditor/frmContactEditorTelephone.cpp +++ b/source/contacteditor/frmContactEditorTelephone.cpp @@ -30,6 +30,7 @@ frmContactEditorTelephoneADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorTimezones.cpp b/source/contacteditor/frmContactEditorTimezones.cpp index 7de1e7e..01cc6ad 100644 --- a/source/contacteditor/frmContactEditorTimezones.cpp +++ b/source/contacteditor/frmContactEditorTimezones.cpp @@ -31,6 +31,7 @@ frmContactEditorTimezonesADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } diff --git a/source/contacteditor/frmContactEditorTitles.cpp b/source/contacteditor/frmContactEditorTitles.cpp index edc602f..f1e4e24 100644 --- a/source/contacteditor/frmContactEditorTitles.cpp +++ b/source/contacteditor/frmContactEditorTitles.cpp @@ -32,6 +32,8 @@ frmContactEditorTitlesADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); + } void frmContactEditorTitles::ProcessAction( wxCommandEvent& event ) diff --git a/source/contacteditor/frmContactEditorWebsites.cpp b/source/contacteditor/frmContactEditorWebsites.cpp index 5ce8097..5f85776 100644 --- a/source/contacteditor/frmContactEditorWebsites.cpp +++ b/source/contacteditor/frmContactEditorWebsites.cpp @@ -32,6 +32,7 @@ frmContactEditorWebsitesADT( parent ) EditorMode = FALSE; priorityCtrl = new XABPriorityCtrl(tabGeneral); szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); } -- 2.39.5