From 7981fe9b2bfd255a9d2d18f2e39e5891aac1c5e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 25 May 2004 19:35:38 +0000 Subject: [PATCH] -1->wxID_ANY, ambiguity of types. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/sound/sound.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index 6c50b7c3f9..85ea3ba494 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -180,7 +180,7 @@ MyFrame::MyFrame(const wxString& title) // ... and attach this menu bar to the frame SetMenuBar(menuBar); - m_tc = new wxTextCtrl(this, -1, wxEmptyString, + m_tc = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY); NotifyUsingFile(m_soundFile); @@ -225,7 +225,7 @@ void MyFrame::OnPlaySync(wxCommandEvent& WXUNUSED(event)) if (!m_sound) m_sound = new wxSound(m_soundFile); if (m_sound->IsOk()) - m_sound->Play(wxSOUND_SYNC); + m_sound->Play((unsigned)wxSOUND_SYNC); } void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event)) @@ -234,7 +234,7 @@ void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event)) if (!m_sound) m_sound = new wxSound(m_soundFile); if (m_sound->IsOk()) - m_sound->Play(wxSOUND_ASYNC); + m_sound->Play((unsigned)wxSOUND_ASYNC); } void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event)) @@ -242,7 +242,7 @@ void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event)) wxBusyCursor busy; wxSound snd(m_soundFile); if (snd.IsOk()) - snd.Play(wxSOUND_ASYNC); + snd.Play((unsigned)wxSOUND_ASYNC); } void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event)) @@ -251,7 +251,7 @@ void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event)) if (!m_sound) m_sound = new wxSound(m_soundFile); if (m_sound->IsOk()) - m_sound->Play(wxSOUND_ASYNC | wxSOUND_LOOP); + m_sound->Play((unsigned)(wxSOUND_ASYNC | wxSOUND_LOOP)); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) -- 2.47.2