Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-09 17:07:43 +02:00
Code Issues Releases Wiki Activity

Fix Windows Build

Browse Source
This commit is contained in:
Paul Licameli 2018-01-02 12:01:00 -05:00
parent 28fd3442b1
commit 6a810bd82f
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/ErrorDialog.h
View File

@ -113,7 +113,7 @@ public:
long style = wxTextEntryDialogStyle, long style = wxTextEntryDialogStyle,
const wxPoint& pos = wxDefaultPosition) const wxPoint& pos = wxDefaultPosition)
: wxTabTraversalWrapper< wxTextEntryDialog> : wxTabTraversalWrapper< wxTextEntryDialog>
{ parent, message, caption, value, style, pos } ( parent, message, caption, value, style, pos )
{} {}
}; };
@ -129,7 +129,7 @@ public:
long style = wxOK|wxCENTRE, long style = wxOK|wxCENTRE,
const wxPoint& pos = wxDefaultPosition) const wxPoint& pos = wxDefaultPosition)
: wxTabTraversalWrapper< wxMessageDialog> : wxTabTraversalWrapper< wxMessageDialog>
{ parent, message, caption, style, pos } ( parent, message, caption, style, pos )
{} {}
}; };

23
src/widgets/wxPanelWrapper.h
View File

@ -20,17 +20,12 @@ class wxTabTraversalWrapper : public Base
{ {
public: public:
template <typename... Args> template <typename... Args>
explicit wxTabTraversalWrapper(Args&&... args) wxTabTraversalWrapper(Args&&... args)
: Base( std::forward<Args>(args)... ) : Base( std::forward<Args>(args)... )
{ {
this->Bind(wxEVT_CHAR_HOOK, wxTabTraversalWrapperCharHook); this->Bind(wxEVT_CHAR_HOOK, wxTabTraversalWrapperCharHook);
} }
wxTabTraversalWrapper(const wxTabTraversalWrapper&) = delete;
wxTabTraversalWrapper(wxTabTraversalWrapper&&) = delete;
wxTabTraversalWrapper& operator=(const wxTabTraversalWrapper&) = delete;
wxTabTraversalWrapper& operator=(wxTabTraversalWrapper&&) = delete;
~wxTabTraversalWrapper() ~wxTabTraversalWrapper()
{ {
this->Unbind(wxEVT_CHAR_HOOK, wxTabTraversalWrapperCharHook); this->Unbind(wxEVT_CHAR_HOOK, wxTabTraversalWrapperCharHook);
@ -41,9 +36,9 @@ class wxPanelWrapper : public wxTabTraversalWrapper<wxPanel>
{ {
public: public:
// Constructors // Constructors
wxPanelWrapper() = default; wxPanelWrapper() {}
explicit wxPanelWrapper( wxPanelWrapper(
wxWindow *parent, wxWindow *parent,
wxWindowID winid = wxID_ANY, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@ -74,10 +69,10 @@ class wxDialogWrapper : public wxTabTraversalWrapper<wxDialog>
{ {
public: public:
// Constructors // Constructors
wxDialogWrapper() = default; wxDialogWrapper() {}
// Constructor with no modal flag - the new convention. // Constructor with no modal flag - the new convention.
explicit wxDialogWrapper( wxDialogWrapper(
wxWindow *parent, wxWindowID id, wxWindow *parent, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@ -110,10 +105,8 @@ public:
class wxDirDialogWrapper : public wxTabTraversalWrapper<wxDirDialog> class wxDirDialogWrapper : public wxTabTraversalWrapper<wxDirDialog>
{ {
public: public:
wxDirDialogWrapper() = default;
// Constructor with no modal flag - the new convention. // Constructor with no modal flag - the new convention.
explicit wxDirDialogWrapper( wxDirDialogWrapper(
wxWindow *parent, wxWindow *parent,
const wxString& message = _("Select a directory"), const wxString& message = _("Select a directory"),
const wxString& defaultPath = wxT(""), const wxString& defaultPath = wxT(""),
@ -148,10 +141,10 @@ public:
class FileDialogWrapper : public wxTabTraversalWrapper<FileDialog> class FileDialogWrapper : public wxTabTraversalWrapper<FileDialog>
{ {
public: public:
FileDialogWrapper() = default; FileDialogWrapper() {}
// Constructor with no modal flag - the new convention. // Constructor with no modal flag - the new convention.
explicit FileDialogWrapper( FileDialogWrapper(
wxWindow *parent, wxWindow *parent,
const wxString& message = _("Select a file"), const wxString& message = _("Select a file"),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,