Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add forgotten finalize calls

  • Loading branch information...
commit 128954b41da537b583ff6417d675d4f0e47a8283 1 parent 37f7a3a
@aajanki aajanki authored
View
6 src/scripting/flash/display/flashdisplay.cpp
@@ -1487,6 +1487,12 @@ ASFUNCTIONBODY(InteractiveObject,_getDoubleClickEnabled)
return abstract_b(th->doubleClickEnabled);
}
+void InteractiveObject::finalize()
+{
+ DisplayObject::finalize();
+ contextMenu.reset();
+}
+
void InteractiveObject::buildTraits(ASObject* o)
{
}
View
1  src/scripting/flash/display/flashdisplay.h
@@ -69,6 +69,7 @@ class InteractiveObject: public DisplayObject
ASFUNCTION(_getMouseEnabled);
ASFUNCTION(_setDoubleClickEnabled);
ASFUNCTION(_getDoubleClickEnabled);
+ void finalize();
static void sinit(Class_base* c);
static void buildTraits(ASObject* o);
};
View
18 src/scripting/flash/text/flashtext.cpp
@@ -496,6 +496,24 @@ void TextFormat::sinit(Class_base* c)
REGISTER_GETTER_SETTER(c,url);
}
+void TextFormat::finalize()
+{
+ ASObject::finalize();
+ blockIndent.reset();
+ bold.reset();
+ bullet.reset();
+ color.reset();
+ indent.reset();
+ italic.reset();
+ kerning.reset();
+ leading.reset();
+ leftMargin.reset();
+ letterSpacing.reset();
+ rightMargin.reset();
+ tabStops.reset();
+ underline.reset();
+}
+
ASFUNCTIONBODY(TextFormat,_constructor)
{
TextFormat* th=static_cast<TextFormat*>(obj);
View
1  src/scripting/flash/text/flashtext.h
@@ -103,6 +103,7 @@ class TextFormat: public ASObject
void onAlign(const tiny_string& old);
public:
TextFormat(Class_base* c):ASObject(c){}
+ void finalize();
static void sinit(Class_base* c);
static void buildTraits(ASObject* o);
ASFUNCTION(_constructor);
Please sign in to comment.
Something went wrong with that request. Please try again.