From e59581918f7deb1950b8ab89b604418eb2bb253d Mon Sep 17 00:00:00 2001 From: Es Date: Fri, 19 May 2023 00:44:13 +0200 Subject: wxWidget assert failure bug (#999) * Removal of any of the any of `wxALIGN_RIGHT`/`wxALIGN_CENTRE_HORIZONTAL`/`wxALIGN_BOTTOM`/`wxALIGN_CENTRE_VERTICAL` when used in conjunction with `wxEXPAND` wxWidget has an "assert" that gets triggered anytime `wxEXPAND` gets used with an alignment property (useless override). This leads to a popup backtrace everytime a non-compliant widget is opened. * Removal of missed `wxALIGN_RIGHT`/`wxALIGN_CENTRE_HORIZONTAL`/`wxALIGN_BOTTOM`/`wxALIGN_CENTRE_VERTICAL` when used in conjunction with `wxEXPAND` * Removed property 'label' for wxMenuBar as no longer used (wxFormBuilder) * Removed redundant 'wxALIGN_RIGHT' for the "OK" button in the preference panel (there is a spacer already in-place that pushes the buttons to the right) * Removed redundant 'wxALIGN_RIGHT' for items in the wizard panel's (`WizardFrameBase`) button bar and added width spacing for the 2 spacers between the buttons to make up for the change. * Changed constructor signature for the `WizardPage` and all subclasses The addition of the wxString 'name' arg brings it inline with the new wxFromBuilder v3.10.1 output so that editing+generating the forms from it won't brake the build now. * Removed remaining redundant 'wxALIGN_*' that were paired with 'wxEXPAND'. * Added missing default flags to wxFileName::Normalize(..) method The old empty initialization which was fine up to v2.8.12 of wxWidget gives off a compile warning. Since the default `wxPATH_NORM_ALL` is now depreciated (v3.x) the equivalent individual flags must be explicitly given. * Changed spaces to tabs to bring last commit inline with the rest of the src code --- src/Main/Forms/TrueCrypt.fbp | 83 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 42 deletions(-) (limited to 'src/Main/Forms/TrueCrypt.fbp') diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp index 24689fcf..523600a5 100644 --- a/src/Main/Forms/TrueCrypt.fbp +++ b/src/Main/Forms/TrueCrypt.fbp @@ -98,7 +98,6 @@ 0 wxID_ANY - MainMenuBar MainMenuBar @@ -1176,7 +1175,7 @@ none 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -1276,7 +1275,7 @@ none 5 - wxALL|wxALIGN_RIGHT|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -2026,7 +2025,7 @@ 2 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL + wxEXPAND|wxALL 1 1 @@ -2130,7 +2129,7 @@ 2 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL + wxEXPAND|wxALL 1 1 @@ -2234,7 +2233,7 @@ 2 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL + wxEXPAND|wxALL 1 1 @@ -2338,7 +2337,7 @@ 2 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL + wxEXPAND|wxALL 1 1 @@ -2812,7 +2811,7 @@ 5 - wxEXPAND|wxALIGN_RIGHT|wxALL + wxEXPAND|wxALL 0 @@ -2831,7 +2830,7 @@ 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -2920,17 +2919,17 @@ 5 - wxLEFT|wxALIGN_RIGHT + wxLEFT 0 0 protected - 0 + 2 5 - wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3019,7 +3018,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3108,17 +3107,17 @@ 5 - wxLEFT|wxALIGN_RIGHT + wxLEFT 0 0 protected - 0 + 2 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -5868,7 +5867,7 @@ 5 - wxALIGN_RIGHT|wxALL|wxEXPAND + wxALL|wxEXPAND 0 @@ -8293,7 +8292,7 @@ 5 - wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + wxEXPAND|wxTOP|wxBOTTOM|wxLEFT 0 1 @@ -12925,7 +12924,7 @@ 5 1 1 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -13198,7 +13197,7 @@ 5 2 1 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 2 1 @@ -13497,7 +13496,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -13669,7 +13668,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxEXPAND|wxALL 0 1 @@ -15924,7 +15923,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 @@ -18590,7 +18589,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 @@ -19458,7 +19457,7 @@ 5 - wxALIGN_RIGHT|wxALL + wxALL 0 1 @@ -21706,7 +21705,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -24145,7 +24144,7 @@ 5 - wxEXPAND|wxALIGN_BOTTOM + wxEXPAND 1 @@ -24154,7 +24153,7 @@ none 7 - wxEXPAND|wxTOP|wxRIGHT|wxALIGN_BOTTOM + wxEXPAND|wxTOP|wxRIGHT 0 1 @@ -24412,7 +24411,7 @@ 2 - wxALIGN_BOTTOM|wxEXPAND|wxTOP|wxRIGHT + wxEXPAND|wxTOP|wxRIGHT 0 1 @@ -24580,7 +24579,7 @@ 2 - wxEXPAND|wxALIGN_BOTTOM|wxTOP|wxRIGHT + wxEXPAND|wxTOP|wxRIGHT 0 1 @@ -24982,7 +24981,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 1 @@ -25075,7 +25074,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + wxEXPAND|wxALL 1 1 @@ -25158,7 +25157,7 @@ none 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxEXPAND|wxALL 1 1 @@ -25247,7 +25246,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 @@ -25340,7 +25339,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 1 1 @@ -25423,7 +25422,7 @@ none 3 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -25512,7 +25511,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + wxEXPAND 1 @@ -25688,7 +25687,7 @@ none 3 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -27100,7 +27099,7 @@ 5 2 1 - wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxBOTTOM|wxEXPAND 1 1 @@ -27281,7 +27280,7 @@ 5 2 1 - wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxBOTTOM|wxEXPAND 2 1 @@ -27462,7 +27461,7 @@ 5 1 1 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND + wxBOTTOM|wxEXPAND 3 1 @@ -29898,7 +29897,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 -- cgit v1.2.3