diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-09-14 00:47:34 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-09-14 00:48:37 +0200 |
| commit | 85c1bc34e39a5e7682778c53ce68d6768346999c (patch) | |
| tree | b75def0732f774cbacbbaf5e92aab862bd59cd41 /src/Main | |
| parent | 24f3b5230cc1ea7e6fb084294f04df10ede17e2f (diff) | |
| download | VeraCrypt-85c1bc34e39a5e7682778c53ce68d6768346999c.tar.gz VeraCrypt-85c1bc34e39a5e7682778c53ce68d6768346999c.zip | |
Linux/MacOSX: workaround bug in old versions of g++ that are confused by methods having the same name and one of them used as wxWidgets event handler callback.
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Forms/VolumePimWizardPage.cpp | 10 | ||||
| -rw-r--r-- | src/Main/Forms/VolumePimWizardPage.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Main/Forms/VolumePimWizardPage.cpp b/src/Main/Forms/VolumePimWizardPage.cpp index 8f98cb54..e3353051 100644 --- a/src/Main/Forms/VolumePimWizardPage.cpp +++ b/src/Main/Forms/VolumePimWizardPage.cpp @@ -58,7 +58,7 @@ namespace VeraCrypt VolumePimTextCtrl->SetValue (wxT("")); } - OnPimChanged (pim); + OnPimValueChanged (pim); } bool VolumePimWizardPage::IsValid () @@ -68,10 +68,10 @@ namespace VeraCrypt void VolumePimWizardPage::OnPimChanged (wxCommandEvent& event) { - OnPimChanged (GetVolumePim ()); + OnPimValueChanged (GetVolumePim ()); } - void VolumePimWizardPage::OnPimChanged (int pim) + void VolumePimWizardPage::OnPimValueChanged (int pim) { if (pim > 0) { @@ -119,6 +119,6 @@ namespace VeraCrypt delete VolumePimTextCtrl; VolumePimTextCtrl = newTextCtrl; SetPimValidator (); - OnPimChanged (GetVolumePim ()); + OnPimValueChanged (GetVolumePim ()); } -}
\ No newline at end of file +} diff --git a/src/Main/Forms/VolumePimWizardPage.h b/src/Main/Forms/VolumePimWizardPage.h index af757359..d7586c92 100644 --- a/src/Main/Forms/VolumePimWizardPage.h +++ b/src/Main/Forms/VolumePimWizardPage.h @@ -37,7 +37,7 @@ namespace VeraCrypt protected: void SetPimValidator (); void OnPimChanged (wxCommandEvent& event); - void OnPimChanged (int pim); + void OnPimValueChanged (int pim); }; } |