Browse Source

Fix for release build

Josh Engebretson 10 years ago
parent
commit
0ac2b48c55

+ 11 - 0
Source/AtomicJS/Javascript/JSUI.cpp

@@ -22,6 +22,9 @@ JSUI::JSUI(Context* context) : Object(context),
 
     SubscribeToEvent(E_JSOBJECTADDED, HANDLER(JSUI, HandleObjectAdded));
 
+    // for debugging only, commented out otherwise
+    //SubscribeToEvent(E_JSOBJECTREMOVED, HANDLER(JSUI, HandleObjectRemoved));
+
     SubscribeToEvent(E_WIDGETDELETED, HANDLER(JSUI, HandleWidgetDeleted));
     SubscribeToEvent(E_WIDGETEVENT, HANDLER(JSUI, HandleWidgetEvent));
     SubscribeToEvent(E_WIDGETLOADED, HANDLER(JSUI, HandleWidgetLoaded));
@@ -83,6 +86,14 @@ void JSUI::HandleObjectAdded(StringHash eventType, VariantMap& eventData)
 
 }
 
+void JSUI::HandleObjectRemoved(StringHash eventType, VariantMap& eventData)
+{
+    Object* o = static_cast<Object*>(eventData[ObjectAdded::P_OBJECT].GetPtr());
+
+    LOGINFOF("Removing %s", o->GetTypeName().CString());
+
+}
+
 void JSUI::HandleWidgetDeleted(StringHash eventType, VariantMap& eventData)
 {
     UIWidget* widget = static_cast<UIWidget*>(eventData[WidgetDeleted::P_WIDGET].GetPtr());

+ 1 - 0
Source/AtomicJS/Javascript/JSUI.h

@@ -29,6 +29,7 @@ private:
     void PushWidgetEventObject(VariantMap& eventData);
 
     void HandleObjectAdded(StringHash eventType, VariantMap& eventData);
+    void HandleObjectRemoved(StringHash eventType, VariantMap& eventData);
 
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
     void HandleWidgetEvent(StringHash eventType, VariantMap& eventData);

+ 1 - 1
Source/ThirdParty/TurboBadger/tb_id.h

@@ -31,7 +31,7 @@ public:
 #else
 	void Set(uint32 newid)			{ id = newid; }
 	void Set(const TBID &newid)		{ id = newid; }
-	void Set(const char *string)	{ id = TBGetHash(string); }
+    void Set(const char *string)	{ id = TBGetHash(string); if (tbidRegisterCallback) tbidRegisterCallback(id, string); }
 #endif
 
 	operator uint32 () const		{ return id; }