VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms/WizardPage.h
diff options
context:
space:
mode:
authorEs <An7ar35@users.noreply.github.com>2023-05-19 00:44:13 +0200
committerGitHub <noreply@github.com>2023-05-19 00:44:13 +0200
commite59581918f7deb1950b8ab89b604418eb2bb253d (patch)
treef61306b7c826d49b5eb23d861d87fa70d4524bc5 /src/Main/Forms/WizardPage.h
parentb6513d82f8adc79be220c3e924f675d389068776 (diff)
downloadVeraCrypt-e59581918f7deb1950b8ab89b604418eb2bb253d.tar.gz
VeraCrypt-e59581918f7deb1950b8ab89b604418eb2bb253d.zip
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
Diffstat (limited to 'src/Main/Forms/WizardPage.h')
-rw-r--r--src/Main/Forms/WizardPage.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Main/Forms/WizardPage.h b/src/Main/Forms/WizardPage.h
index 9f175063..1bc5b82e 100644
--- a/src/Main/Forms/WizardPage.h
+++ b/src/Main/Forms/WizardPage.h
@@ -20,8 +20,8 @@ namespace VeraCrypt
class WizardPage : public wxPanel
{
public:
- WizardPage (wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style)
- : wxPanel (parent, id, pos, size, style)
+ WizardPage (wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name)
+ : wxPanel (parent, id, pos, size, style, name)
{ }
virtual ~WizardPage () { }