[[ Skia ]] Fix Mac desktop defines

livecodeali · livecodeali · commit 0724f23ef31e · 2017-03-16T11:52:41.000Z
diff --git a/engine/src/aclip.cpp b/engine/src/aclip.cpp
@@ -598,7 +598,7 @@ Boolean MCAudioClip::open_audio()
 	}
 	return True;
 }
-#elif defined _MACOSX
+#elif defined _MAC_DESKTOP
 Boolean MCAudioClip::open_audio() //plays a sound immediately
 {
 	if (sound != NULL)  //if sound is already open and constructed
@@ -713,7 +713,7 @@ Boolean MCAudioClip::play()
 		return False;
 	}
 	return True;
-#elif defined _MACOSX
+#elif defined _MAC_DESKTOP
 	SCStatus cs;       //channel status record
 	OSErr err = noErr;
 	// the sizeof(SCStatus) gives 27 bytes, but the actual record size is 24
@@ -821,7 +821,7 @@ void MCAudioClip::stop(Boolean abort)
 		waveOutClose(hwaveout);
 		hwaveout = NULL;
 	}
-#elif defined _MACOSX  //minshe
+#elif defined _MAC_DESKTOP  //minshe
 	//MAC stuff here.... Send a quiet command to stop a sound that is currenty playing
 	if (sound != NULL)
 	{
@@ -958,7 +958,7 @@ uint2 MCS_getplayloudness()
             hwaveout = NULL;
         }
     }
-#elif defined _MACOSX
+#elif defined _MAC_DESKTOP
     long volume;
     GetDefaultOutputVolume(&volume);
     t_loudness = (HiWord(volume) + LoWord(volume)) * 50 / 255;
@@ -1002,7 +1002,7 @@ void MCS_setplayloudness(uint2 p_loudness)
             hwaveout = NULL;
         }
     }
-#elif defined _MACOSX
+#elif defined _MAC_DESKTOP
     long volume = p_loudness * 255 / 100;
     SetDefaultOutputVolume(volume | volume << 16);
 #elif defined TARGET_PLATFORM_LINUX
diff --git a/engine/src/button.h b/engine/src/button.h
@@ -196,7 +196,7 @@ class MCButton : public MCControl, public MCMixinObjectHandle<MCButton>
 	virtual Boolean mup(uint2 which, bool p_release);
 	virtual Boolean doubledown(uint2 which);
 	virtual Boolean doubleup(uint2 which);
-#ifdef _MACOSX
+#ifdef _MAC_DESKTOP
 	virtual void timer(MCNameRef mptr, MCParameter *params);
 #endif
 
diff --git a/engine/src/exec-interface2.cpp b/engine/src/exec-interface2.cpp
@@ -1883,7 +1883,7 @@ void MCInterfaceSetHidePalettes(MCExecContext& ctxt, bool p_value)
 {
 	MChidepalettes = p_value ? True : False;
     // MW-2014-04-23: [[ Bug 12080 ]] Make sure we update the hidesOnSuspend of all palettes.
-#ifdef _MACOSX
+#ifdef _MAC_DESKTOP
     MCstacks->hidepaletteschanged();
 #endif
 }
diff --git a/engine/src/fieldh.cpp b/engine/src/fieldh.cpp
@@ -928,7 +928,7 @@ bool MCField::converttoparagraphs(void *p_context, const MCTextParagraph *p_para
 		const char *t_font_name;
 		t_font_name = p_block -> font_name == NULL ? "" : p_block -> font_name;
         
-#if defined _MACOSX
+#if defined _MAC_DESKTOP
         
 		// MW-2011-03-13: [[ Bug ]] Try different variants of font searching to ensure we don't
 		//   get strange choices. (e.g. Helvetica -> Helvetica Light Oblique).
diff --git a/engine/src/globdefs.h b/engine/src/globdefs.h
@@ -53,20 +53,6 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined(_MOBILE)
-
-#undef _MACOSX
-#undef _LINUX
-#undef _WINDOWS
-
-#elif defined(_SERVER)
-
-#undef _MACOSX
-#undef _LINUX
-#undef _WINDOWS
-
-#endif
-
 #include "sysdefs.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/hc.cpp b/engine/src/hc.cpp
@@ -2219,7 +2219,7 @@ IO_stat MCHcstak::read(IO_handle stream)
 	}
 	if (filetype == HC_RAW || rsize == 0)
 	{
-#ifdef _MACOSX
+#ifdef _MAC_DESKTOP
 		return macreadresources();
 #else
 			return IO_NORMAL;
diff --git a/engine/src/mode.h b/engine/src/mode.h
@@ -205,10 +205,6 @@ bool MCModeMakeLocalWindows(void);
 void MCModeShowToolTip(int32_t x, int32_t y, uint32_t text_size, uint32_t bg_color, MCStringRef text_font, MCStringRef message);
 void MCModeHideToolTip(void);
 
-#ifdef _MACOSX
-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack);
-#endif
-
 // This hook is used to handle the reset cursors action.
 void MCModeResetCursors(void);
 
