Fixes for the stubbed version so it will compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
#include "wx/wxPython/pyclasses.h"
|
#include "wx/wxPython/pyclasses.h"
|
||||||
|
|
||||||
#include <wx/mediactrl.h>
|
#include <wx/mediactrl.h>
|
||||||
|
#include <wx/uri.h>
|
||||||
%}
|
%}
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
@@ -62,7 +63,7 @@ enum wxMediaTimeFormat
|
|||||||
class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
|
class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxMediaEvent(wxEventTypL, int ) { wxPyRaiseNotImplemented(); }
|
wxMediaEvent(wxEventType, int ) { wxPyRaiseNotImplemented(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
class wxMediaCtrl : public wxControl
|
class wxMediaCtrl : public wxControl
|
||||||
@@ -83,7 +84,7 @@ public:
|
|||||||
wxWindowID ,
|
wxWindowID ,
|
||||||
const wxURI& ,
|
const wxURI& ,
|
||||||
const wxPoint&,
|
const wxPoint&,
|
||||||
const wxSize& .
|
const wxSize& ,
|
||||||
long style,
|
long style,
|
||||||
const wxString& ,
|
const wxString& ,
|
||||||
const wxValidator& ,
|
const wxValidator& ,
|
||||||
@@ -102,7 +103,7 @@ public:
|
|||||||
wxWindowID ,
|
wxWindowID ,
|
||||||
const wxURI& ,
|
const wxURI& ,
|
||||||
const wxPoint&,
|
const wxPoint&,
|
||||||
const wxSize& .
|
const wxSize& ,
|
||||||
long style,
|
long style,
|
||||||
const wxString& ,
|
const wxString& ,
|
||||||
const wxValidator& ,
|
const wxValidator& ,
|
||||||
@@ -127,6 +128,10 @@ public:
|
|||||||
wxLongLong GetPosition() { return 0; }
|
wxLongLong GetPosition() { return 0; }
|
||||||
wxLongLong GetDuration() { return 0; }
|
wxLongLong GetDuration() { return 0; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const wxEventType wxEVT_MEDIA_FINISHED = 0;
|
||||||
|
const wxEventType wxEVT_MEDIA_STOP = 0;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
%}
|
%}
|
||||||
|
|
||||||
@@ -147,9 +152,9 @@ enum wxMediaTimeFormat
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
|
// MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
|
||||||
MAKE_CONST_WXSTRING(MEDIABACKEND_MCI );
|
// MAKE_CONST_WXSTRING(MEDIABACKEND_MCI );
|
||||||
MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME );
|
// MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME );
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -163,7 +168,7 @@ public:
|
|||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
|
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
|
||||||
MAKE_CONST_WXSTRING2(MediaCtrlNameStr, "mediaCtrl");
|
MAKE_CONST_WXSTRING2(MediaCtrlNameStr, wxT("mediaCtrl"));
|
||||||
MustHaveApp(wxMediaCtrl);
|
MustHaveApp(wxMediaCtrl);
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user