From 82cb61b8af385623a62d65c7745f32f38ed39cb1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 9 Oct 2018 11:29:48 +0200 Subject: [PATCH] dialog_page_settings: avoid useless confirmation dialog after changing the page layout file. --- common/dialogs/dialog_page_settings.cpp | 2 +- common/dialogs/dialog_page_settings_base.fbp | 4840 +++++++++--------- 2 files changed, 2421 insertions(+), 2421 deletions(-) diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index d5a11e6a0f..54b411e019 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -237,7 +237,7 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event ) m_parent->GetCanvas()->Refresh(); if( LocalPrjConfigChanged() ) - m_parent->SaveProjectSettings( true ); + m_parent->SaveProjectSettings( false ); } event.Skip(); diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp index 4fe84d8330..a936b243e8 100644 --- a/common/dialogs/dialog_page_settings_base.fbp +++ b/common/dialogs/dialog_page_settings_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 dialog_page_settings_base - + . - + 1 1 1 @@ -29,65 +29,65 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_PAGES_SETTINGS_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Page Settings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1,-1 bMainSizer @@ -98,7 +98,7 @@ wxEXPAND|wxRIGHT|wxLEFT 1 - + bUpperSizerH wxHORIZONTAL none @@ -107,7 +107,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bleftSizer wxVERTICAL none @@ -120,78 +120,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Paper - + 0 - - + + 0 - + 1 m_staticTextPaper 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -203,76 +203,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline2 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -284,78 +284,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Size: - + 0 - - + + 0 - + 1 m_staticTextSize 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -367,83 +367,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "dummy text" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_paperSizeComboBox 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + OnPaperSizeChoice - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -455,78 +455,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Orientation: - + 0 - - + + 0 - + 1 m_staticTextOrient 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -538,83 +538,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Landscape" "Portrait" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_orientationComboBox 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + OnPageOrientationChoice - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -626,78 +626,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Custom paper size: - + 0 - - + + 0 - + 1 m_staticTextCustSize 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -707,10 +707,10 @@ 3 wxBOTH - - + + 0 - + fgSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -725,78 +725,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Height: - + 0 - - + + 0 - + 1 m_userSizeYLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -808,86 +808,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + -1 - + 0 - + 1 m_userSizeYCtrl 1 - - + + protected 1 - + Resizable 1 - + wxTE_LEFT - + 0 Custom paper height. - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUserPageSizeYTextUpdated - - - - + + + + @@ -899,78 +899,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_userSizeYUnits 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -982,78 +982,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Width: - + 0 - - + + 0 - + 1 m_userSizeXLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1065,86 +1065,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + -1 - + 0 - + 1 m_userSizeXCtrl 1 - - + + protected 1 - + Resizable 1 - + wxTE_LEFT - + 0 Custom paper width. - + wxFILTER_NONE wxTextValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUserPageSizeXTextUpdated - - - - + + + + @@ -1156,78 +1156,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_userSizeXUnits 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1241,78 +1241,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Layout Preview - + 0 - - + + 0 - + 1 m_staticTextPreview 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1324,18 +1324,18 @@ 1 1 1 - - - - - + + + + + wxSYS_COLOUR_WINDOW Load From Icon Resource; - + 1 0 1 - + 1 0 Dock @@ -1344,56 +1344,56 @@ 1 wxSYS_COLOUR_WINDOW 1 - + 0 0 wxID_ANY - + 0 - - + + 0 -1,-1 1 m_PageLayoutExampleBitmap 1 - - + + protected 1 - + Resizable 1 -1,-1 - + 0 - - - - wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFULL_REPAINT_ON_RESIZE|wxBORDER_SIMPLE + + + + + + + + + + + + + + + + + + + + + + + @@ -1403,7 +1403,7 @@ wxEXPAND|wxRIGHT|wxLEFT 1 - + bSizerRight wxVERTICAL none @@ -1416,78 +1416,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Title Block Parameters - + 0 - - + + 0 - + 1 m_staticTexttbprm 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1499,76 +1499,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline3 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1576,7 +1576,7 @@ wxLEFT 0 - + SheetInfoSizer wxHORIZONTAL none @@ -1589,78 +1589,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Number of sheets: %d - + 0 - - + + 0 - + 1 m_TextSheetCount 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1682,78 +1682,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Sheet number: %d - + 0 - - + + 0 - + 1 m_TextSheetNumber 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1763,7 +1763,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerDate wxVERTICAL none @@ -1776,78 +1776,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Issue Date - + 0 - - + + 0 - + 1 m_staticTextDate 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1855,7 +1855,7 @@ wxEXPAND 1 - + bSizerissuedate wxHORIZONTAL none @@ -1868,86 +1868,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 100,-1 1 m_TextDate 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnDateTextUpdated - - - - + + + + @@ -1959,17 +1959,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -1977,65 +1977,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY <<< - + 0 - - + + 0 - + 1 m_ApplyDate 1 - - + + protected 1 - + Resizable 1 - + wxBU_EXACTFIT - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnDateApplyClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2047,81 +2047,81 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_PickDate 1 - - + + protected 1 - + Resizable 1 - + wxDP_DEFAULT - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2133,83 +2133,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_DateExport 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2221,7 +2221,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerRev wxVERTICAL none @@ -2234,78 +2234,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Revision - + 0 - - + + 0 - + 1 m_staticTextRev 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2313,7 +2313,7 @@ wxEXPAND 1 - + bSizer9 wxHORIZONTAL none @@ -2326,86 +2326,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 100,-1 1 m_TextRevision 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnRevisionTextUpdated - - - - + + + + @@ -2417,83 +2417,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_RevisionExport 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2505,7 +2505,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerTitle wxVERTICAL none @@ -2518,78 +2518,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Title - + 0 - - + + 0 - + 1 m_staticTextTitle 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2597,7 +2597,7 @@ wxEXPAND 1 - + bSizer12 wxHORIZONTAL none @@ -2610,86 +2610,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 360,-1 1 m_TextTitle 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTitleTextUpdated - - - - + + + + @@ -2701,83 +2701,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_TitleExport 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + OnCheckboxTitleClick - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -2789,7 +2789,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerCompany wxVERTICAL none @@ -2802,78 +2802,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Company - + 0 - - + + 0 - + 1 m_staticText13 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2881,7 +2881,7 @@ wxEXPAND 1 - + bSizer14 wxHORIZONTAL none @@ -2894,86 +2894,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 360,-1 1 m_TextCompany 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnCompanyTextUpdated - - - - + + + + @@ -2985,83 +2985,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_CompanyExport 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3073,7 +3073,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerComment1 wxVERTICAL none @@ -3086,78 +3086,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Comment1 - + 0 - - + + 0 - + 1 m_staticTextComment1 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3165,7 +3165,7 @@ wxEXPAND 1 - + bSizercmt1 wxHORIZONTAL none @@ -3178,86 +3178,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 360,-1 1 m_TextComment1 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment1TextUpdated - - - - + + + + @@ -3269,83 +3269,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_Comment1Export 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3357,7 +3357,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerComment2 wxVERTICAL none @@ -3370,78 +3370,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Comment2 - + 0 - - + + 0 - + 1 m_staticTextComment2 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3449,7 +3449,7 @@ wxEXPAND 1 - + bSizercmt2 wxHORIZONTAL none @@ -3462,86 +3462,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 360,-1 1 m_TextComment2 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment2TextUpdated - - - - + + + + @@ -3553,83 +3553,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_Comment2Export 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3641,7 +3641,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerComment12 wxVERTICAL none @@ -3654,78 +3654,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Comment3 - + 0 - - + + 0 - + 1 m_staticTextComment3 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3733,7 +3733,7 @@ wxEXPAND 1 - + bSizercmt3 wxHORIZONTAL none @@ -3746,86 +3746,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 360,-1 1 m_TextComment3 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment3TextUpdated - - - - + + + + @@ -3837,83 +3837,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_Comment3Export 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3925,7 +3925,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerComment4 wxVERTICAL none @@ -3938,78 +3938,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Comment4 - + 0 - - + + 0 - + 1 m_staticTextComment4 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4017,7 +4017,7 @@ wxEXPAND 1 - + bSizercmt4 wxHORIZONTAL none @@ -4030,86 +4030,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 360,-1 1 m_TextComment4 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment4TextUpdated - - - - + + + + @@ -4121,83 +4121,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Export to other sheets - + 0 - - + + 0 - + 1 m_Comment4Export 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4209,7 +4209,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerFilename wxVERTICAL none @@ -4222,78 +4222,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Page layout description file - + 0 - - + + 0 - + 1 m_staticTextfilename 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4301,7 +4301,7 @@ wxEXPAND 1 - + bSizerfileSelection wxHORIZONTAL none @@ -4314,86 +4314,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_textCtrlFilePicker 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4405,17 +4405,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -4423,65 +4423,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Browse... - + 0 - - + + 0 - + 1 m_buttonBrowse 1 - - + + protected 1 - + Resizable 1 - + wxBU_EXACTFIT - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnWksFileSelection - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4505,17 +4505,17 @@ 1 0 0 - + m_sdbSizer protected - - - - - + + + + + OnOkClick - - + +