diff --git a/engine/src/mode_development.cpp b/engine/src/mode_development.cpp
@@ -816,13 +816,6 @@ void MCRemotePageSetupDialog(MCDataRef p_config_data, MCDataRef &r_reply_data, u
 {
 }
 
-#ifdef _MACOSX
-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack)
-{
-	return 0;
-}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 //  Implementation of Windows-specific mode hooks for DEVELOPMENT mode.
diff --git a/engine/src/mode_installer.cpp b/engine/src/mode_installer.cpp
@@ -1736,13 +1736,6 @@ void MCRemotePageSetupDialog(MCDataRef p_config_data, MCDataRef &r_reply_data, u
 {
 }
 
-#ifdef _MACOSX
-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack)
-{
-	return 0;
-}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 //  Implementation of Windows-specific mode hooks for INSTALLER mode.
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -1268,13 +1268,6 @@ void MCRemotePageSetupDialog(MCDataRef p_config_data, MCDataRef &r_reply_data, u
 {
 }
 
-#ifdef _MACOSX
-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack)
-{
-	return 0;
-}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 //  Implementation of Windows-specific mode hooks for STANDALONE mode.
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -1592,7 +1592,7 @@ Boolean MCObject::getforecolor(uint2 p_di, Boolean rev, Boolean hilite,
 			c = MCscreen->getblack();
 		break;
 	case DI_BACK:
-#ifdef _MACOSX
+#ifdef _MAC_DESKTOP
 		if (IsMacLFAM() && dc_type != CONTEXT_TYPE_PRINTER)
 		{
 			extern bool MCMacThemeGetBackgroundPattern(Window_mode p_mode, bool p_active, MCPatternRef &r_pattern);
diff --git a/engine/src/opensslsocket.cpp b/engine/src/opensslsocket.cpp
@@ -1214,7 +1214,7 @@ void MCS_secure_socket(MCSocket *s, Boolean sslverify, MCNameRef end_hostname)
 
 bool MCS_hostaddress(MCStringRef &r_host_address)
 {
-#if defined(_MACOSX)
+#if defined(_MAC_DESKTOP)
     bool t_success;
     t_success = true;
     
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -2072,7 +2072,7 @@ Exec_stat MCStack::openrect(const MCRectangle &rel, Window_mode wm, MCStack *par
 		}
 	}
 	
-#ifdef _MACOSX
+#ifdef _MAC_DESKTOP
 	// MW-2008-02-28: [[ Bug 4614 ]] Ensure that sheeting inside a not yet visible window causes
 	//   it to be displayed as modal.
 	// MW-2008-03-03: [[ Bug 5985 ]] Crash when using 'sheet' command. It seems that 'go' is not

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ Boolean MCAudioClip::open_audio()`
`598`	`598`	`}`
`599`	`599`	`return True;`
`600`	`600`	`}`
`601`		`-#elif defined _MACOSX`
	`601`	`+#elif defined _MAC_DESKTOP`
`602`	`602`	`Boolean MCAudioClip::open_audio() //plays a sound immediately`
`603`	`603`	`{`
`604`	`604`	`if (sound != NULL) //if sound is already open and constructed`
`@@ -713,7 +713,7 @@ Boolean MCAudioClip::play()`
`713`	`713`	`return False;`
`714`	`714`	`}`
`715`	`715`	`return True;`
`716`		`-#elif defined _MACOSX`
	`716`	`+#elif defined _MAC_DESKTOP`
`717`	`717`	`SCStatus cs; //channel status record`
`718`	`718`	`OSErr err = noErr;`
`719`	`719`	`// the sizeof(SCStatus) gives 27 bytes, but the actual record size is 24`
`@@ -821,7 +821,7 @@ void MCAudioClip::stop(Boolean abort)`
`821`	`821`	`waveOutClose(hwaveout);`
`822`	`822`	`hwaveout = NULL;`
`823`	`823`	`}`
`824`		`-#elif defined _MACOSX //minshe`
	`824`	`+#elif defined _MAC_DESKTOP //minshe`
