mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 11:08:02 -06:00
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
This commit is contained in:
@@ -1317,7 +1317,14 @@ namespace VeraCrypt
|
||||
{
|
||||
/* check if local file exists */
|
||||
wxFileName htmlFile = htmlPath + url;
|
||||
htmlFile.Normalize();
|
||||
htmlFile.Normalize (
|
||||
wxPATH_NORM_ENV_VARS |
|
||||
wxPATH_NORM_DOTS |
|
||||
wxPATH_NORM_CASE |
|
||||
wxPATH_NORM_LONG |
|
||||
wxPATH_NORM_SHORTCUT |
|
||||
wxPATH_NORM_TILDE
|
||||
);
|
||||
localFile = htmlFile.FileExists();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user