[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/avm2 r9725: Fix mistakes in resolving conf
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/avm2 r9725: Fix mistakes in resolving conflicts. |
|
Date: |
Thu, 14 May 2009 18:39:29 +0200 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 9725
committer: Benjamin Wolsey <address@hidden>
branch nick: avm2
timestamp: Thu 2009-05-14 18:39:29 +0200
message:
Fix mistakes in resolving conflicts.
modified:
libcore/asobj/ClassHierarchy.cpp
libcore/namedStrings.h
=== modified file 'libcore/asobj/ClassHierarchy.cpp'
--- a/libcore/asobj/ClassHierarchy.cpp 2009-05-14 16:26:38 +0000
+++ b/libcore/asobj/ClassHierarchy.cpp 2009-05-14 16:39:29 +0000
@@ -301,7 +301,7 @@
NS_UNKNOWN, 5 },
{ Sound_as::init, NSV::CLASS_SOUND, NSV::CLASS_OBJECT,
NSV::NS_FLASH_MEDIA, 5 },
- { xmlsocket_class_init, NSV::CLASS_X_M_L_SOCKET, NSV::CLASS_OBJECT,
+ { xmlsocket_class_init, NSV::CLASS_XMLSOCKET, NSV::CLASS_OBJECT,
NSV::NS_FLASH_NET, 5 },
{ Date_as::init, NSV::CLASS_DATE, NSV::CLASS_OBJECT, NS_GLOBAL, 5 },
{ XML_as::init, NSV::CLASS_XML, NSV::CLASS_OBJECT, NS_GLOBAL, 5 },
@@ -327,7 +327,7 @@
NSV::NS_FLASH_NET, 5 },
{ loadvars_class_init, NSV::CLASS_LOAD_VARS, NSV::CLASS_OBJECT,
NS_GLOBAL,
6 },
- { LocalConnection_as::init, NSV::CLASS_LOCAL_CONNECTION,
NSV::CLASS_OBJECT,
+ { LocalConnection_as::init, NSV::CLASS_LOCALCONNECTION,
NSV::CLASS_OBJECT,
NS_GLOBAL, 6 },
{ customactions_class_init, NSV::CLASS_CUSTOM_ACTIONS,
NSV::CLASS_OBJECT,
NSV::NS_ADOBE_UTILS, 6 },
@@ -335,7 +335,7 @@
NSV::NS_FLASH_NET, 6 },
{ NetStream_as::init, NSV::CLASS_NET_STREAM, NSV::CLASS_OBJECT,
NSV::NS_FLASH_NET, 6 },
- { contextmenu_class_init, NSV::CLASS_CONTEXT_MENU, NSV::CLASS_OBJECT,
+ { contextmenu_class_init, NSV::CLASS_CONTEXTMENU, NSV::CLASS_OBJECT,
NSV::NS_FLASH_UI, 7 },
{ moviecliploader_class_init, NSV::CLASS_MOVIE_CLIP_LOADER,
NSV::CLASS_OBJECT, NS_GLOBAL, 7 },
@@ -343,7 +343,7 @@
{ Accessibility_class_init, NSV::CLASS_ACCESSIBILITY, NSV::CLASS_OBJECT,
NS_GLOBAL, 5 },
{ int_class_init, NSV::CLASS_INT, NSV::CLASS_OBJECT, NS_GLOBAL, 9 },
- { TextFieldAutoSize_class_init, NSV::CLASS_TEXTFIELDAUTOSIZE,
+ { textfieldautosize_class_init, NSV::CLASS_TEXTFIELDAUTOSIZE,
NSV::CLASS_OBJECT, NS_GLOBAL, 9 }
// These classes are all implicitly constructed; that is, it is not necessary
for
=== modified file 'libcore/namedStrings.h'
--- a/libcore/namedStrings.h 2009-05-14 16:32:25 +0000
+++ b/libcore/namedStrings.h 2009-05-14 16:39:29 +0000
@@ -96,360 +96,360 @@
CLASS_X_M_L_SOCKET,
#else
CLASS_ACCESSIBILITY = 1,
- CLASS_ACCESSIBILITYPROPERTIES,
- CLASS_ACCIMPL,
- CLASS_ACTIONSCRIPTVERSION,
- CLASS_ACTIVITYEVENT,
- CLASS_ANIMATOR,
- CLASS_ANTIALIASTYPE,
- CLASS_APPLICATIONDOMAIN,
- CLASS_ARRAY,
- CLASS_ASYNCERROREVENT,
- CLASS_AS_BROADCASTER,
- CLASS_AUTOLAYOUTEVENT,
- CLASS_AVM1MOVIE,
- CLASS_BASEBUTTON,
- CLASS_BASESCROLLPANE,
- CLASS_BEVELFILTER,
- CLASS_BEZIEREASE,
- CLASS_BEZIERSEGMENT,
- CLASS_BITMAP,
- CLASS_BITMAPDATA,
- CLASS_BITMAPDATACHANNEL,
- CLASS_BITMAPFILTER,
- CLASS_BITMAPFILTERQUALITY,
- CLASS_BITMAPFILTERTYPE,
- CLASS_BLENDMODE,
- CLASS_BLINDS,
- CLASS_BLURFILTER,
- CLASS_BOOLEAN,
- CLASS_BROWSERINVOKEEVENT,
- CLASS_BUTTON,
- CLASS_BUTTONACCIMPL,
- CLASS_BUTTONLABELPLACEMENT,
- CLASS_BYTEARRAY,
- CLASS_CAMERA,
- CLASS_CAPABILITIES,
- CLASS_CAPSSTYLE,
- CLASS_CAPTIONCHANGEEVENT,
- CLASS_CAPTIONTARGETEVENT,
- CLASS_CHECKBOX,
- CLASS_CHECKBOXACCIMPL,
- CLASS_CLIPBOARD,
- CLASS_CLIPBOARDFORMATS,
- CLASS_CLIPBOARDTRANSFERMODE,
- CLASS_COLOR,
- CLASS_COLORMATRIXFILTER,
- CLASS_COLORPICKER,
- CLASS_COLORTRANSFORM,
- CLASS_COMBOBOX,
- CLASS_COMBOBOXACCIMPL,
- CLASS_COMPRESSIONALGORITHM,
- CLASS_CONTEXTMENU,
- CLASS_CONTEXTMENUBUILTINITEMS,
- CLASS_CONTEXTMENUEVENT,
- CLASS_CONTEXTMENUITEM,
- CLASS_CONVOLUTIONFILTER,
- CLASS_CSMSETTINGS,
- CLASS_CUEPOINTTYPE,
- CLASS_CUSTOMEASE,
- CLASS_CUSTOM_ACTIONS,
- CLASS_DATAEVENT,
- CLASS_DATAGRID,
- CLASS_DATAGRIDACCIMPL,
- CLASS_DATE,
- CLASS_DELETEOBJECTSAMPLE,
- CLASS_DICTIONARY,
- CLASS_DISPLACEMENTMAPFILTER,
- CLASS_DISPLACEMENTMAPFILTERMODE,
- CLASS_DISPLAYOBJECT,
- CLASS_DISPLAYOBJECTCONTAINER,
- CLASS_DOCKICON,
- CLASS_DRMAUTHENTICATEEVENT,
- CLASS_DRMERROREVENT,
- CLASS_DRMSTATUSEVENT,
- CLASS_DROPSHADOWFILTER,
- CLASS_ENCRYPTEDLOCALSTORE,
- CLASS_ENDIAN,
- CLASS_EOFERROR,
- CLASS_ERROR,
- CLASS_ERROREVENT,
- CLASS_EVENT,
- CLASS_EVENTDISPATCHER,
- CLASS_EVENTPHASE,
- CLASS_EXTERNALINTERFACE,
- CLASS_FADE,
- CLASS_FILE,
- CLASS_FILEFILTER,
- CLASS_FILELISTEVENT,
- CLASS_FILEMODE,
- CLASS_FILEREFERENCE,
- CLASS_FILEREFERENCELIST,
- CLASS_FILESTREAM,
- CLASS_FLVPLAYBACK,
- CLASS_FLVPLAYBACKCAPTIONING,
- CLASS_FLY,
- CLASS_FOCUSDIRECTION,
- CLASS_FOCUSEVENT,
- CLASS_FOCUSMANAGER,
- CLASS_FONT,
- CLASS_FONTSTYLE,
- CLASS_FONTTYPE,
- CLASS_FRAMELABEL,
- CLASS_FULLSCREENEVENT,
- CLASS_FUNCTION,
- CLASS_FUNCTIONEASE,
- CLASS_GLOWFILTER,
- CLASS_GRADIENTBEVELFILTER,
- CLASS_GRADIENTGLOWFILTER,
- CLASS_GRADIENTTYPE,
- CLASS_GRAPHICS,
- CLASS_GRIDFITTYPE,
- CLASS_HTMLHISTORYITEM,
- CLASS_HTMLHOST,
- CLASS_HTMLLOADER,
- CLASS_HTMLPDFCAPABILITY,
- CLASS_HTMLUNCAUGHTSCRIPTEXCEPTIONEVENT,
- CLASS_HTMLWINDOWCREATEOPTIONS,
- CLASS_HTTPSTATUSEVENT,
- CLASS_IBITMAPDRAWABLE,
- CLASS_ICON,
- CLASS_ID3INFO,
- CLASS_IDATAINPUT,
- CLASS_IDATAOUTPUT,
- CLASS_IDYNAMICPROPERTYOUTPUT,
- CLASS_IDYNAMICPROPERTYWRITER,
- CLASS_IEVENTDISPATCHER,
- CLASS_IEXTERNALIZABLE,
- CLASS_IFOCUSMANAGER,
- CLASS_IFOCUSMANAGERCOMPONENT,
- CLASS_IFOCUSMANAGERGROUP,
- CLASS_ILLEGALOPERATIONERROR,
- CLASS_IME,
- CLASS_IMECONVERSIONMODE,
- CLASS_IMEEVENT,
- CLASS_INCMANAGER,
- CLASS_INT,
- CLASS_INTERACTIVEICON,
- CLASS_INTERACTIVEOBJECT,
- CLASS_INTERPOLATIONMETHOD,
- CLASS_INVALIDATIONTYPE,
- CLASS_INVALIDSWFERROR,
- CLASS_INVOKEEVENT,
- CLASS_IOERROR,
- CLASS_IOERROREVENT,
- CLASS_IRIS,
- CLASS_ITWEEN,
- CLASS_IURIDEREFERENCER,
- CLASS_IVPEVENT,
- CLASS_JOINTSTYLE,
- CLASS_KEY,
- CLASS_KEYBOARD,
- CLASS_KEYBOARDEVENT,
- CLASS_KEYFRAME,
- CLASS_KEYLOCATION,
- CLASS_LABEL,
- CLASS_LABELBUTTON,
- CLASS_LABELBUTTONACCIMPL,
- CLASS_LAYOUTEVENT,
- CLASS_LINESCALEMODE,
- CLASS_LIST,
- CLASS_LISTACCIMPL,
- CLASS_LOADER,
- CLASS_LOADERCONTEXT,
- CLASS_LOADERINFO,
- CLASS_LOAD_VARS,
- CLASS_LOCALCONNECTION,
- CLASS_MATH,
- CLASS_MATRIX,
- CLASS_MATRIXTRANSFORMER,
- CLASS_MEMORYERROR,
- CLASS_METADATAEVENT,
- CLASS_MICROPHONE,
- CLASS_MORPHSHAPE,
- CLASS_MOTION,
- CLASS_MOTIONEVENT,
- CLASS_MOUSE,
- CLASS_MOUSEEVENT,
- CLASS_MOVIECLIP,
- CLASS_MOVIE_CLIP,
- CLASS_MOVIE_CLIP_LOADER,
- CLASS_NATIVEAPPLICATION,
- CLASS_NATIVEDRAGACTIONS,
- CLASS_NATIVEDRAGEVENT,
- CLASS_NATIVEDRAGMANAGER,
- CLASS_NATIVEDRAGOPTIONS,
- CLASS_NATIVEMENU,
- CLASS_NATIVEMENUITEM,
- CLASS_NATIVEWINDOW,
- CLASS_NATIVEWINDOWBOUNDSEVENT,
- CLASS_NATIVEWINDOWDISPLAYSTATE,
- CLASS_NATIVEWINDOWDISPLAYSTATEEVENT,
- CLASS_NATIVEWINDOWINITOPTIONS,
- CLASS_NATIVEWINDOWRESIZE,
- CLASS_NATIVEWINDOWTYPE,
- CLASS_NCMANAGER,
- CLASS_NCMANAGERNATIVE,
- CLASS_NETCONNECTION,
- CLASS_NETSTATUSEVENT,
- CLASS_NETSTREAM,
- CLASS_NET_CONNECTION,
- CLASS_NET_STREAM,
- CLASS_NEWOBJECTSAMPLE,
- CLASS_NOTIFICATIONTYPE,
- CLASS_NUMBER,
- CLASS_NUMERICSTEPPER,
- CLASS_OBJECT,
- CLASS_OBJECTENCODING,
- CLASS_OUTPUTPROGRESSEVENT,
- CLASS_PHOTO,
- CLASS_PIXELDISSOLVE,
- CLASS_PIXELSNAPPING,
- CLASS_POINT,
- CLASS_PRINTJOB,
- CLASS_PRINTJOBOPTIONS,
- CLASS_PRINTJOBORIENTATION,
- CLASS_PROGRESSBAR,
- CLASS_PROGRESSBARDIRECTION,
- CLASS_PROGRESSBARMODE,
- CLASS_PROGRESSEVENT,
- CLASS_PROXY,
- CLASS_RADIOBUTTON,
- CLASS_RADIOBUTTONACCIMPL,
- CLASS_RADIOBUTTONGROUP,
- CLASS_RECTANGLE,
- CLASS_RESPONDER,
- CLASS_REVOCATIONCHECKSETTINGS,
- CLASS_ROTATE,
- CLASS_ROTATEDIRECTION,
- CLASS_SAMPLE,
- CLASS_SCENE,
- CLASS_SCREEN,
- CLASS_SCREENMOUSEEVENT,
- CLASS_SCRIPTTIMEOUTERROR,
- CLASS_SCROLLBAR,
- CLASS_SCROLLBARDIRECTION,
- CLASS_SCROLLPANE,
- CLASS_SCROLLPOLICY,
- CLASS_SECURITY,
- CLASS_SECURITYDOMAIN,
- CLASS_SECURITYERROREVENT,
- CLASS_SECURITYPANEL,
- CLASS_SELECTABLELIST,
- CLASS_SELECTABLELISTACCIMPL,
- CLASS_SELECTION,
- CLASS_SHAPE,
- CLASS_SHAREDOBJECT,
- CLASS_SHAREDOBJECTFLUSHSTATUS,
- CLASS_SHARED_OBJECT,
- CLASS_SIGNATURESTATUS,
- CLASS_SIGNERTRUSTSETTINGS,
- CLASS_SIMPLEBUTTON,
- CLASS_SIMPLEEASE,
- CLASS_SKINERROREVENT,
- CLASS_SLIDER,
- CLASS_SLIDERDIRECTION,
- CLASS_SOCKET,
- CLASS_SOUND,
- CLASS_SOUNDCHANNEL,
- CLASS_SOUNDEVENT,
- CLASS_SOUNDLOADERCONTEXT,
- CLASS_SOUNDMIXER,
- CLASS_SOUNDTRANSFORM,
- CLASS_SOURCE,
- CLASS_SPREADMETHOD,
- CLASS_SPRITE,
- CLASS_SQLCOLLATIONTYPE,
- CLASS_SQLCOLUMNNAMESTYLE,
- CLASS_SQLCOLUMNSCHEMA,
- CLASS_SQLCONNECTION,
- CLASS_SQLERROR,
- CLASS_SQLERROREVENT,
- CLASS_SQLERROROPERATION,
- CLASS_SQLEVENT,
- CLASS_SQLINDEXSCHEMA,
- CLASS_SQLMODE,
- CLASS_SQLRESULT,
- CLASS_SQLSCHEMA,
- CLASS_SQLSCHEMARESULT,
- CLASS_SQLSTATEMENT,
- CLASS_SQLTABLESCHEMA,
- CLASS_SQLTRANSACTIONLOCKTYPE,
- CLASS_SQLTRIGGERSCHEMA,
- CLASS_SQLUPDATEEVENT,
- CLASS_SQLVIEWSCHEMA,
- CLASS_SQUEEZE,
- CLASS_STACKFRAME,
- CLASS_STACKOVERFLOWERROR,
- CLASS_STAGE,
- CLASS_STAGEALIGN,
- CLASS_STAGEDISPLAYSTATE,
- CLASS_STAGEQUALITY,
- CLASS_STAGESCALEMODE,
- CLASS_STATICTEXT,
- CLASS_STATUSEVENT,
- CLASS_STRING,
- CLASS_STYLEMANAGER,
- CLASS_STYLESHEET,
- CLASS_SWFVERSION,
- CLASS_SYNCEVENT,
- CLASS_SYSTEM,
- CLASS_SYSTEMTRAYICON,
- CLASS_TEXTAREA,
- CLASS_TEXTCOLORTYPE,
- CLASS_TEXTDISPLAYMODE,
- CLASS_TEXTEVENT,
- CLASS_TEXTFIELD,
- CLASS_TEXTFIELDAUTOSIZE,
- CLASS_TEXTFIELDTYPE,
- CLASS_TEXTFORMAT,
- CLASS_TEXTFORMATALIGN,
- CLASS_TEXTINPUT,
- CLASS_TEXTLINEMETRICS,
- CLASS_TEXTRENDERER,
- CLASS_TEXTSNAPSHOT,
- CLASS_TEXT_FIELD,
- CLASS_TEXT_FORMAT,
- CLASS_TEXT_SNAPSHOT,
- CLASS_TILELIST,
- CLASS_TILELISTACCIMPL,
- CLASS_TIMER,
- CLASS_TIMEREVENT,
- CLASS_TRANSFORM,
- CLASS_TRANSITION,
- CLASS_TRANSITIONMANAGER,
- CLASS_TWEEN,
- CLASS_TWEENABLES,
- CLASS_TWEENEVENT,
- CLASS_UICOMPONENT,
- CLASS_UICOMPONENTACCIMPL,
- CLASS_UILOADER,
- CLASS_UISCROLLBAR,
- CLASS_UPDATER,
- CLASS_URLLOADER,
- CLASS_URLLOADERDATAFORMAT,
- CLASS_URLREQUEST,
- CLASS_URLREQUESTDEFAULTS,
- CLASS_URLREQUESTHEADER,
- CLASS_URLREQUESTMETHOD,
- CLASS_URLSTREAM,
- CLASS_URLVARIABLES,
- CLASS_VIDEO,
- CLASS_VIDEOALIGN,
- CLASS_VIDEOERROR,
- CLASS_VIDEOEVENT,
- CLASS_VIDEOPLAYER,
- CLASS_VIDEOPROGRESSEVENT,
- CLASS_VIDEOSCALEMODE,
- CLASS_VIDEOSTATE,
- CLASS_WIPE,
- CLASS_XML,
- CLASS_XMLDOCUMENT,
- CLASS_XMLNODE,
- CLASS_XMLNODETYPE,
- CLASS_XMLSIGNATUREVALIDATOR,
- CLASS_XMLSOCKET,
- CLASS_ZOOM,
+ CLASS_ACCESSIBILITYPROPERTIES,
+ CLASS_ACCIMPL,
+ CLASS_ACTIONSCRIPTVERSION,
+ CLASS_ACTIVITYEVENT,
+ CLASS_ANIMATOR,
+ CLASS_ANTIALIASTYPE,
+ CLASS_APPLICATIONDOMAIN,
+ CLASS_ARRAY,
+ CLASS_ASYNCERROREVENT,
+ CLASS_AS_BROADCASTER,
+ CLASS_AUTOLAYOUTEVENT,
+ CLASS_AVM1MOVIE,
+ CLASS_BASEBUTTON,
+ CLASS_BASESCROLLPANE,
+ CLASS_BEVELFILTER,
+ CLASS_BEZIEREASE,
+ CLASS_BEZIERSEGMENT,
+ CLASS_BITMAP,
+ CLASS_BITMAPDATA,
+ CLASS_BITMAPDATACHANNEL,
+ CLASS_BITMAPFILTER,
+ CLASS_BITMAPFILTERQUALITY,
+ CLASS_BITMAPFILTERTYPE,
+ CLASS_BLENDMODE,
+ CLASS_BLINDS,
+ CLASS_BLURFILTER,
+ CLASS_BOOLEAN,
+ CLASS_BROWSERINVOKEEVENT,
+ CLASS_BUTTON,
+ CLASS_BUTTONACCIMPL,
+ CLASS_BUTTONLABELPLACEMENT,
+ CLASS_BYTEARRAY,
+ CLASS_CAMERA,
+ CLASS_CAPABILITIES,
+ CLASS_CAPSSTYLE,
+ CLASS_CAPTIONCHANGEEVENT,
+ CLASS_CAPTIONTARGETEVENT,
+ CLASS_CHECKBOX,
+ CLASS_CHECKBOXACCIMPL,
+ CLASS_CLIPBOARD,
+ CLASS_CLIPBOARDFORMATS,
+ CLASS_CLIPBOARDTRANSFERMODE,
+ CLASS_COLOR,
+ CLASS_COLORMATRIXFILTER,
+ CLASS_COLORPICKER,
+ CLASS_COLORTRANSFORM,
+ CLASS_COMBOBOX,
+ CLASS_COMBOBOXACCIMPL,
+ CLASS_COMPRESSIONALGORITHM,
+ CLASS_CONTEXTMENU,
+ CLASS_CONTEXTMENUBUILTINITEMS,
+ CLASS_CONTEXTMENUEVENT,
+ CLASS_CONTEXTMENUITEM,
+ CLASS_CONVOLUTIONFILTER,
+ CLASS_CSMSETTINGS,
+ CLASS_CUEPOINTTYPE,
+ CLASS_CUSTOMEASE,
+ CLASS_CUSTOM_ACTIONS,
+ CLASS_DATAEVENT,
+ CLASS_DATAGRID,
+ CLASS_DATAGRIDACCIMPL,
+ CLASS_DATE,
+ CLASS_DELETEOBJECTSAMPLE,
+ CLASS_DICTIONARY,
+ CLASS_DISPLACEMENTMAPFILTER,
+ CLASS_DISPLACEMENTMAPFILTERMODE,
+ CLASS_DISPLAYOBJECT,
+ CLASS_DISPLAYOBJECTCONTAINER,
+ CLASS_DOCKICON,
+ CLASS_DRMAUTHENTICATEEVENT,
+ CLASS_DRMERROREVENT,
+ CLASS_DRMSTATUSEVENT,
+ CLASS_DROPSHADOWFILTER,
+ CLASS_ENCRYPTEDLOCALSTORE,
+ CLASS_ENDIAN,
+ CLASS_EOFERROR,
+ CLASS_ERROR,
+ CLASS_ERROREVENT,
+ CLASS_EVENT,
+ CLASS_EVENTDISPATCHER,
+ CLASS_EVENTPHASE,
+ CLASS_EXTERNALINTERFACE,
+ CLASS_FADE,
+ CLASS_FILE,
+ CLASS_FILEFILTER,
+ CLASS_FILELISTEVENT,
+ CLASS_FILEMODE,
+ CLASS_FILEREFERENCE,
+ CLASS_FILEREFERENCELIST,
+ CLASS_FILESTREAM,
+ CLASS_FLVPLAYBACK,
+ CLASS_FLVPLAYBACKCAPTIONING,
+ CLASS_FLY,
+ CLASS_FOCUSDIRECTION,
+ CLASS_FOCUSEVENT,
+ CLASS_FOCUSMANAGER,
+ CLASS_FONT,
+ CLASS_FONTSTYLE,
+ CLASS_FONTTYPE,
+ CLASS_FRAMELABEL,
+ CLASS_FULLSCREENEVENT,
+ CLASS_FUNCTION,
+ CLASS_FUNCTIONEASE,
+ CLASS_GLOWFILTER,
+ CLASS_GRADIENTBEVELFILTER,
+ CLASS_GRADIENTGLOWFILTER,
+ CLASS_GRADIENTTYPE,
+ CLASS_GRAPHICS,
+ CLASS_GRIDFITTYPE,
+ CLASS_HTMLHISTORYITEM,
+ CLASS_HTMLHOST,
+ CLASS_HTMLLOADER,
+ CLASS_HTMLPDFCAPABILITY,
+ CLASS_HTMLUNCAUGHTSCRIPTEXCEPTIONEVENT,
+ CLASS_HTMLWINDOWCREATEOPTIONS,
+ CLASS_HTTPSTATUSEVENT,
+ CLASS_IBITMAPDRAWABLE,
+ CLASS_ICON,
+ CLASS_ID3INFO,
+ CLASS_IDATAINPUT,
+ CLASS_IDATAOUTPUT,
+ CLASS_IDYNAMICPROPERTYOUTPUT,
+ CLASS_IDYNAMICPROPERTYWRITER,
+ CLASS_IEVENTDISPATCHER,
+ CLASS_IEXTERNALIZABLE,
+ CLASS_IFOCUSMANAGER,
+ CLASS_IFOCUSMANAGERCOMPONENT,
+ CLASS_IFOCUSMANAGERGROUP,
+ CLASS_ILLEGALOPERATIONERROR,
+ CLASS_IME,
+ CLASS_IMECONVERSIONMODE,
+ CLASS_IMEEVENT,
+ CLASS_INCMANAGER,
+ CLASS_INT,
+ CLASS_INTERACTIVEICON,
+ CLASS_INTERACTIVEOBJECT,
+ CLASS_INTERPOLATIONMETHOD,
+ CLASS_INVALIDATIONTYPE,
+ CLASS_INVALIDSWFERROR,
+ CLASS_INVOKEEVENT,
+ CLASS_IOERROR,
+ CLASS_IOERROREVENT,
+ CLASS_IRIS,
+ CLASS_ITWEEN,
+ CLASS_IURIDEREFERENCER,
+ CLASS_IVPEVENT,
+ CLASS_JOINTSTYLE,
+ CLASS_KEY,
+ CLASS_KEYBOARD,
+ CLASS_KEYBOARDEVENT,
+ CLASS_KEYFRAME,
+ CLASS_KEYLOCATION,
+ CLASS_LABEL,
+ CLASS_LABELBUTTON,
+ CLASS_LABELBUTTONACCIMPL,
+ CLASS_LAYOUTEVENT,
+ CLASS_LINESCALEMODE,
+ CLASS_LIST,
+ CLASS_LISTACCIMPL,
+ CLASS_LOADER,
+ CLASS_LOADERCONTEXT,
+ CLASS_LOADERINFO,
+ CLASS_LOAD_VARS,
+ CLASS_LOCALCONNECTION,
+ CLASS_MATH,
+ CLASS_MATRIX,
+ CLASS_MATRIXTRANSFORMER,
+ CLASS_MEMORYERROR,
+ CLASS_METADATAEVENT,
+ CLASS_MICROPHONE,
+ CLASS_MORPHSHAPE,
+ CLASS_MOTION,
+ CLASS_MOTIONEVENT,
+ CLASS_MOUSE,
+ CLASS_MOUSEEVENT,
+ CLASS_MOVIECLIP,
+ CLASS_MOVIE_CLIP,
+ CLASS_MOVIE_CLIP_LOADER,
+ CLASS_NATIVEAPPLICATION,
+ CLASS_NATIVEDRAGACTIONS,
+ CLASS_NATIVEDRAGEVENT,
+ CLASS_NATIVEDRAGMANAGER,
+ CLASS_NATIVEDRAGOPTIONS,
+ CLASS_NATIVEMENU,
+ CLASS_NATIVEMENUITEM,
+ CLASS_NATIVEWINDOW,
+ CLASS_NATIVEWINDOWBOUNDSEVENT,
+ CLASS_NATIVEWINDOWDISPLAYSTATE,
+ CLASS_NATIVEWINDOWDISPLAYSTATEEVENT,
+ CLASS_NATIVEWINDOWINITOPTIONS,
+ CLASS_NATIVEWINDOWRESIZE,
+ CLASS_NATIVEWINDOWTYPE,
+ CLASS_NCMANAGER,
+ CLASS_NCMANAGERNATIVE,
+ CLASS_NETCONNECTION,
+ CLASS_NETSTATUSEVENT,
+ CLASS_NETSTREAM,
+ CLASS_NET_CONNECTION,
+ CLASS_NET_STREAM,
+ CLASS_NEWOBJECTSAMPLE,
+ CLASS_NOTIFICATIONTYPE,
+ CLASS_NUMBER,
+ CLASS_NUMERICSTEPPER,
+ CLASS_OBJECT,
+ CLASS_OBJECTENCODING,
+ CLASS_OUTPUTPROGRESSEVENT,
+ CLASS_PHOTO,
+ CLASS_PIXELDISSOLVE,
+ CLASS_PIXELSNAPPING,
+ CLASS_POINT,
+ CLASS_PRINTJOB,
+ CLASS_PRINTJOBOPTIONS,
+ CLASS_PRINTJOBORIENTATION,
+ CLASS_PROGRESSBAR,
+ CLASS_PROGRESSBARDIRECTION,
+ CLASS_PROGRESSBARMODE,
+ CLASS_PROGRESSEVENT,
+ CLASS_PROXY,
+ CLASS_RADIOBUTTON,
+ CLASS_RADIOBUTTONACCIMPL,
+ CLASS_RADIOBUTTONGROUP,
+ CLASS_RECTANGLE,
+ CLASS_RESPONDER,
+ CLASS_REVOCATIONCHECKSETTINGS,
+ CLASS_ROTATE,
+ CLASS_ROTATEDIRECTION,
+ CLASS_SAMPLE,
+ CLASS_SCENE,
+ CLASS_SCREEN,
+ CLASS_SCREENMOUSEEVENT,
+ CLASS_SCRIPTTIMEOUTERROR,
+ CLASS_SCROLLBAR,
+ CLASS_SCROLLBARDIRECTION,
+ CLASS_SCROLLPANE,
+ CLASS_SCROLLPOLICY,
+ CLASS_SECURITY,
+ CLASS_SECURITYDOMAIN,
+ CLASS_SECURITYERROREVENT,
+ CLASS_SECURITYPANEL,
+ CLASS_SELECTABLELIST,
+ CLASS_SELECTABLELISTACCIMPL,
+ CLASS_SELECTION,
+ CLASS_SHAPE,
+ CLASS_SHAREDOBJECT,
+ CLASS_SHAREDOBJECTFLUSHSTATUS,
+ CLASS_SHARED_OBJECT,
+ CLASS_SIGNATURESTATUS,
+ CLASS_SIGNERTRUSTSETTINGS,
+ CLASS_SIMPLEBUTTON,
+ CLASS_SIMPLEEASE,
+ CLASS_SKINERROREVENT,
+ CLASS_SLIDER,
+ CLASS_SLIDERDIRECTION,
+ CLASS_SOCKET,
+ CLASS_SOUND,
+ CLASS_SOUNDCHANNEL,
+ CLASS_SOUNDEVENT,
+ CLASS_SOUNDLOADERCONTEXT,
+ CLASS_SOUNDMIXER,
+ CLASS_SOUNDTRANSFORM,
+ CLASS_SOURCE,
+ CLASS_SPREADMETHOD,
+ CLASS_SPRITE,
+ CLASS_SQLCOLLATIONTYPE,
+ CLASS_SQLCOLUMNNAMESTYLE,
+ CLASS_SQLCOLUMNSCHEMA,
+ CLASS_SQLCONNECTION,
+ CLASS_SQLERROR,
+ CLASS_SQLERROREVENT,
+ CLASS_SQLERROROPERATION,
+ CLASS_SQLEVENT,
+ CLASS_SQLINDEXSCHEMA,
+ CLASS_SQLMODE,
+ CLASS_SQLRESULT,
+ CLASS_SQLSCHEMA,
+ CLASS_SQLSCHEMARESULT,
+ CLASS_SQLSTATEMENT,
+ CLASS_SQLTABLESCHEMA,
+ CLASS_SQLTRANSACTIONLOCKTYPE,
+ CLASS_SQLTRIGGERSCHEMA,
+ CLASS_SQLUPDATEEVENT,
+ CLASS_SQLVIEWSCHEMA,
+ CLASS_SQUEEZE,
+ CLASS_STACKFRAME,
+ CLASS_STACKOVERFLOWERROR,
+ CLASS_STAGE,
+ CLASS_STAGEALIGN,
+ CLASS_STAGEDISPLAYSTATE,
+ CLASS_STAGEQUALITY,
+ CLASS_STAGESCALEMODE,
+ CLASS_STATICTEXT,
+ CLASS_STATUSEVENT,
+ CLASS_STRING,
+ CLASS_STYLEMANAGER,
+ CLASS_STYLESHEET,
+ CLASS_SWFVERSION,
+ CLASS_SYNCEVENT,
+ CLASS_SYSTEM,
+ CLASS_SYSTEMTRAYICON,
+ CLASS_TEXTAREA,
+ CLASS_TEXTCOLORTYPE,
+ CLASS_TEXTDISPLAYMODE,
+ CLASS_TEXTEVENT,
+ CLASS_TEXTFIELD,
+ CLASS_TEXTFIELDAUTOSIZE,
+ CLASS_TEXTFIELDTYPE,
+ CLASS_TEXTFORMAT,
+ CLASS_TEXTFORMATALIGN,
+ CLASS_TEXTINPUT,
+ CLASS_TEXTLINEMETRICS,
+ CLASS_TEXTRENDERER,
+ CLASS_TEXTSNAPSHOT,
+ CLASS_TEXT_FIELD,
+ CLASS_TEXT_FORMAT,
+ CLASS_TEXT_SNAPSHOT,
+ CLASS_TILELIST,
+ CLASS_TILELISTACCIMPL,
+ CLASS_TIMER,
+ CLASS_TIMEREVENT,
+ CLASS_TRANSFORM,
+ CLASS_TRANSITION,
+ CLASS_TRANSITIONMANAGER,
+ CLASS_TWEEN,
+ CLASS_TWEENABLES,
+ CLASS_TWEENEVENT,
+ CLASS_UICOMPONENT,
+ CLASS_UICOMPONENTACCIMPL,
+ CLASS_UILOADER,
+ CLASS_UISCROLLBAR,
+ CLASS_UPDATER,
+ CLASS_URLLOADER,
+ CLASS_URLLOADERDATAFORMAT,
+ CLASS_URLREQUEST,
+ CLASS_URLREQUESTDEFAULTS,
+ CLASS_URLREQUESTHEADER,
+ CLASS_URLREQUESTMETHOD,
+ CLASS_URLSTREAM,
+ CLASS_URLVARIABLES,
+ CLASS_VIDEO,
+ CLASS_VIDEOALIGN,
+ CLASS_VIDEOERROR,
+ CLASS_VIDEOEVENT,
+ CLASS_VIDEOPLAYER,
+ CLASS_VIDEOPROGRESSEVENT,
+ CLASS_VIDEOSCALEMODE,
+ CLASS_VIDEOSTATE,
+ CLASS_WIPE,
+ CLASS_XML,
+ CLASS_XMLDOCUMENT,
+ CLASS_XMLNODE,
+ CLASS_XMLNODETYPE,
+ CLASS_XMLSIGNATUREVALIDATOR,
+ CLASS_XMLSOCKET,
+ CLASS_ZOOM,
#endif
PROP_iSTAGE = CLASS_STAGE,
NS_ADOBE_UTILS,
@@ -490,8 +490,8 @@
PROP_CONSTRUCTOR,
PROP_CONTENT_TYPE,
PROP_D,
- PROP_DATA,
- PROP_DECODE,
+ PROP_DATA,
+ PROP_DECODE,
PROP_E,
PROP_ENABLED,
PROP_ESCAPE,
@@ -507,7 +507,7 @@
PROP_LENGTH,
PROP_LOADED,
PROP_MATRIX_TYPE,
- PROP_METH,
+ PROP_METH,
PROP_ON_CLOSE,
PROP_ON_CONNECT,
PROP_ON_CONSTRUCT,
@@ -539,8 +539,8 @@
PROP_ON_ROLL_OVER,
PROP_ON_SELECT,
PROP_ON_SET_FOCUS,
- PROP_ON_SOUND_COMPLETE,
- PROP_ON_STATUS,
+ PROP_ON_SOUND_COMPLETE,
+ PROP_ON_STATUS,
PROP_ON_TIMER,
PROP_ON_UNLOAD,
PROP_ON_XML,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/avm2 r9725: Fix mistakes in resolving conflicts.,
Benjamin Wolsey <=