`825`	`825`	`//MAC stuff here.... Send a quiet command to stop a sound that is currenty playing`
`826`	`826`	`if (sound != NULL)`
`827`	`827`	`{`
`@@ -958,7 +958,7 @@ uint2 MCS_getplayloudness()`
`958`	`958`	`hwaveout = NULL;`
`959`	`959`	`}`
`960`	`960`	`}`
`961`		`-#elif defined _MACOSX`
	`961`	`+#elif defined _MAC_DESKTOP`
`962`	`962`	`long volume;`
`963`	`963`	`GetDefaultOutputVolume(&volume);`
`964`	`964`	`t_loudness = (HiWord(volume) + LoWord(volume)) * 50 / 255;`
`@@ -1002,7 +1002,7 @@ void MCS_setplayloudness(uint2 p_loudness)`
`1002`	`1002`	`hwaveout = NULL;`
`1003`	`1003`	`}`
`1004`	`1004`	`}`
`1005`		`-#elif defined _MACOSX`
	`1005`	`+#elif defined _MAC_DESKTOP`
`1006`	`1006`	`long volume = p_loudness * 255 / 100;`
`1007`	`1007`	`SetDefaultOutputVolume(volume \| volume << 16);`
`1008`	`1008`	`#elif defined TARGET_PLATFORM_LINUX`
Original file line number	Diff line number	Diff line change
`@@ -1883,7 +1883,7 @@ void MCInterfaceSetHidePalettes(MCExecContext& ctxt, bool p_value)`
`1883`	`1883`	`{`
`1884`	`1884`	`MChidepalettes = p_value ? True : False;`
`1885`	`1885`	`// MW-2014-04-23: [[ Bug 12080 ]] Make sure we update the hidesOnSuspend of all palettes.`
`1886`		`-#ifdef _MACOSX`
	`1886`	`+#ifdef _MAC_DESKTOP`
`1887`	`1887`	`MCstacks->hidepaletteschanged();`
`1888`	`1888`	`#endif`
`1889`	`1889`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2219,7 +2219,7 @@ IO_stat MCHcstak::read(IO_handle stream)`
`2219`	`2219`	`}`
`2220`	`2220`	`if (filetype == HC_RAW \|\| rsize == 0)`
`2221`	`2221`	`{`
`2222`		`-#ifdef _MACOSX`
	`2222`	`+#ifdef _MAC_DESKTOP`
`2223`	`2223`	`return macreadresources();`
`2224`	`2224`	`#else`
`2225`	`2225`	`return IO_NORMAL;`
Original file line number	Diff line number	Diff line change
`@@ -816,13 +816,6 @@ void MCRemotePageSetupDialog(MCDataRef p_config_data, MCDataRef &r_reply_data, u`
`816`	`816`	`{`
`817`	`817`	`}`
`818`	`818`
`819`		`-#ifdef _MACOSX`
`820`		`-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack)`
`821`		`-{`
`822`		`- return 0;`
`823`		`-}`
`824`		`-#endif`
`825`		`-`
`826`	`819`	`////////////////////////////////////////////////////////////////////////////////`
`827`	`820`	`//`
`828`	`821`	`// Implementation of Windows-specific mode hooks for DEVELOPMENT mode.`
Original file line number	Diff line number	Diff line change
`@@ -1736,13 +1736,6 @@ void MCRemotePageSetupDialog(MCDataRef p_config_data, MCDataRef &r_reply_data, u`
`1736`	`1736`	`{`
`1737`	`1737`	`}`
`1738`	`1738`
`1739`		`-#ifdef _MACOSX`
`1740`		`-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack)`
`1741`		`-{`
`1742`		`- return 0;`
`1743`		`-}`
`1744`		`-#endif`
`1745`		`-`
`1746`	`1739`	`////////////////////////////////////////////////////////////////////////////////`
`1747`	`1740`	`//`
`1748`	`1741`	`// Implementation of Windows-specific mode hooks for INSTALLER mode.`
Original file line number	Diff line number	Diff line change
`@@ -1268,13 +1268,6 @@ void MCRemotePageSetupDialog(MCDataRef p_config_data, MCDataRef &r_reply_data, u`
`1268`	`1268`	`{`
`1269`	`1269`	`}`
`1270`	`1270`
`1271`		`-#ifdef _MACOSX`
`1272`		`-uint32_t MCModePopUpMenu(MCMacSysMenuHandle p_menu, int32_t p_x, int32_t p_y, uint32_t p_index, MCStack *p_stack)`
`1273`		`-{`
`1274`		`- return 0;`
`1275`		`-}`
`1276`		`-#endif`
`1277`		`-`
`1278`	`1271`	`////////////////////////////////////////////////////////////////////////////////`
`1279`	`1272`	`//`
`1280`	`1273`	`// Implementation of Windows-specific mode hooks for STANDALONE mode.`