mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-07-24 21:21:07 -05:00
2ed61b0ee1
We (the Microsoft C++ team) use the dolphin project as part of our "Real world code" tests. I noticed a few issues in windows specific code when building dolphin with the MSVC compiler in its conformance mode (/permissive-). For more information on /permissive- see our blog https://blogs.msdn.microsoft.com/vcblog/2016/11/16/permissive-switch/. These changes are to address 3 different types of issues: 1) Use of qualified names in member declarations struct A { void A::f() { } // error C4596: illegal qualified name in member declaration // remove redundant 'A::' to fix }; 2) Binding a non-const reference to a temporary struct S{}; // If arg is in 'in' parameter, then it should be made const. void func(S& arg){} int main() { //error C2664: 'void func(S &)': cannot convert argument 1 from 'S' to 'S &' //note: A non-const reference may only be bound to an lvalue func( S() ); //Work around this by creating a local, and using it to call the function S s; func( s ); } 3) Add missing #include <intrin.h> Because of the workaround you are using in the code you will need to include this. This is because of changes in the libraries and not /permissive-
50 lines
1.3 KiB
C++
50 lines
1.3 KiB
C++
// Copyright 2015 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <wx/panel.h>
|
|
|
|
class wxButton;
|
|
class wxCheckBox;
|
|
class wxListBox;
|
|
class wxDirPickerCtrl;
|
|
class wxFilePickerCtrl;
|
|
|
|
class PathConfigPane final : public wxPanel
|
|
{
|
|
public:
|
|
PathConfigPane(wxWindow* parent, wxWindowID id);
|
|
|
|
private:
|
|
void InitializeGUI();
|
|
void LoadGUIValues();
|
|
void BindEvents();
|
|
|
|
void OnISOPathSelectionChanged(const wxCommandEvent&);
|
|
void OnRecursiveISOCheckBoxChanged(wxCommandEvent&);
|
|
void OnAddISOPath(wxCommandEvent&);
|
|
void OnRemoveISOPath(wxCommandEvent&);
|
|
void OnDefaultISOChanged(wxCommandEvent&);
|
|
void OnDVDRootChanged(wxCommandEvent&);
|
|
void OnApploaderPathChanged(wxCommandEvent&);
|
|
void OnNANDRootChanged(wxCommandEvent&);
|
|
void OnDumpPathChanged(wxCommandEvent&);
|
|
void OnSdCardPathChanged(wxCommandEvent&);
|
|
|
|
void SaveISOPathChanges();
|
|
|
|
wxListBox* m_iso_paths_listbox;
|
|
wxCheckBox* m_recursive_iso_paths_checkbox;
|
|
wxButton* m_add_iso_path_button;
|
|
wxButton* m_remove_iso_path_button;
|
|
|
|
wxDirPickerCtrl* m_dvd_root_dirpicker;
|
|
wxDirPickerCtrl* m_nand_root_dirpicker;
|
|
wxFilePickerCtrl* m_default_iso_filepicker;
|
|
wxFilePickerCtrl* m_apploader_path_filepicker;
|
|
wxDirPickerCtrl* m_dump_path_dirpicker;
|
|
wxFilePickerCtrl* m_wii_sdcard_filepicker;
|
|
};
|