nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-27 13:33:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

MacOSX: Fix compiler warning

Browse Source 
Update friend declaration in FuseService.h and refactor GetCharWidth to ComputeCharWidth in WaitDialog.h to avoif hiding GetCharWidth inherited from wxWindow
This commit is contained in:
Mounir IDRASSI 2024-06-23 22:43:14 +02:00
parent f1f626cc56
commit 0ea32b02b9
No known key found for this signature in database
GPG Key ID: C2FF2438CD26E3B7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Driver/Fuse/FuseService.h
View File

@ -38,7 +38,7 @@ namespace VeraCrypt
VolumeSlotNumber SlotNumber;
};
friend class ExecFunctor;
friend struct ExecFunctor;
public:
static bool AuxDeviceInfoReceived () { return !OpenVolumeInfo.VirtualDevice.IsEmpty(); }

4
src/Main/Forms/WaitDialog.h
View File

@ -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(""));