diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-23 22:43:14 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-23 22:43:14 +0200 |
| commit | 0ea32b02b971d2811423616bcd5038dbbb2789fb (patch) | |
| tree | 6c04f3f17aca24378ad54b6163b182a121f04645 | |
| parent | f1f626cc5602c5225a16c8f807508addf0393817 (diff) | |
| download | VeraCrypt-0ea32b02b971d2811423616bcd5038dbbb2789fb.tar.gz VeraCrypt-0ea32b02b971d2811423616bcd5038dbbb2789fb.zip | |
MacOSX: Fix compiler warning
Update friend declaration in FuseService.h and refactor GetCharWidth to ComputeCharWidth in WaitDialog.h to avoif hiding GetCharWidth inherited from wxWindow
| -rw-r--r-- | src/Driver/Fuse/FuseService.h | 2 | ||||
| -rw-r--r-- | src/Main/Forms/WaitDialog.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Driver/Fuse/FuseService.h b/src/Driver/Fuse/FuseService.h index 872cb368..d09a40db 100644 --- a/src/Driver/Fuse/FuseService.h +++ b/src/Driver/Fuse/FuseService.h @@ -38,7 +38,7 @@ namespace VeraCrypt VolumeSlotNumber SlotNumber; }; - friend class ExecFunctor; + friend struct ExecFunctor; public: static bool AuxDeviceInfoReceived () { return !OpenVolumeInfo.VirtualDevice.IsEmpty(); } diff --git a/src/Main/Forms/WaitDialog.h b/src/Main/Forms/WaitDialog.h index 89de8718..53f5048b 100644 --- a/src/Main/Forms/WaitDialog.h +++ b/src/Main/Forms/WaitDialog.h @@ -80,7 +80,7 @@ namespace VeraCrypt m_bThreadRunning = true; } - int GetCharWidth (wxWindow *window) const + static int ComputeCharWidth (wxWindow *window) { int width; int height; @@ -179,7 +179,7 @@ namespace VeraCrypt { wxPasswordEntryDialog dialog (this, wxString::Format (LangString["ENTER_TOKEN_PASSWORD"], e.GetString()), LangString["IDD_TOKEN_PASSWORD"]); - dialog.SetSize (wxSize (GetCharWidth (&dialog) * 50, -1)); + dialog.SetSize (wxSize (ComputeCharWidth (&dialog) * 50, -1)); if (dialog.ShowModal() != wxID_OK) m_queue.Post(wxT("")); |