[[ DocumentFilename ]] Init to empty string

Monte Goulding · Monte Goulding · commit f41736111d39 · 2015-10-12T22:39:43.000+11:00
diff --git a/docs/dictionary/property/documentFilename.lcdoc b/docs/dictionary/property/documentFilename.lcdoc
@@ -4,7 +4,7 @@ Type: property
 
 Syntax: set the documentFilename of <stack> to <filename>
 
-Summary: Specifies the file path to the file that the stack is represents.
+Summary: Specifies the file path to the file that the stack represents.
 
 Associations: stack
 
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -217,8 +217,7 @@ void MCStack::realize(void)
         resetcursor(True);
         
         // MERG-2015-10-11: [[ DocumentFilename ]] update the window with the document filename property
-        if (m_document_filename != nil)
-            MCPlatformSetWindowProperty(t_window, kMCPlatformWindowPropertyDocumentFilename, kMCPlatformPropertyTypeMCString, &m_document_filename);
+        MCPlatformSetWindowProperty(t_window, kMCPlatformWindowPropertyDocumentFilename, kMCPlatformPropertyTypeMCString, &m_document_filename);
 	}
 	
 	start_externals();
diff --git a/engine/src/exec-interface-stack.cpp b/engine/src/exec-interface-stack.cpp
@@ -2187,17 +2187,18 @@ void MCStack::SetScriptOnly(MCExecContext& ctxt, bool p_script_only)
 // MERG-2015-10-11: [[ DocumentFilename ]] Add stack documentFilename property
 void MCStack::GetDocumentFilename(MCExecContext &ctxt, MCStringRef& r_document_filename)
 {
-    if (m_document_filename == nil)
-        return;
-    
     r_document_filename = MCValueRetain(m_document_filename);
 }
 
 void MCStack::SetDocumentFilename(MCExecContext &ctxt, MCStringRef p_document_filename)
 {
     MCStringRef t_resolved_filename;
     
-    if (!MCS_resolvepath(p_document_filename, t_resolved_filename))
+    if (MCStringIsEmpty(p_document_filename))
+    {
+        t_resolved_filename = p_document_filename;
+    }
+    else if (!MCS_resolvepath(p_document_filename, t_resolved_filename))
     {
         ctxt . LegacyThrow(EE_DOCUMENTFILENAME_BADFILENAME);
         return;
diff --git a/engine/src/mac-window.mm b/engine/src/mac-window.mm
@@ -1898,8 +1898,7 @@ - (void)setFrameSize: (NSSize)size
     [m_window_handle setHidesOnDeactivate: m_hides_on_suspend];
     
     // MERG-2015-10-11: [[ DocumentFilename ]] Set documentFilename.
-    if (m_document_filename != nil)
-        UpdateDocumentFilename();
+    UpdateDocumentFilename();
 }
 
 void MCMacPlatformWindow::DoSynchronize(void)
@@ -2210,11 +2209,14 @@ bool MCMacDoUpdateRegionCallback(void *p_context, const MCRectangle &p_rect)
     NSString * t_represented_filename;
     t_represented_filename = nil;
     
-    if (m_document_filename != nil && MCS_pathtonative(m_document_filename, t_native_filename))
+    if (!MCStringIsEmpty(m_document_filename) && MCS_pathtonative(m_document_filename, t_native_filename))
     {
         t_represented_filename = [NSString stringWithMCStringRef: t_native_filename];
     }
+    else
+        t_represented_filename = @"";
     
+    // It appears setRepresentedFilename can't be set to nil
     [m_window_handle setRepresentedFilename: t_represented_filename];
 }
 
diff --git a/engine/src/platform-window.cpp b/engine/src/platform-window.cpp
@@ -67,7 +67,7 @@ MCPlatformWindow::MCPlatformWindow(void)
 	m_is_opaque = true;
     
     // MERG-2015-10-11: [[ DocumentFilename ]] documentFilename property
-    m_document_filename = nil;
+    m_document_filename = MCValueRetain(kMCEmptyString);
 }
 
 MCPlatformWindow::~MCPlatformWindow(void)
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -296,7 +296,7 @@ MCStack::MCStack()
 	m_purge_fonts = false;
     
     // MERG-2015-10-11: [[ DocumentFilename ]] The filename the stack represnts
-    m_document_filename = nil;
+    m_document_filename = MCValueRetain(kMCEmptyString);
 
 	m_view_need_redraw = false;
 	m_view_need_resize = false;
@@ -506,8 +506,8 @@ MCStack::MCStack(const MCStack &sref) : MCObject(sref)
 
     m_attachments = nil;
     
