VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-09-13 22:47:34 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-09-13 22:48:37 (GMT)
commit85c1bc34e39a5e7682778c53ce68d6768346999c (patch)
treeb75def0732f774cbacbbaf5e92aab862bd59cd41 /src/Main/Forms
parent24f3b5230cc1ea7e6fb084294f04df10ede17e2f (diff)
downloadVeraCrypt-85c1bc34e39a5e7682778c53ce68d6768346999c.zip
VeraCrypt-85c1bc34e39a5e7682778c53ce68d6768346999c.tar.gz
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/Forms')
-rw-r--r--src/Main/Forms/VolumePimWizardPage.cpp10
-rw-r--r--src/Main/Forms/VolumePimWizardPage.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Main/Forms/VolumePimWizardPage.cpp b/src/Main/Forms/VolumePimWizardPage.cpp
index 8f98cb5..e335305 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 af75735..d7586c9 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);
};
}