AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mac compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-08-08 23:12:39 +00:00
parent 8f1158912f
commit af82bc101e
1 changed files with 97 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
samples/mediaplayer/mediaplayer.cpp
View File

@ -136,12 +136,9 @@ class wxMediaPlayerApp : public wxApp
{
public:
#ifdef __WXMAC__
virtual void MacOpenFile(const wxString & fileName )
{
//Called when a user drags a file over our app
m_frame->DoOpenFile(fileName);
}
virtual void MacOpenFile(const wxString & fileName );
#endif
virtual bool OnInit();
protected:
@ -455,6 +452,15 @@ bool wxMediaPlayerApp::OnInit()
return true;
}
#ifdef __WXMAC__
void wxMediaPlayerApp::MacOpenFile(const wxString & fileName )
{
//Called when a user drags a file over our app
m_frame->DoOpenFile(fileName, true /* new page */);
}
#endif // __WXMAC__
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
@ -984,7 +990,7 @@ void wxMediaPlayerFrame::DoPlayFile(const wxString& path)
wxListItem listitem;
m_playlist->GetSelectedItem(listitem);
if(listitem.GetData() != NULL &&
if(listitem.GetData() &&
m_szFile.compare(path) == 0 &&
m_nLastFileId == listitem.GetId())
{
@ -1183,7 +1189,7 @@ void wxMediaPlayerFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
wxListItem listitem;
m_playlist->GetSelectedItem(listitem);
if (listitem.GetData() == NULL)
if ( !listitem.GetData() )
{
int nLast = -1;
if ((nLast = m_playlist->GetNextItem(nLast,
@ -1474,10 +1480,13 @@ void wxMediaPlayerTimer::Notify()
// ----------------------------------------------------------------------------
wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentFrame,
wxNotebook* theBook,
const wxString& szBackend) :
wxPanel(theBook, wxID_ANY), m_bIsBeingDragged(false),
m_nLoops(0), m_bLoop(false), m_parentFrame(parentFrame)
wxNotebook* theBook,
const wxString& szBackend)
: wxPanel(theBook, wxID_ANY),
m_nLoops(0),
m_bLoop(false),
m_bIsBeingDragged(false),
m_parentFrame(parentFrame)
{
//