-    // MERG-2015-10-100: [[ DocumentFilename ]] No document filename to begin with
-    m_document_filename = nil;
+    // MERG-2015-10-12: [[ DocumentFilename ]] No document filename to begin with
+    m_document_filename = MCValueRetain(kMCEmptyString);
     
 	view_copy(sref);
 }

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,7 @@ void MCStack::realize(void)`
`217`	`217`	`resetcursor(True);`
`218`	`218`
`219`	`219`	`// MERG-2015-10-11: [[ DocumentFilename ]] update the window with the document filename property`
`220`		`- if (m_document_filename != nil)`
`221`		`- MCPlatformSetWindowProperty(t_window, kMCPlatformWindowPropertyDocumentFilename, kMCPlatformPropertyTypeMCString, &m_document_filename);`
	`220`	`+ MCPlatformSetWindowProperty(t_window, kMCPlatformWindowPropertyDocumentFilename, kMCPlatformPropertyTypeMCString, &m_document_filename);`
`222`	`221`	`}`
`223`	`222`
`224`	`223`	`start_externals();`
Original file line number	Diff line number	Diff line change
`@@ -2187,17 +2187,18 @@ void MCStack::SetScriptOnly(MCExecContext& ctxt, bool p_script_only)`
`2187`	`2187`	`// MERG-2015-10-11: [[ DocumentFilename ]] Add stack documentFilename property`
`2188`	`2188`	`void MCStack::GetDocumentFilename(MCExecContext &ctxt, MCStringRef& r_document_filename)`
`2189`	`2189`	`{`
`2190`		`- if (m_document_filename == nil)`
`2191`		`- return;`
`2192`		`-`
`2193`	`2190`	`r_document_filename = MCValueRetain(m_document_filename);`
`2194`	`2191`	`}`
`2195`	`2192`
`2196`	`2193`	`void MCStack::SetDocumentFilename(MCExecContext &ctxt, MCStringRef p_document_filename)`
`2197`	`2194`	`{`
`2198`	`2195`	`MCStringRef t_resolved_filename;`
`2199`	`2196`
`2200`		`- if (!MCS_resolvepath(p_document_filename, t_resolved_filename))`
	`2197`	`+ if (MCStringIsEmpty(p_document_filename))`
	`2198`	`+ {`
	`2199`	`+ t_resolved_filename = p_document_filename;`
	`2200`	`+ }`
	`2201`	`+ else if (!MCS_resolvepath(p_document_filename, t_resolved_filename))`
`2201`	`2202`	`{`
`2202`	`2203`	`ctxt . LegacyThrow(EE_DOCUMENTFILENAME_BADFILENAME);`
`2203`	`2204`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1898,8 +1898,7 @@ - (void)setFrameSize: (NSSize)size`
`1898`	`1898`	`[m_window_handle setHidesOnDeactivate: m_hides_on_suspend];`
`1899`	`1899`
`1900`	`1900`	`// MERG-2015-10-11: [[ DocumentFilename ]] Set documentFilename.`
`1901`		`- if (m_document_filename != nil)`
`1902`		`- UpdateDocumentFilename();`
	`1901`	`+ UpdateDocumentFilename();`
`1903`	`1902`	`}`
`1904`	`1903`
`1905`	`1904`	`void MCMacPlatformWindow::DoSynchronize(void)`
`@@ -2210,11 +2209,14 @@ bool MCMacDoUpdateRegionCallback(void *p_context, const MCRectangle &p_rect)`
`2210`	`2209`	`NSString * t_represented_filename;`
`2211`	`2210`	`t_represented_filename = nil;`
`2212`	`2211`
`2213`		`- if (m_document_filename != nil && MCS_pathtonative(m_document_filename, t_native_filename))`
	`2212`	`+ if (!MCStringIsEmpty(m_document_filename) && MCS_pathtonative(m_document_filename, t_native_filename))`
`2214`	`2213`	`{`
`2215`	`2214`	`t_represented_filename = [NSString stringWithMCStringRef: t_native_filename];`
`2216`	`2215`	`}`
	`2216`	`+ else`
	`2217`	`+ t_represented_filename = @"";`
`2217`	`2218`
	`2219`	`+ // It appears setRepresentedFilename can't be set to nil`
`2218`	`2220`	`[m_window_handle setRepresentedFilename: t_represented_filename];`
`2219`	`2221`	`}`
`2220`	`2222`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ MCPlatformWindow::MCPlatformWindow(void)`
`67`	`67`	`m_is_opaque = true;`
`68`	`68`
`69`	`69`	`// MERG-2015-10-11: [[ DocumentFilename ]] documentFilename property`
`70`		`- m_document_filename = nil;`
	`70`	`+ m_document_filename = MCValueRetain(kMCEmptyString);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`MCPlatformWindow::~MCPlatformWindow(void)`